Skip to content

Commit

Permalink
Merge branch 'paypal:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
arielxin authored Dec 28, 2023
2 parents 20166f4 + 7b28401 commit cdbcefa
Show file tree
Hide file tree
Showing 280 changed files with 55,983 additions and 41,253 deletions.
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# EditorConfig is awesome: http://EditorConfig.org

# Howto with your editor: http://editorconfig.org/#download
# Sublime: https://github.com/sindresorhus/editorconfig-sublime

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[**]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
max_line_length = 80
trim_trailing_whitespace = true
52 changes: 27 additions & 25 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,34 @@

// eslint-disable-next-line import/no-commonjs
module.exports = {
'extends': '@krakenjs/eslint-config-grumbler/eslintrc-browser',
extends: ["@krakenjs/eslint-config-grumbler/eslintrc-browser", "prettier"],

'rules': {
'react/display-name': 'off',
'prefer-regex-literals': 'off',
'require-atomic-updates': 'off',
'max-lines': 'off',
'react/require-default-props': 'off',
'react/prop-types': 'off'
},
rules: {
"react/display-name": "off",
"prefer-regex-literals": "off",
"require-atomic-updates": "off",
"max-lines": "off",
"react/require-default-props": "off",
"react/prop-types": "off",
},

'globals': {
'__SMART_BUTTONS__': true,
'paypal': true,
'$Shape': true,
'afterAll': true,
'jest': true
globals: {
__SMART_BUTTONS__: true,
paypal: true,
$Shape: true,
afterAll: true,
jest: true,
},
overrides: [
{
files: ["**/*.test.js"],
env: {
jest: true,
},
globals: {
JestMockFn: false,
},
},
'overrides': [{
'files': ['**/*.test.js'],
'env': {
'jest': true
},
'globals': {
'JestMockFn': false
}
}],
'ignorePatterns': ['node-qrcode.js']
],
ignorePatterns: ["node-qrcode.js"],
};
4 changes: 3 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@

<!-- If this PR depends on changes to other applications, document those dependencies (ex: paypal-checkout-components). -->
<!-- Are there any additional considerations when deploying this change to production? -->

### Groups who should review (if applicable)

<!-- For cross-team internal contributors, please tag a group or individual from your team who should review this PR -->

❤️ Thank you!
❤️ Thank you!
9 changes: 2 additions & 7 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
{
"extends": [
"config:base",
":preserveSemverRanges"
],
"extends": ["config:base", ":preserveSemverRanges"],
"prCreation": "immediate",
"prHourlyLimit": 0,
"rangeStrategy": "status-success",
"separateMajorMinor": false,
"semanticCommits": true,
"timezone": "America/Los_Angeles",
"rebaseStalePrs": true,
"labels": [
":christmas_tree: dependencies"
],
"labels": [":christmas_tree: dependencies"],
"packageRules": [
{
"packagePatterns": "^babel",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dry-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
# sets up the .npmrc file to publish to npm
uses: actions/setup-node@v3
with:
node-version: '16'
registry-url: 'https://registry.npmjs.org'
node-version: "16"
registry-url: "https://registry.npmjs.org"

- name: 📥 Download deps
uses: bahmutov/npm-install@v1
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,5 @@ jobs:

- name: ⬆️ Upload coverage report
uses: codecov/codecov-action@v3
with:
files: coverage/lcov.info, coverage-vitest/clover.xml
37 changes: 19 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
node_modules
*.log
*.orig
.DS_Store
.build
.configcache
.idea
.nyc_output
.rebooted
.settings
.nyc_output
logs
log
*.orig
*.log
.DS_Store
coverage
cdbs
protected
tmp
ext
temp
tools/tmp
.vscode
bower_modules
cdbs
config/production.json
test/functional/datadriven/report
coverage
coverage-vitest
ext
flow-typed
log
logs
node_modules
package-lock.json
protected
server.crt
server.csr
server.key
server.key.org
slipper-cache.json
flow-typed
package-lock.json
.vscode
temp
test/functional/datadriven/report
tmp
tools/tmp
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
16.18
36 changes: 31 additions & 5 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,36 @@
.husky/
*.log
*.orig
.DS_Store
.build
.configcache
.idea
.npm
.nvm
.vscode/
.nyc_output
.rebooted
.settings
.vscode
bower_modules
cdbs
cdn/
config/
coverage/
config/production.json
coverage
coverage-vitest
dist/
flow-typed/
node_modules/
ext
flow-typed
log
logs
node_modules
package-lock.json
protected
server.crt
server.csr
server.key
server.key.org
slipper-cache.json
temp
test/functional/datadriven/report
tmp
tools/tmp
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
/* eslint import/no-commonjs: off */

module.exports = {
extends: "@krakenjs/babel-config-grumbler/babelrc-node",
extends: "@krakenjs/babel-config-grumbler/babelrc-node",
};
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@paypal/smart-payment-buttons",
"dist-tags": {
"latest": "5.0.151",
"latest": "5.0.164",
"noop": "2.0.290",
"active-test": "5.0.151",
"active-local": "5.0.151",
"active-stage": "5.0.151",
"active-test": "5.0.164",
"active-local": "5.0.164",
"active-stage": "5.0.164",
"active-sandbox": "5.0.108",
"active-production": "5.0.108",
"alpha": "5.0.150-alpha-50c2984d.0",
"alpha": "5.0.164-alpha-66eac557.0",
"beta": "5.0.139-beta.0"
},
"versions": {
Expand All @@ -32,7 +32,7 @@
"zalgo-promise": "^1.0.28"
},
"dist": {
"tarball": "https://www.paypalobjects.com/smart-payment-buttons/5.0.151/paypal/smart-payment-buttons/tarballs/2.0.290.tgz"
"tarball": "https://www.paypalobjects.com/smart-payment-buttons/5.0.164/paypal/smart-payment-buttons/tarballs/2.0.290.tgz"
},
"repository": {
"url": "https://github.paypal.com/Checkout/smart-buttons"
Expand Down Expand Up @@ -65,7 +65,7 @@
"typed-graphqlify": "^2.2.3"
},
"dist": {
"tarball": "https://www.paypalobjects.com/smart-payment-buttons/5.0.151/paypal/smart-payment-buttons/tarballs/5.0.108.tgz"
"tarball": "https://www.paypalobjects.com/smart-payment-buttons/5.0.164/paypal/smart-payment-buttons/tarballs/5.0.108.tgz"
},
"repository": {
"url": "git+https://github.com/paypal/paypal-smart-payment-buttons.git"
Expand Down Expand Up @@ -97,17 +97,17 @@
"typed-graphqlify": "^2.2.3"
},
"dist": {
"tarball": "https://www.paypalobjects.com/smart-payment-buttons/5.0.151/paypal/smart-payment-buttons/tarballs/5.0.139-beta.0.tgz"
"tarball": "https://www.paypalobjects.com/smart-payment-buttons/5.0.164/paypal/smart-payment-buttons/tarballs/5.0.139-beta.0.tgz"
},
"repository": {
"url": "git+https://github.com/paypal/paypal-smart-payment-buttons.git"
},
"gitHead": "d67be2b7a38697bdcdd44c7d3637464cc668c51e"
},
"5.0.150-alpha-50c2984d.0": {
"5.0.164-alpha-66eac557.0": {
"dependencies": {
"@krakenjs/beaver-logger": "^5.0.1",
"@krakenjs/belter": "^2.1.0",
"@krakenjs/beaver-logger": "^5.5.0",
"@krakenjs/belter": "^2.3.0",
"@krakenjs/cross-domain-utils": "^3.0.0",
"@krakenjs/grabthar": "^6.2.0",
"@krakenjs/jsx-pragmatic": "^3.0.0",
Expand All @@ -116,7 +116,6 @@
"@paypal/checkout-components": "^5.0.256",
"@paypal/common-components": "^1.0.35",
"@paypal/installments": "^1.0.0",
"@paypal/sdk-client": "^4.0.175",
"@paypal/sdk-constants": "^1.0.128",
"@paypal/sdk-logos": "^2.1.0",
"@paypal/sdk-release": "^5.0.138",
Expand All @@ -129,17 +128,17 @@
"typed-graphqlify": "^2.2.3"
},
"dist": {
"tarball": "https://www.paypalobjects.com/smart-payment-buttons/5.0.151/paypal/smart-payment-buttons/tarballs/5.0.150-alpha-50c2984d.0.tgz"
"tarball": "https://www.paypalobjects.com/smart-payment-buttons/5.0.164/paypal/smart-payment-buttons/tarballs/5.0.164-alpha-66eac557.0.tgz"
},
"repository": {
"url": "git+https://github.com/paypal/paypal-smart-payment-buttons.git"
},
"gitHead": "372d501099ed2245438889bf4047bff7a2ee3cfb"
"gitHead": "2b50f74f3f9ea832f8e9be49060e544d19c67c1c"
},
"5.0.151": {
"5.0.164": {
"dependencies": {
"@krakenjs/beaver-logger": "^5.5.0",
"@krakenjs/belter": "^2.1.0",
"@krakenjs/belter": "^2.3.0",
"@krakenjs/cross-domain-utils": "^3.0.0",
"@krakenjs/grabthar": "^6.2.0",
"@krakenjs/jsx-pragmatic": "^3.0.0",
Expand All @@ -148,7 +147,6 @@
"@paypal/checkout-components": "^5.0.256",
"@paypal/common-components": "^1.0.35",
"@paypal/installments": "^1.0.0",
"@paypal/sdk-client": "^4.0.175",
"@paypal/sdk-constants": "^1.0.128",
"@paypal/sdk-logos": "^2.1.0",
"@paypal/sdk-release": "^5.0.138",
Expand All @@ -161,12 +159,12 @@
"typed-graphqlify": "^2.2.3"
},
"dist": {
"tarball": "https://www.paypalobjects.com/smart-payment-buttons/5.0.151/paypal/smart-payment-buttons/tarballs/5.0.151.tgz"
"tarball": "https://www.paypalobjects.com/smart-payment-buttons/5.0.164/paypal/smart-payment-buttons/tarballs/5.0.164.tgz"
},
"repository": {
"url": "git+https://github.com/paypal/paypal-smart-payment-buttons.git"
},
"gitHead": "ae08c9d3f7e1a2f447237e313c7eb8c159a50d30"
"gitHead": "0c84511018fcdb327c2a41e655a76fc01971ea48"
}
}
}
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit cdbcefa

Please sign in to comment.