From 7ff43f4f8df78a74274399034bf4bb9c8228bd76 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Mon, 30 Jan 2023 08:59:38 +1100 Subject: [PATCH 01/10] Bump build dependencies --- package.json | 28 ++- polaris-icons/rollup.config.mjs | 20 +- polaris-migrator/package.json | 4 - polaris-migrator/rollup.config.mjs | 4 +- polaris-react/package.json | 4 - polaris-react/rollup.config.mjs | 6 +- polaris-tokens/rollup.config.mjs | 4 +- yarn.lock | 392 +++++++++++++++++++---------- 8 files changed, 296 insertions(+), 166 deletions(-) diff --git a/package.json b/package.json index 91c590593d4..b0a16cb0bc0 100644 --- a/package.json +++ b/package.json @@ -44,21 +44,22 @@ "postinstall": "patch-package" }, "devDependencies": { - "@babel/core": "^7.15.0", - "@babel/node": "^7.14.9", + "@babel/core": "^7.20.12", + "@babel/node": "^7.20.7", + "@babel/preset-typescript": "^7.18.6", "@changesets/changelog-github": "^0.4.4", "@changesets/cli": "^2.23.0", "@changesets/get-release-plan": "^3.0.14", "@next/eslint-plugin-next": "^12.1.4", - "@rollup/plugin-babel": "^5.3.1", - "@rollup/plugin-commonjs": "^21.1.0", - "@rollup/plugin-image": "^2.0.5", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.2.1", - "@rollup/plugin-replace": "^2.3.3", - "@rollup/plugin-virtual": "^2.0.3", - "@rollup/pluginutils": "^4.1.0", - "@shopify/babel-preset": "^24.1.2", + "@rollup/plugin-babel": "^6.0.3", + "@rollup/plugin-commonjs": "^24.0.1", + "@rollup/plugin-image": "^3.0.2", + "@rollup/plugin-json": "^6.0.0", + "@rollup/plugin-node-resolve": "^15.0.1", + "@rollup/plugin-replace": "^5.0.2", + "@rollup/plugin-virtual": "^3.0.1", + "@rollup/pluginutils": "^5.0.2", + "@shopify/babel-preset": "^25.0.0", "@shopify/cli": "^3.10.1", "@shopify/eslint-plugin": "^42.0.1", "@shopify/prettier-config": "^1.1.2", @@ -66,6 +67,7 @@ "@shopify/typescript-configs": "^5.1.0", "@size-limit/preset-small-lib": "^5.0.3", "@types/jest": "^27.5.1", + "babel-loader": "^9.1.2", "downlevel-dts": "^0.6.0", "eslint": "^8.3.0", "execa": "^5.0.0", @@ -76,8 +78,8 @@ "patch-package": "^6.4.7", "postinstall-postinstall": "^2.1.0", "prettier": "^2.5.0", - "rollup": "^2.70.2", - "rollup-plugin-node-externals": "^4.0.0", + "rollup": "^3.12.0", + "rollup-plugin-node-externals": "^5.1.0", "size-limit": "^5.0.3", "stylelint": "^14.15.0", "ts-node": "^10.7.0", diff --git a/polaris-icons/rollup.config.mjs b/polaris-icons/rollup.config.mjs index d0815f2729b..9448e91b439 100644 --- a/polaris-icons/rollup.config.mjs +++ b/polaris-icons/rollup.config.mjs @@ -222,6 +222,11 @@ export default [ interop, entryFileNames: '[name].js', chunkFileNames: '[name].js', + manualChunks: (id) => { + if (id.startsWith(iconBasePath)) { + return id.replace(iconBasePath, 'icons/'); + } + }, }, { dir: 'dist', @@ -229,17 +234,14 @@ export default [ interop, entryFileNames: '[name].mjs', chunkFileNames: '[name].mjs', + manualChunks: (id) => { + if (id.startsWith(iconBasePath)) { + return id.replace(iconBasePath, 'icons/'); + } + }, }, ], - manualChunks: (id) => { - // Generate distinct chunks for each icon - // This allows consuming apps to split up the icons into multiple subchunks - // containing a few icons each instead of always having to put every icon - // into a single shared chunk - if (id.startsWith(iconBasePath)) { - return id.replace(iconBasePath, 'icons/'); - } - }, + external: ['react'], onwarn: (warning, warn) => { // Unresolved imports means Rollup couldn't find an import, possibly because diff --git a/polaris-migrator/package.json b/polaris-migrator/package.json index 17b029f45c4..5ceeca93d57 100644 --- a/polaris-migrator/package.json +++ b/polaris-migrator/package.json @@ -48,10 +48,6 @@ "devDependencies": { "@types/is-git-clean": "^1.1.0", "@types/jscodeshift": "^0.11.5", - "@rollup/plugin-babel": "^5.3.1", - "@rollup/plugin-commonjs": "^22.0.2", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.3.0", "@shopify/polaris": "^10.24.0", "plop": "^3.1.1", "plop-dir": "^0.0.5", diff --git a/polaris-migrator/rollup.config.mjs b/polaris-migrator/rollup.config.mjs index 7590ff5f94f..954b50853ac 100644 --- a/polaris-migrator/rollup.config.mjs +++ b/polaris-migrator/rollup.config.mjs @@ -21,14 +21,14 @@ export default { output: [ { format: /** @type {const} */ ('cjs'), - entryFileNames: '[name][assetExtname].js', + entryFileNames: '[name].js', dir: path.dirname(pkg.main), preserveModules: true, exports: 'auto', }, { format: /** @type {const} */ ('esm'), - entryFileNames: '[name][assetExtname].mjs', + entryFileNames: '[name].mjs', dir: path.dirname(pkg.module), preserveModules: true, }, diff --git a/polaris-react/package.json b/polaris-react/package.json index f2f857466c6..3fd04a8437a 100644 --- a/polaris-react/package.json +++ b/polaris-react/package.json @@ -75,8 +75,6 @@ "react-dom": "^16.14.0 || ^17.0.0 || ^18.0.0" }, "devDependencies": { - "@babel/core": "^7.15.0", - "@babel/node": "^7.14.9", "@changesets/get-release-plan": "^3.0.13", "@shopify/browserslist-config": "^3.0.0", "@shopify/jest-dom-mocks": "^3.0.5", @@ -93,8 +91,6 @@ "@types/react": "^18.0.15", "@types/react-dom": "^18.0.6", "ajv-cli": "^5.0.0", - "babel-core": "7.0.0-bridge.0", - "babel-loader": "^8.1.0", "change-case": "^3.1.0", "chromatic": "^6.5.4", "core-js": "^3.6.5", diff --git a/polaris-react/rollup.config.mjs b/polaris-react/rollup.config.mjs index 34ca161cb6f..984e1d8e6f1 100644 --- a/polaris-react/rollup.config.mjs +++ b/polaris-react/rollup.config.mjs @@ -69,14 +69,14 @@ export default [ format: 'cjs', dir: path.dirname(pkg.main), preserveModules: true, - entryFileNames: '[name][assetExtname].js', + entryFileNames: '[name].js', exports: 'named', }, { format: 'esm', dir: path.dirname(pkg.module), preserveModules: true, - entryFileNames: '[name][assetExtname].js', + entryFileNames: '[name].js', }, ], }), @@ -95,7 +95,7 @@ export default [ format: 'esm', dir: path.dirname(pkg.esnext), preserveModules: true, - entryFileNames: '[name][assetExtname].esnext', + entryFileNames: '[name].esnext', }, ], }), diff --git a/polaris-tokens/rollup.config.mjs b/polaris-tokens/rollup.config.mjs index 417465c3fd0..7e81969c9db 100644 --- a/polaris-tokens/rollup.config.mjs +++ b/polaris-tokens/rollup.config.mjs @@ -15,13 +15,13 @@ export default { output: [ { format: /** @type {const} */ ('cjs'), - entryFileNames: '[name][assetExtname].js', + entryFileNames: '[name].js', dir: 'dist/cjs', preserveModules: true, }, { format: /** @type {const} */ ('es'), - entryFileNames: '[name][assetExtname].mjs', + entryFileNames: '[name].mjs', dir: 'dist/esm', preserveModules: true, }, diff --git a/yarn.lock b/yarn.lock index 265fd85b418..7b70eae9499 100644 --- a/yarn.lock +++ b/yarn.lock @@ -50,6 +50,11 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.3.tgz#707b939793f867f5a73b2666e6d9a3396eb03151" integrity sha512-prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw== +"@babel/compat-data@^7.20.5": + version "7.20.14" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.14.tgz#4106fc8b755f3e3ee0a0a7c27dde5de1d2b2baf8" + integrity sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw== + "@babel/core@7.12.9": version "7.12.9" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" @@ -72,7 +77,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.15.0", "@babel/core@^7.16.0", "@babel/core@^7.4.5", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0": +"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.16.0", "@babel/core@^7.4.5", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.9.tgz#805461f967c77ff46c74ca0460ccf4fe933ddd59" integrity sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g== @@ -114,6 +119,27 @@ json5 "^2.2.1" semver "^6.3.0" +"@babel/core@^7.20.12": + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d" + integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg== + dependencies: + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.20.7" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helpers" "^7.20.7" + "@babel/parser" "^7.20.7" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.12" + "@babel/types" "^7.20.7" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.2" + semver "^6.3.0" + "@babel/eslint-parser@^7.16.3": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6" @@ -148,6 +174,15 @@ "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" +"@babel/generator@^7.20.7": + version "7.20.14" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.14.tgz#9fa772c9f86a46c6ac9b321039400712b96f64ce" + integrity sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg== + dependencies: + "@babel/types" "^7.20.7" + "@jridgewell/gen-mapping" "^0.3.2" + jsesc "^2.5.1" + "@babel/helper-annotate-as-pure@^7.16.7", "@babel/helper-annotate-as-pure@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" @@ -191,6 +226,17 @@ browserslist "^4.21.3" semver "^6.3.0" +"@babel/helper-compilation-targets@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" + integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== + dependencies: + "@babel/compat-data" "^7.20.5" + "@babel/helper-validator-option" "^7.18.6" + browserslist "^4.21.3" + lru-cache "^5.1.1" + semver "^6.3.0" + "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9", "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.19.0": version "7.19.0" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b" @@ -301,7 +347,7 @@ dependencies: "@babel/types" "^7.18.9" -"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6": +"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== @@ -336,6 +382,20 @@ "@babel/traverse" "^7.19.0" "@babel/types" "^7.19.0" +"@babel/helper-module-transforms@^7.20.11": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0" + integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.10" + "@babel/types" "^7.20.7" + "@babel/helper-optimise-call-expression@^7.16.7", "@babel/helper-optimise-call-expression@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" @@ -401,6 +461,13 @@ dependencies: "@babel/types" "^7.18.6" +"@babel/helper-simple-access@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" + integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== + dependencies: + "@babel/types" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers@^7.16.0", "@babel/helper-skip-transparent-expression-wrappers@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818" @@ -420,6 +487,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56" integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw== +"@babel/helper-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== + "@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076" @@ -473,6 +545,15 @@ "@babel/traverse" "^7.19.0" "@babel/types" "^7.19.0" +"@babel/helpers@^7.20.7": + version "7.20.13" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.13.tgz#e3cb731fb70dc5337134cadc24cbbad31cc87ad2" + integrity sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg== + dependencies: + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.13" + "@babel/types" "^7.20.7" + "@babel/highlight@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" @@ -482,16 +563,16 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/node@^7.14.9": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.16.8.tgz#57ba1dfa63dbcc72d477f05597ce07f1c4f8b558" - integrity sha512-V2dopEtPUL4LD+e8UtMIZB6BbsmMsS/7E1ZAvWNINzBfi7Cf3X9MLCpzHVZT4HeeF1lQl72IRtqqVt2RUImwyA== +"@babel/node@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.20.7.tgz#609be7f841893e24931b7910263babfde84040a9" + integrity sha512-AQt3gVcP+fpFuoFn4FmIW/+5JovvEoA9og4Y1LrRw0pv3jkl4tujZMMy3X/3ugjLrEy3k1aNywo3JIl3g+jVXQ== dependencies: - "@babel/register" "^7.16.8" + "@babel/register" "^7.18.9" commander "^4.0.1" - core-js "^3.20.2" + core-js "^3.26.0" node-environment-flags "^1.0.5" - regenerator-runtime "^0.13.4" + regenerator-runtime "^0.13.11" v8flags "^3.1.1" "@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.9": @@ -504,6 +585,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.3.tgz#8dd36d17c53ff347f9e55c328710321b49479a9a" integrity sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ== +"@babel/parser@^7.20.13", "@babel/parser@^7.20.7": + version "7.20.13" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.13.tgz#ddf1eb5a813588d2fb1692b70c6fce75b945c088" + integrity sha512-gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw== + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" @@ -1755,7 +1841,7 @@ "@babel/plugin-transform-react-jsx-development" "^7.18.6" "@babel/plugin-transform-react-pure-annotations" "^7.18.6" -"@babel/preset-typescript@^7.12.7", "@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.0": +"@babel/preset-typescript@^7.12.7", "@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.0", "@babel/preset-typescript@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz#ce64be3e63eddc44240c6358daefac17b3186399" integrity sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ== @@ -1764,7 +1850,7 @@ "@babel/helper-validator-option" "^7.18.6" "@babel/plugin-transform-typescript" "^7.18.6" -"@babel/register@^7.12.1", "@babel/register@^7.13.16", "@babel/register@^7.16.8": +"@babel/register@^7.12.1", "@babel/register@^7.13.16", "@babel/register@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.18.9.tgz#1888b24bc28d5cc41c412feb015e9ff6b96e439c" integrity sha512-ZlbnXDcNYHMR25ITwwNKT88JiaukkdVj/nG7r3wnuXkOTHc60Uy05PwMCPre0hSkY68E6zK3xz+vUJSP2jWmcw== @@ -1818,6 +1904,15 @@ "@babel/parser" "^7.18.10" "@babel/types" "^7.18.10" +"@babel/template@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" + "@babel/traverse@^7.1.6", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.18.9", "@babel/traverse@^7.7.2": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.9.tgz#deeff3e8f1bad9786874cb2feda7a2d77a904f98" @@ -1850,6 +1945,22 @@ debug "^4.1.0" globals "^11.1.0" +"@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.13": + version "7.20.13" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.13.tgz#817c1ba13d11accca89478bd5481b2d168d07473" + integrity sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.20.7" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.20.13" + "@babel/types" "^7.20.7" + debug "^4.1.0" + globals "^11.1.0" + "@babel/types@^7.0.0", "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": version "7.19.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.0.tgz#75f21d73d73dc0351f3368d28db73465f4814600" @@ -1868,6 +1979,15 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" +"@babel/types@^7.20.2", "@babel/types@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" + integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== + dependencies: + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" + to-fast-properties "^2.0.0" + "@base2/pretty-print-object@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz#371ba8be66d556812dc7fb169ebc3c08378f69d4" @@ -2681,7 +2801,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/sourcemap-codec@1.4.14": +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.13": version "1.4.14" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== @@ -3101,96 +3221,74 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== -"@rollup/plugin-babel@^5.3.1": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283" - integrity sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q== - dependencies: - "@babel/helper-module-imports" "^7.10.4" - "@rollup/pluginutils" "^3.1.0" - -"@rollup/plugin-commonjs@^21.1.0": - version "21.1.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-21.1.0.tgz#45576d7b47609af2db87f55a6d4b46e44fc3a553" - integrity sha512-6ZtHx3VHIp2ReNNDxHjuUml6ur+WcQ28N1yHgCQwsbNkQg2suhxGMDQGJOn/KuDxKtd1xuZP5xSTwBA4GQ8hbA== +"@rollup/plugin-babel@^6.0.3": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-6.0.3.tgz#07ccde15de278c581673034ad6accdb4a153dfeb" + integrity sha512-fKImZKppa1A/gX73eg4JGo+8kQr/q1HBQaCGKECZ0v4YBBv3lFqi14+7xyApECzvkLTHCifx+7ntcrvtBIRcpg== dependencies: - "@rollup/pluginutils" "^3.1.0" - commondir "^1.0.1" - estree-walker "^2.0.1" - glob "^7.1.6" - is-reference "^1.2.1" - magic-string "^0.25.7" - resolve "^1.17.0" + "@babel/helper-module-imports" "^7.18.6" + "@rollup/pluginutils" "^5.0.1" -"@rollup/plugin-commonjs@^22.0.2": - version "22.0.2" - resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.2.tgz#ee8ca8415cda30d383b4096aad5222435b4b69b6" - integrity sha512-//NdP6iIwPbMTcazYsiBMbJW7gfmpHom33u1beiIoHDEM0Q9clvtQB1T0efvMqHeKsGohiHo97BCPCkBXdscwg== +"@rollup/plugin-commonjs@^24.0.1": + version "24.0.1" + resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-24.0.1.tgz#d54ba26a3e3c495dc332bd27a81f7e9e2df46f90" + integrity sha512-15LsiWRZk4eOGqvrJyu3z3DaBu5BhXIMeWnijSRvd8irrrg9SHpQ1pH+BUK4H6Z9wL9yOxZJMTLU+Au86XHxow== dependencies: - "@rollup/pluginutils" "^3.1.0" + "@rollup/pluginutils" "^5.0.1" commondir "^1.0.1" - estree-walker "^2.0.1" - glob "^7.1.6" - is-reference "^1.2.1" - magic-string "^0.25.7" - resolve "^1.17.0" + estree-walker "^2.0.2" + glob "^8.0.3" + is-reference "1.2.1" + magic-string "^0.27.0" -"@rollup/plugin-image@^2.0.5": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-image/-/plugin-image-2.1.1.tgz#898d6b59ac0025d7971ef45640ab330cb0663b0c" - integrity sha512-AgP4U85zuQJdUopLUCM+hTf45RepgXeTb8EJsleExVy99dIoYpt3ZlDYJdKmAc2KLkNntCDg6BPJvgJU3uGF+g== +"@rollup/plugin-image@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-image/-/plugin-image-3.0.2.tgz#8a66389510517495c5d10d392140cdefa43b27c2" + integrity sha512-eGVrD6lummWH5ENo9LWX3JY62uBb9okUNQ2htXkugrG6WjACrMUVhWvss+0wW3fwJWmFYpoEny3yL4spEdh15g== dependencies: - "@rollup/pluginutils" "^3.1.0" - mini-svg-data-uri "^1.2.3" + "@rollup/pluginutils" "^5.0.1" + mini-svg-data-uri "^1.4.4" -"@rollup/plugin-json@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3" - integrity sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw== +"@rollup/plugin-json@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-6.0.0.tgz#199fea6670fd4dfb1f4932250569b14719db234a" + integrity sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w== dependencies: - "@rollup/pluginutils" "^3.0.8" + "@rollup/pluginutils" "^5.0.1" -"@rollup/plugin-node-resolve@^13.2.1", "@rollup/plugin-node-resolve@^13.3.0": - version "13.3.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz#da1c5c5ce8316cef96a2f823d111c1e4e498801c" - integrity sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw== +"@rollup/plugin-node-resolve@^15.0.1": + version "15.0.1" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.1.tgz#72be449b8e06f6367168d5b3cd5e2802e0248971" + integrity sha512-ReY88T7JhJjeRVbfCyNj+NXAG3IIsVMsX9b5/9jC98dRP8/yxlZdz7mHZbHk5zHr24wZZICS5AcXsFZAXYUQEg== dependencies: - "@rollup/pluginutils" "^3.1.0" - "@types/resolve" "1.17.1" + "@rollup/pluginutils" "^5.0.1" + "@types/resolve" "1.20.2" deepmerge "^4.2.2" - is-builtin-module "^3.1.0" + is-builtin-module "^3.2.0" is-module "^1.0.0" - resolve "^1.19.0" + resolve "^1.22.1" -"@rollup/plugin-replace@^2.3.3": - version "2.4.2" - resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a" - integrity sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg== +"@rollup/plugin-replace@^5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz#45f53501b16311feded2485e98419acb8448c61d" + integrity sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA== dependencies: - "@rollup/pluginutils" "^3.1.0" - magic-string "^0.25.7" + "@rollup/pluginutils" "^5.0.1" + magic-string "^0.27.0" -"@rollup/plugin-virtual@^2.0.3": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-virtual/-/plugin-virtual-2.1.0.tgz#a77bfd0dff74f0203401c75287ff4d1a1cfbc816" - integrity sha512-CPPAtlKT53HFqC8jFHb/V5WErpU8Hrq2TyCR0A7kPQMlF2wNUf0o1xuAc+Qxj8NCZM0Z3Yvl+FbUXfJjVWqDwA== - -"@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" - integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== - dependencies: - "@types/estree" "0.0.39" - estree-walker "^1.0.1" - picomatch "^2.2.2" +"@rollup/plugin-virtual@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@rollup/plugin-virtual/-/plugin-virtual-3.0.1.tgz#cea7e489481cc0ca91516c047f8c53c1cfb1adf6" + integrity sha512-fK8O0IL5+q+GrsMLuACVNk2x21g3yaw+sG2qn16SnUd3IlBsQyvWxLMGHmCmXRMecPjGRSZ/1LmZB4rjQm68og== -"@rollup/pluginutils@^4.1.0": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" - integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ== +"@rollup/pluginutils@^5.0.1", "@rollup/pluginutils@^5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33" + integrity sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA== dependencies: - estree-walker "^2.0.1" - picomatch "^2.2.2" + "@types/estree" "^1.0.0" + estree-walker "^2.0.2" + picomatch "^2.3.1" "@rushstack/eslint-patch@^1.1.3": version "1.2.0" @@ -3202,10 +3300,10 @@ resolved "https://registry.yarnpkg.com/@shopify/async/-/async-3.1.5.tgz#fcb1253ed2f41f22f9ce2ca28dc667003f4a1a71" integrity sha512-kc/QSwQpcG2Enm6QqLUvCSbPuEabX34DTo/NKQh5eT6ud6gOCwTL3jdIiybK9RzRe3gbEUJ9cfCuggT87bXcZg== -"@shopify/babel-preset@^24.1.2": - version "24.1.5" - resolved "https://registry.yarnpkg.com/@shopify/babel-preset/-/babel-preset-24.1.5.tgz#76cfef62bb8a4d9769559f3f2505148a55d13488" - integrity sha512-IJJoSXU2/WJDzXsj5V5QagcCLnxJ8bRTegRkX7yhvesVhZ4mFUKlustrUH7T64O9l8qQ/MEF996lkqfgJuDCkQ== +"@shopify/babel-preset@^25.0.0": + version "25.0.0" + resolved "https://registry.yarnpkg.com/@shopify/babel-preset/-/babel-preset-25.0.0.tgz#57eaae6e250ab1a1daba26e6f1ecb42204aad929" + integrity sha512-2eVmLPGMLEdZ2u93pikVcwAf+XTpzYMtphFwuE1ZwlxBSQZg2H6OWbt/rnS79fAiJUmS7DSUel+ZlBzdSlg6Bg== dependencies: "@babel/core" "^7.16.0" "@babel/plugin-proposal-class-properties" "^7.16.0" @@ -4477,10 +4575,10 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== -"@types/estree@0.0.39": - version "0.0.39" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" - integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== +"@types/estree@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" + integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": version "4.17.31" @@ -4889,12 +4987,10 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/resolve@1.17.1": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" - integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw== - dependencies: - "@types/node" "*" +"@types/resolve@1.20.2": + version "1.20.2" + resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975" + integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q== "@types/responselike@*", "@types/responselike@^1.0.0": version "1.0.0" @@ -6335,7 +6431,7 @@ azure-devops-node-api@^11.0.1: tunnel "0.0.6" typed-rest-client "^1.8.4" -babel-core@7.0.0-bridge.0, babel-core@^7.0.0-bridge.0: +babel-core@^7.0.0-bridge.0: version "7.0.0-bridge.0" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg== @@ -6354,7 +6450,7 @@ babel-jest@^27.5.1: graceful-fs "^4.2.9" slash "^3.0.0" -babel-loader@^8.0.0, babel-loader@^8.1.0, babel-loader@^8.2.2: +babel-loader@^8.0.0, babel-loader@^8.2.2: version "8.2.5" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e" integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ== @@ -6364,6 +6460,14 @@ babel-loader@^8.0.0, babel-loader@^8.1.0, babel-loader@^8.2.2: make-dir "^3.1.0" schema-utils "^2.6.5" +babel-loader@^9.1.2: + version "9.1.2" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.2.tgz#a16a080de52d08854ee14570469905a5fc00d39c" + integrity sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA== + dependencies: + find-cache-dir "^3.3.2" + schema-utils "^4.0.0" + babel-plugin-add-module-exports@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz#9ae9a1f4a8dc67f0cdec4f4aeda1e43a5ff65e25" @@ -8206,11 +8310,16 @@ core-js-pure@^3.20.2, core-js-pure@^3.8.1: resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.3.tgz#181d1b6321fb29fe99c16a1f28beb840ab84ad36" integrity sha512-oN88zz7nmKROMy8GOjs+LN+0LedIvbMdnB5XsTlhcOg1WGARt9l0LFg0zohdoFmCsEZ1h2ZbSQ6azj3M+vhzwQ== -core-js@^3.0.0, core-js@^3.0.4, core-js@^3.20.2, core-js@^3.6.5, core-js@^3.8.2: +core-js@^3.0.0, core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2: version "3.22.3" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.3.tgz#498c41d997654cb00e81c7a54b44f0ab21ab01d5" integrity sha512-1t+2a/d2lppW1gkLXx3pKPVGbBdxXAkqztvWb1EJ8oF8O2gIGiytzflNiFEehYwVK/t2ryUsGBoOFFvNx95mbg== +core-js@^3.26.0: + version "3.27.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.27.2.tgz#85b35453a424abdcacb97474797815f4d62ebbf7" + integrity sha512-9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w== + core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -9954,12 +10063,7 @@ estree-to-babel@^3.1.0: "@babel/types" "^7.2.0" c8 "^7.6.0" -estree-walker@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" - integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== - -estree-walker@^2.0.1: +estree-walker@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== @@ -10590,7 +10694,7 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: make-dir "^2.0.0" pkg-dir "^3.0.0" -find-cache-dir@^3.3.1: +find-cache-dir@^3.3.1, find-cache-dir@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== @@ -11364,6 +11468,17 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, gl once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.3: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + global-dirs@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" @@ -12735,7 +12850,7 @@ is-buffer@^2.0.0, is-buffer@^2.0.2: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== -is-builtin-module@^3.1.0: +is-builtin-module@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.0.tgz#bb0310dfe881f144ca83f30100ceb10cf58835e0" integrity sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw== @@ -12775,6 +12890,13 @@ is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.1: dependencies: has "^1.0.3" +is-core-module@^2.9.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" + integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== + dependencies: + has "^1.0.3" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -13059,7 +13181,7 @@ is-redirect@^1.0.0: resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" integrity sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw== -is-reference@^1.2.1: +is-reference@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7" integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ== @@ -14021,6 +14143,11 @@ json5@^2.1.2, json5@^2.1.3, json5@^2.2.1: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== +json5@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== + jsonfile@^2.1.0: version "2.4.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" @@ -14719,12 +14846,12 @@ lz-string@^1.4.4: resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" integrity sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ== -magic-string@^0.25.7: - version "0.25.9" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" - integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== +magic-string@^0.27.0: + version "0.27.0" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3" + integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA== dependencies: - sourcemap-codec "^1.4.8" + "@jridgewell/sourcemap-codec" "^1.4.13" make-dir@^1.0.0: version "1.3.0" @@ -15599,7 +15726,7 @@ mini-css-extract-plugin@^2.6.0: dependencies: schema-utils "^4.0.0" -mini-svg-data-uri@^1.2.3: +mini-svg-data-uri@^1.4.4: version "1.4.4" resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939" integrity sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg== @@ -17221,7 +17348,7 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.0, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -19170,7 +19297,7 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.2: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.2: version "1.22.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== @@ -19179,6 +19306,15 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.17 path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@^1.22.1: + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== + dependencies: + is-core-module "^2.9.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + resolve@^2.0.0-next.3: version "2.0.0-next.3" resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" @@ -19282,17 +19418,15 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rollup-plugin-node-externals@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-node-externals/-/rollup-plugin-node-externals-4.0.0.tgz#cd4d30f9868eb542be8289880dacbbbecc3d9fa3" - integrity sha512-7L0lqN+AEJqS13x240F5zyArHn2tNpHC7Ju8vtS893DkutIU89k5v3A7jhnOqLvOXAzjm9Ha7UZdwHOPyqiPDQ== - dependencies: - find-up "^5.0.0" +rollup-plugin-node-externals@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-node-externals/-/rollup-plugin-node-externals-5.1.0.tgz#66accb0291bfc50c637c20d94ab26d4e5ff92e85" + integrity sha512-3kBlflgq7X7xZJCskDz3PRmnuVptEal/VHOmYCozqncVRHXp9986fwyQdsFpzaQljjF2WOdlLMZLyNBxbA5hww== -rollup@^2.70.2: - version "2.70.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.70.2.tgz#808d206a8851628a065097b7ba2053bd83ba0c0d" - integrity sha512-EitogNZnfku65I1DD5Mxe8JYRUCy0hkK5X84IlDtUs+O6JRMpRciXTzyCUuX11b5L5pvjH+OmFXiQ3XjabcXgg== +rollup@^3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.12.0.tgz#813d88ec11e36108da788fc471b3c81b365a7c29" + integrity sha512-4MZ8kA2HNYahIjz63rzrMMRvDqQDeS9LoriJvMuV0V6zIGysP36e9t4yObUfwdT9h/szXoHQideICftcdZklWg== optionalDependencies: fsevents "~2.3.2" From e2ab1fb750a1d7aacb0f5a7ec8309556954fbb71 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Mon, 30 Jan 2023 10:10:37 +1100 Subject: [PATCH 02/10] Bump nodejs --- .eslintrc.js | 6 ------ .github/CONTRIBUTING.md | 2 +- .github/workflows/changelog.yml | 4 ++-- .github/workflows/ci-a11y-vrt.yml | 8 ++++---- .github/workflows/ci.yml | 2 +- .nvmrc | 2 +- dev.yml | 2 +- documentation/Nodejs support.md | 16 ++++++++-------- package.json | 2 +- polaris-migrator/rollup.config.mjs | 2 +- polaris-react/rollup.config.mjs | 2 +- 11 files changed, 21 insertions(+), 27 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 2ae6a23f318..b6e7a4d9547 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -116,12 +116,6 @@ module.exports = { 'import/extensions': 'off', 'import/no-default-export': 'off', 'import/no-anonymous-default-export': 'off', - // We could omit this if we set `engines` fields properly - // As we don't set them then eslint thinks we're using node 8 - 'node/no-unsupported-features/node-builtins': [ - 'error', - {version: '>=16.0.0'}, - ], }, }, { diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1f564d2fd4e..541f7dad576 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -137,7 +137,7 @@ Each contributor is required to [sign a CLA](https://cla.shopify.com/). This pro ### Contribution prerequisites -- You have Node installed at v16.13.0+ and Yarn at v1.22.18+ +- You have Node installed at v18.13.0+ and Yarn at v1.22.18+ ### Best practices diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index cffce71434f..508be63b266 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -21,10 +21,10 @@ jobs: with: fetch-depth: 0 - - name: Setup Node with v16.13.0 + - name: Setup Node with v18.13.0 uses: actions/setup-node@v3 with: - node-version: 16.13.0 + node-version: 18.13.0 - name: Check for Changeset run: npx @changesets/cli status --since="origin/main" diff --git a/.github/workflows/ci-a11y-vrt.yml b/.github/workflows/ci-a11y-vrt.yml index 5e1fbf07268..239ba0a222a 100644 --- a/.github/workflows/ci-a11y-vrt.yml +++ b/.github/workflows/ci-a11y-vrt.yml @@ -32,10 +32,10 @@ jobs: sudo rm -rf "/usr/local/share/boost" sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - name: Setup Node with v16.13.0 + - name: Setup Node with v18.13.0 uses: actions/setup-node@v3 with: - node-version: 16.13.0 + node-version: 18.13.0 cache: yarn - name: Restore cache @@ -72,10 +72,10 @@ jobs: with: fetch-depth: 0 # Chromatic git history to track changes - - name: Setup Node with v16.13.0 + - name: Setup Node with v18.13.0 uses: actions/setup-node@v3 with: - node-version: 16.13.0 + node-version: 18.13.0 cache: yarn - name: Restore cache diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39c8667cf45..f655950c7da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: ['14.18.0', '16.13.0'] + node-version: ['16.16.0', '18.13.0'] steps: - name: Checkout branch uses: actions/checkout@v3 diff --git a/.nvmrc b/.nvmrc index ff650592a1e..0e9dc6b5867 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v16.13.0 +v18.13.0 diff --git a/dev.yml b/dev.yml index 9ff7e7c0a44..d5bde020b2b 100644 --- a/dev.yml +++ b/dev.yml @@ -2,7 +2,7 @@ name: polaris up: - node: yarn: v1.22.18 - version: v16.13.0 # to be kept in sync with .nvmrc and .github/workflows/ci.yml + version: v18.13.0 # to be kept in sync with .nvmrc and .github/workflows/ci.yml - custom: name: Build monorepo met?: yarn build --output-logs=none diff --git a/documentation/Nodejs support.md b/documentation/Nodejs support.md index b6e6ef5224d..863c74660bb 100644 --- a/documentation/Nodejs support.md +++ b/documentation/Nodejs support.md @@ -16,26 +16,26 @@ The `package.json` engines. This should match the `.github/workflows/ci.yml` and ```json "engines": { - "node": "^14.18.0 || ^16.13.0" + "node": "^16.16.0 || ^18.13.0" }, ``` The GitHub actions `.github/workflows/ci.yml` file. This should match the `package.json` and list all supported versions. ```yml -node-version: ['14.18.0', '16.13.0'] +node-version: ['16.16.0', '18.13.0'] ``` The `dev.yml` file which creates a local development environment. This should match the `.nvmrc` file. ```yml -version: v16.13.0 +version: v18.13.0 ``` The `.nvmrc` file for local development. This should match the `dev.yml` file. ``` -v16.13.0 +v18.13.0 ``` The `shipit.yml` files. This should point towards the GitHub Actions the packages require to pass before publishing. @@ -43,11 +43,11 @@ The `shipit.yml` files. This should point towards the GitHub Actions the package ```yml ci: require: - - 'Validate with Node v14.18.0' - - 'Validate with Node v16.13.0' + - 'Validate with Node v16.16.0' + - 'Validate with Node v18.13.0' merge: require: - - 'Validate with Node v14.18.0' - - 'Validate with Node v16.13.0' + - 'Validate with Node v16.16.0' + - 'Validate with Node v18.13.0' ``` diff --git a/package.json b/package.json index af130a5d113..23a2a7764ed 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "engines": { - "node": "^14.18.0 || ^16.13.0" + "node": "^16.16.0 || ^18.13.0" }, "workspaces": { "packages": [ diff --git a/polaris-migrator/rollup.config.mjs b/polaris-migrator/rollup.config.mjs index 954b50853ac..badbd0ab029 100644 --- a/polaris-migrator/rollup.config.mjs +++ b/polaris-migrator/rollup.config.mjs @@ -45,7 +45,7 @@ export default { include: ['src/**/*'], babelHelpers: 'bundled', envName: 'production', - targets: 'node 14.13', + targets: 'node 16.16', }), json({compact: true}), ], diff --git a/polaris-react/rollup.config.mjs b/polaris-react/rollup.config.mjs index 984e1d8e6f1..45c3b8f1c8d 100644 --- a/polaris-react/rollup.config.mjs +++ b/polaris-react/rollup.config.mjs @@ -54,7 +54,7 @@ function generateConfig({output, targets, stylesConfig}) { /** @type {import('rollup').RollupOptions} */ export default [ generateConfig({ - targets: 'extends @shopify/browserslist-config, node 12.20', + targets: 'extends @shopify/browserslist-config, node 16.16', stylesConfig: { mode: 'standalone', output: 'styles.css', From 2d05096d0a8e912aa7609a0cad8dfbbde2a4b8de Mon Sep 17 00:00:00 2001 From: Alex Page Date: Mon, 30 Jan 2023 10:19:20 +1100 Subject: [PATCH 03/10] Update migrating-from-v10-to-v11.md --- documentation/guides/migrating-from-v10-to-v11.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/documentation/guides/migrating-from-v10-to-v11.md b/documentation/guides/migrating-from-v10-to-v11.md index d5dc182c192..a1cd1afcf61 100644 --- a/documentation/guides/migrating-from-v10-to-v11.md +++ b/documentation/guides/migrating-from-v10-to-v11.md @@ -4,11 +4,16 @@ Polaris v11.0.0 ([full release notes](https://github.com/Shopify/polaris/release ## Table of Contents +- [Node support](#node-support) - [Components](#components) - [Removed deprecated Collapsible argument](#removed-deprecated-collapsible-argument) - [Removed KonamiCode component](#removed-konamicode-component) - [Tokens](#tokens) +## Node support + +NodeJS version 14 is no longer supported. NodeJS 18 is recommended and 16 is supported. + ## Components ### Removed deprecated Collapsible argument From 273d137ae127081be8847bcf5311fdc3d01b42d8 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Mon, 30 Jan 2023 10:31:26 +1100 Subject: [PATCH 04/10] 3/x Enforce NodeJS versions with engines in package.json (#8202) ### WHY are these changes introduced? We currently set `engines` on the root `package.json`. The problem with this is that consumers of the library do not get this information and they can use the libraries without any warning of what version of NodeJS it supports. This change adds the engines field to each package to ensure our consumers are using supported versions of NodeJS. ### WHAT is this pull request doing? Adding the engines field to package.json files --- polaris-cli/package.json | 2 +- polaris-for-vscode/package.json | 2 +- polaris-icons/package.json | 3 +++ polaris-migrator/package.json | 3 +++ polaris-react/package.json | 3 +++ polaris-tokens/package.json | 3 +++ polaris.shopify.com/package.json | 3 +++ stylelint-polaris/package.json | 3 +++ 8 files changed, 20 insertions(+), 2 deletions(-) diff --git a/polaris-cli/package.json b/polaris-cli/package.json index 28ebfaf0b9f..4a1e266018e 100644 --- a/polaris-cli/package.json +++ b/polaris-cli/package.json @@ -31,7 +31,7 @@ }, "engine-strict": true, "engines": { - "node": ">=14.13.1" + "node": "^16.16.0 || ^18.13.0" }, "os": [ "darwin", diff --git a/polaris-for-vscode/package.json b/polaris-for-vscode/package.json index 05b19d8856a..2e341fdb7a0 100644 --- a/polaris-for-vscode/package.json +++ b/polaris-for-vscode/package.json @@ -20,7 +20,7 @@ "shopify" ], "engines": { - "vscode": "^1.64.0" + "node": "^16.16.0 || ^18.13.0" }, "categories": [ "Other" diff --git a/polaris-icons/package.json b/polaris-icons/package.json index 2c9d2a05da9..4dbfddbb822 100644 --- a/polaris-icons/package.json +++ b/polaris-icons/package.json @@ -13,6 +13,9 @@ ] } }, + "engines": { + "node": "^16.16.0 || ^18.13.0" + }, "scripts": { "build": "rollup -c", "dev": "rollup -c -w", diff --git a/polaris-migrator/package.json b/polaris-migrator/package.json index 5ceeca93d57..82e8f2bcc2e 100644 --- a/polaris-migrator/package.json +++ b/polaris-migrator/package.json @@ -6,6 +6,9 @@ "author": "Shopify ", "homepage": "https://polaris.shopify.com", "repository": "https://github.com/Shopify/polaris", + "engines": { + "node": "^16.16.0 || ^18.13.0" + }, "bugs": { "url": "https://github.com/Shopify/polaris/issues" }, diff --git a/polaris-react/package.json b/polaris-react/package.json index 3fd04a8437a..324d5e5a697 100644 --- a/polaris-react/package.json +++ b/polaris-react/package.json @@ -10,6 +10,9 @@ "bugs": { "url": "https://github.com/Shopify/polaris/issues" }, + "engines": { + "node": "^16.16.0 || ^18.13.0" + }, "publishConfig": { "access": "public", "@shopify:registry": "https://registry.npmjs.org" diff --git a/polaris-tokens/package.json b/polaris-tokens/package.json index ec614e8b9d8..4bc09662250 100644 --- a/polaris-tokens/package.json +++ b/polaris-tokens/package.json @@ -5,6 +5,9 @@ "main": "dist/cjs/build/index.js", "module": "dist/esm/build/index.mjs", "types": "dist/types/build/index.d.ts", + "engines": { + "node": "^16.16.0 || ^18.13.0" + }, "exports": { ".": { "types": "./dist/types/build/index.d.ts", diff --git a/polaris.shopify.com/package.json b/polaris.shopify.com/package.json index 26fe4bdce34..2c4f541af79 100644 --- a/polaris.shopify.com/package.json +++ b/polaris.shopify.com/package.json @@ -2,6 +2,9 @@ "name": "polaris.shopify.com", "version": "0.30.1", "private": true, + "engines": { + "node": "^16.16.0 || ^18.13.0" + }, "scripts": { "build": "yarn gen-assets && playroom build && next build && cp -r public ./.next/standalone/polaris.shopify.com/ && mkdirp ./.next/standalone/polaris.shopify.com/.next && cp -r .next/static ./.next/standalone/polaris.shopify.com/.next/", "start": "cd ./.next/standalone/polaris.shopify.com && node ./server.js", diff --git a/stylelint-polaris/package.json b/stylelint-polaris/package.json index 7438a7bba25..0995e1a1b0c 100644 --- a/stylelint-polaris/package.json +++ b/stylelint-polaris/package.json @@ -13,6 +13,9 @@ "access": "public", "@shopify:registry": "https://registry.npmjs.org" }, + "engines": { + "node": "^16.16.0 || ^18.13.0" + }, "files": [ "index.js", "configs/", From 7935ed51729e376efd199ee3b1b6f220a7bcf3ec Mon Sep 17 00:00:00 2001 From: Alex Page Date: Mon, 30 Jan 2023 10:51:34 +1100 Subject: [PATCH 05/10] Remove unnecessary linting comments --- polaris-react/playground/DetailsPage.tsx | 3 +-- polaris-react/scripts/build-validate.js | 1 - .../components/DropZone/DropZone.stories.tsx | 20 ++++++------------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/polaris-react/playground/DetailsPage.tsx b/polaris-react/playground/DetailsPage.tsx index 00d3c2121da..304597b37b6 100644 --- a/polaris-react/playground/DetailsPage.tsx +++ b/polaris-react/playground/DetailsPage.tsx @@ -527,8 +527,7 @@ export function DetailsPage() { alt={file.name} source={ validImageTypes.indexOf(file.type) > 0 - ? // eslint-disable-next-line node/no-unsupported-features/node-builtins - URL.createObjectURL(file) + ? URL.createObjectURL(file) : 'https://cdn.shopify.com/s/files/1/0757/9955/files/New_Post.png?12678548500147524304' } /> diff --git a/polaris-react/scripts/build-validate.js b/polaris-react/scripts/build-validate.js index 4b2dcf87612..8a31617e6c7 100644 --- a/polaris-react/scripts/build-validate.js +++ b/polaris-react/scripts/build-validate.js @@ -1,4 +1,3 @@ -// eslint-disable-next-line node/no-unsupported-features/node-builtins const assert = require('assert').strict; const fs = require('fs'); diff --git a/polaris-react/src/components/DropZone/DropZone.stories.tsx b/polaris-react/src/components/DropZone/DropZone.stories.tsx index e4898b201ba..5b4816c3c4b 100644 --- a/polaris-react/src/components/DropZone/DropZone.stories.tsx +++ b/polaris-react/src/components/DropZone/DropZone.stories.tsx @@ -38,8 +38,7 @@ export function Default() { alt={file.name} source={ validImageTypes.includes(file.type) - ? // eslint-disable-next-line node/no-unsupported-features/node-builtins - window.URL.createObjectURL(file) + ? window.URL.createObjectURL(file) : NoteMinor } /> @@ -92,7 +91,6 @@ export function WithImageFileUpload() {
@@ -151,8 +149,7 @@ export function WithSingleFileUpload() { alt={file.name} source={ validImageTypes.includes(file.type) - ? // eslint-disable-next-line node/no-unsupported-features/node-builtins - window.URL.createObjectURL(file) + ? window.URL.createObjectURL(file) : NoteMinor } /> @@ -193,8 +190,7 @@ export function WithDropOnPage() { alt={file.name} source={ validImageTypes.includes(file.type) - ? // eslint-disable-next-line node/no-unsupported-features/node-builtins - window.URL.createObjectURL(file) + ? window.URL.createObjectURL(file) : NoteMinor } /> @@ -253,7 +249,6 @@ export function AcceptsOnlySVGFiles() {
@@ -318,8 +313,7 @@ export function Nested() { alt={file.name} source={ validImageTypes.includes(file.type) - ? // eslint-disable-next-line node/no-unsupported-features/node-builtins - window.URL.createObjectURL(file) + ? window.URL.createObjectURL(file) : NoteMinor } /> @@ -390,8 +384,7 @@ export function WithCustomFileUploadText() { alt={file.name} source={ validImageTypes.includes(file.type) - ? // eslint-disable-next-line node/no-unsupported-features/node-builtins - window.URL.createObjectURL(file) + ? window.URL.createObjectURL(file) : NoteMinor } /> @@ -439,8 +432,7 @@ export function WithCustomFileDialogTrigger() { alt={file.name} source={ validImageTypes.includes(file.type) - ? // eslint-disable-next-line node/no-unsupported-features/node-builtins - window.URL.createObjectURL(file) + ? window.URL.createObjectURL(file) : NoteMinor } /> From 8779cbad5f88a56b33884ca6d41da7fea67cf139 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Mon, 30 Jan 2023 11:26:44 +1100 Subject: [PATCH 06/10] Add complete version to rollup so it can be replaced easily --- polaris-migrator/rollup.config.mjs | 2 +- polaris-react/rollup.config.mjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/polaris-migrator/rollup.config.mjs b/polaris-migrator/rollup.config.mjs index badbd0ab029..f37321bfbf2 100644 --- a/polaris-migrator/rollup.config.mjs +++ b/polaris-migrator/rollup.config.mjs @@ -45,7 +45,7 @@ export default { include: ['src/**/*'], babelHelpers: 'bundled', envName: 'production', - targets: 'node 16.16', + targets: 'node 16.16.0', }), json({compact: true}), ], diff --git a/polaris-react/rollup.config.mjs b/polaris-react/rollup.config.mjs index 45c3b8f1c8d..401f5494411 100644 --- a/polaris-react/rollup.config.mjs +++ b/polaris-react/rollup.config.mjs @@ -54,7 +54,7 @@ function generateConfig({output, targets, stylesConfig}) { /** @type {import('rollup').RollupOptions} */ export default [ generateConfig({ - targets: 'extends @shopify/browserslist-config, node 16.16', + targets: 'extends @shopify/browserslist-config, node 16.16.0', stylesConfig: { mode: 'standalone', output: 'styles.css', From 08622a8834fc60bc77238336dfa4ba493f005106 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Mon, 30 Jan 2023 11:56:10 +1100 Subject: [PATCH 07/10] Bump NodeJS types --- package.json | 1 + polaris-for-vscode/package.json | 1 - polaris-react/package.json | 1 - polaris.shopify.com/package.json | 1 - yarn.lock | 18 ++++-------------- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 23a2a7764ed..967557af572 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "@shopify/typescript-configs": "^5.1.0", "@size-limit/preset-small-lib": "^5.0.3", "@types/jest": "^27.5.1", + "@types/node": "^18.11.18", "babel-loader": "^9.1.2", "downlevel-dts": "^0.6.0", "eslint": "^8.3.0", diff --git a/polaris-for-vscode/package.json b/polaris-for-vscode/package.json index 2e341fdb7a0..43bcfdd66a3 100644 --- a/polaris-for-vscode/package.json +++ b/polaris-for-vscode/package.json @@ -43,7 +43,6 @@ }, "devDependencies": { "@shopify/polaris-tokens": "^6.3.0", - "@types/node": "14.x", "@types/vscode": "^1.64.0", "@vscode/test-electron": "^2.1.2", "globby": "^11.1.0", diff --git a/polaris-react/package.json b/polaris-react/package.json index 324d5e5a697..0211e92417f 100644 --- a/polaris-react/package.json +++ b/polaris-react/package.json @@ -90,7 +90,6 @@ "@storybook/builder-webpack5": "^6.5.12", "@storybook/manager-webpack5": "^6.5.12", "@storybook/react": "^6.5.12", - "@types/node": "^16.11.11", "@types/react": "^18.0.15", "@types/react-dom": "^18.0.6", "ajv-cli": "^5.0.0", diff --git a/polaris.shopify.com/package.json b/polaris.shopify.com/package.json index 2c4f541af79..04ab907458d 100644 --- a/polaris.shopify.com/package.json +++ b/polaris.shopify.com/package.json @@ -50,7 +50,6 @@ "@types/lodash.get": "^4.4.7", "@types/lodash.throttle": "^4.1.7", "@types/marked": "^4.0.3", - "@types/node": "17.0.21", "@types/prismjs": "^1.26.0", "@types/react": "18.0.15", "babel-plugin-preval": "^5.1.0", diff --git a/yarn.lock b/yarn.lock index 7b70eae9499..3987e7475a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4851,16 +4851,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.29.tgz#7f2e1159231d4a077bb660edab0fde373e375a3d" integrity sha512-tx5jMmMFwx7wBwq/V7OohKDVb/JwJU5qCVkeLMh1//xycAJ/ESuw9aJ9SEtlCZDYi2pBfe4JkisSoAtbOsBNAA== -"@types/node@14.x": - version "14.18.16" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.16.tgz#878f670ba3f00482bf859b6550b6010610fc54b5" - integrity sha512-X3bUMdK/VmvrWdoTkz+VCn6nwKwrKCFTHtqwBIaQJNx4RUIBBUFXM00bqPz/DsDd+Icjmzm6/tyYZzeGVqb6/Q== - -"@types/node@17.0.21": - version "17.0.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" - integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ== - "@types/node@^12.7.1": version "12.20.52" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.52.tgz#2fd2dc6bfa185601b15457398d4ba1ef27f81251" @@ -4871,10 +4861,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.45.tgz#155b13a33c665ef2b136f7f245fa525da419e810" integrity sha512-3rKg/L5x0rofKuuUt5zlXzOnKyIHXmIu5R8A0TuNDMF2062/AOIDBciFIjToLEJ/9F9DzkHNot+BpNsMI1OLdQ== -"@types/node@^16.11.11": - version "16.11.31" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.31.tgz#1dad8138efee6808809bb80f9e66bbe3e46c9277" - integrity sha512-wh/d0pcu/Ie2mqTIqh4tjd0mLAB4JWxOjHQtLN20HS7sjMHiV4Afr+90hITTyZcxowwha5wjv32jGEn1zkEFMg== +"@types/node@^18.11.18": + version "18.11.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" + integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== "@types/node@^8.10.50": version "8.10.66" From 7eabd34dffc2cf836bc7dd1869fc9cf97adb6fbc Mon Sep 17 00:00:00 2001 From: Alex Page Date: Mon, 30 Jan 2023 11:57:40 +1100 Subject: [PATCH 08/10] Update Nodejs support.md --- documentation/Nodejs support.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/documentation/Nodejs support.md b/documentation/Nodejs support.md index 863c74660bb..d1efcdc986a 100644 --- a/documentation/Nodejs support.md +++ b/documentation/Nodejs support.md @@ -51,3 +51,5 @@ merge: - 'Validate with Node v16.16.0' - 'Validate with Node v18.13.0' ``` + +The `rollup.config.mjs` for some projects. This should match the minimum supported version. From 3cd33ac53d68c32de395bb53a3451c3cd8019898 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Mon, 30 Jan 2023 11:59:45 +1100 Subject: [PATCH 09/10] Update documentation/guides/migrating-from-v10-to-v11.md --- documentation/guides/migrating-from-v10-to-v11.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/guides/migrating-from-v10-to-v11.md b/documentation/guides/migrating-from-v10-to-v11.md index a1cd1afcf61..72be8d42d77 100644 --- a/documentation/guides/migrating-from-v10-to-v11.md +++ b/documentation/guides/migrating-from-v10-to-v11.md @@ -12,7 +12,7 @@ Polaris v11.0.0 ([full release notes](https://github.com/Shopify/polaris/release ## Node support -NodeJS version 14 is no longer supported. NodeJS 18 is recommended and 16 is supported. +NodeJS version 14 is no longer supported. NodeJS 18 is recommended and 16 is the minimum supported version. ## Components From 8e91155af097e7184cbe01aedc862405c1e2f823 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Mon, 30 Jan 2023 12:01:34 +1100 Subject: [PATCH 10/10] Update documentation/Nodejs support.md --- documentation/Nodejs support.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/Nodejs support.md b/documentation/Nodejs support.md index d1efcdc986a..d6f1f4c3d20 100644 --- a/documentation/Nodejs support.md +++ b/documentation/Nodejs support.md @@ -52,4 +52,4 @@ merge: - 'Validate with Node v18.13.0' ``` -The `rollup.config.mjs` for some projects. This should match the minimum supported version. +The `rollup.config.mjs` for some monorepo packages. This should match the minimum supported version.