From 3b5d85e57104a96af140baa8837c36f24220bffc Mon Sep 17 00:00:00 2001 From: Alex Page Date: Wed, 1 Feb 2023 13:08:56 +1100 Subject: [PATCH 1/5] Browserslist --- polaris-react/package.json | 4 ++-- polaris-react/rollup.config.mjs | 3 +-- polaris-tokens/package.json | 13 +++++++++---- yarn.lock | 23 ++++------------------- 4 files changed, 16 insertions(+), 27 deletions(-) diff --git a/polaris-react/package.json b/polaris-react/package.json index 0e688785098..6236d65fc4c 100644 --- a/polaris-react/package.json +++ b/polaris-react/package.json @@ -79,7 +79,6 @@ }, "devDependencies": { "@changesets/get-release-plan": "^3.0.13", - "@shopify/browserslist-config": "^3.0.0", "@shopify/jest-dom-mocks": "^3.0.5", "@shopify/postcss-plugin": "^5.0.1", "@shopify/react-testing": "^4.1.0", @@ -125,6 +124,7 @@ "last 3 safari versions", "last 3 chromeandroid versions", "last 1 firefoxandroid versions", - "ios >= 13.4" + "ios >= 13.4", + "node 16.13.0" ] } diff --git a/polaris-react/rollup.config.mjs b/polaris-react/rollup.config.mjs index 72be19f0499..a9b8de1c584 100644 --- a/polaris-react/rollup.config.mjs +++ b/polaris-react/rollup.config.mjs @@ -34,7 +34,7 @@ function generateConfig({output, targets, stylesConfig}) { // we want to override envName: 'production', // @ts-expect-error targets is a valid babel option but @types/babel__core doesn't know that yet - targets, + ...(targets && {targets}), }), replace({ '{{POLARIS_VERSION}}': pkg.version, @@ -54,7 +54,6 @@ function generateConfig({output, targets, stylesConfig}) { /** @type {import('rollup').RollupOptions} */ export default [ generateConfig({ - targets: 'extends @shopify/browserslist-config, node 16.13.0', stylesConfig: { mode: 'standalone', output: 'styles.css', diff --git a/polaris-tokens/package.json b/polaris-tokens/package.json index 87f8ad45aac..8c1e9ffa70c 100644 --- a/polaris-tokens/package.json +++ b/polaris-tokens/package.json @@ -31,9 +31,6 @@ "test": "jest", "clean": "rm -rf .turbo node_modules dist *.tsbuildinfo build" }, - "devDependencies": { - "@shopify/browserslist-config": "^3.0.0" - }, "license": "SEE LICENSE IN LICENSE.md", "author": "Shopify ", "homepage": "https://polaris.shopify.com", @@ -46,7 +43,15 @@ "@shopify:registry": "https://registry.npmjs.org" }, "browserslist": [ - "extends @shopify/browserslist-config" + "last 3 chrome versions", + "last 3 firefox versions", + "last 3 opera versions", + "last 3 edge versions", + "last 3 safari versions", + "last 3 chromeandroid versions", + "last 1 firefoxandroid versions", + "ios >= 13.4", + "node 16.13.0" ], "files": [ "dist" diff --git a/yarn.lock b/yarn.lock index 3987e7475a3..6e561834725 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3323,11 +3323,6 @@ babel-plugin-react-test-id "^1.0.2" babel-plugin-transform-inline-environment-variables "^0.4.3" -"@shopify/browserslist-config@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@shopify/browserslist-config/-/browserslist-config-3.0.0.tgz#fedfef0dedc97155a60432c152eff50df88e13d2" - integrity sha512-NzZTZ8EEG6xmM1ApSsQFDqW6C5CmByNhXyLxwWjVX08GzHxkhMc10MSY7WGvTCzd1lQuZEp8Ko/jOCBTQQsEGg== - "@shopify/cli-kit@3.10.1": version "3.10.1" resolved "https://registry.yarnpkg.com/@shopify/cli-kit/-/cli-kit-3.10.1.tgz#deaf0ead4989ad4d7645a00b7f4b9cbeb8052993" @@ -7395,20 +7390,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001332: - version "1.0.30001334" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001334.tgz#892e9965b35285033fc2b8a8eff499fe02f13d8b" - integrity sha512-kbaCEBRRVSoeNs74sCuq92MJyGrMtjWVfhltoHUCW4t4pXFvGjUBrfo47weBRViHkiV3eBYyIsfl956NtHGazw== - -caniuse-lite@^1.0.30001400: - version "1.0.30001418" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001418.tgz#5f459215192a024c99e3e3a53aac310fc7cf24e6" - integrity sha512-oIs7+JL3K9JRQ3jPZjlH6qyYDp+nBTCais7hjh0s+fuBwufc7uZ7hPYMXrDOJhV360KGMTcczMRObk0/iMqZRg== - -caniuse-lite@^1.0.30001406: - version "1.0.30001426" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001426.tgz#58da20446ccd0cb1dfebd11d2350c907ee7c2eaa" - integrity sha512-n7cosrHLl8AWt0wwZw/PJZgUg3lV0gk9LMI7ikGJwhyhgsd2Nb65vKvmSexCqq/J7rbH3mFG6yZZiPR5dLPW5A== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001332, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001406: + version "1.0.30001449" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz" + integrity sha512-CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw== capital-case@^1.0.4: version "1.0.4" From 43fe68288041f8edc7a892aa8e9e8d182b3349cc Mon Sep 17 00:00:00 2001 From: Alex Page Date: Fri, 3 Feb 2023 12:42:20 +1100 Subject: [PATCH 2/5] Point babel to the browserslist config in package.json --- polaris-react/package.json | 2 +- polaris-react/rollup.config.mjs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/polaris-react/package.json b/polaris-react/package.json index 1c01df5e3c3..2d20ca4650f 100644 --- a/polaris-react/package.json +++ b/polaris-react/package.json @@ -117,6 +117,6 @@ "last 3 chromeandroid versions", "last 1 firefoxandroid versions", "ios >= 13.4", - "node 16.13.0" + "node 16.17.0" ] } diff --git a/polaris-react/rollup.config.mjs b/polaris-react/rollup.config.mjs index a9b8de1c584..899b8fc0aff 100644 --- a/polaris-react/rollup.config.mjs +++ b/polaris-react/rollup.config.mjs @@ -33,8 +33,7 @@ function generateConfig({output, targets, stylesConfig}) { // Options that may be present on the `babelConfig` object but // we want to override envName: 'production', - // @ts-expect-error targets is a valid babel option but @types/babel__core doesn't know that yet - ...(targets && {targets}), + targets, }), replace({ '{{POLARIS_VERSION}}': pkg.version, @@ -54,6 +53,7 @@ function generateConfig({output, targets, stylesConfig}) { /** @type {import('rollup').RollupOptions} */ export default [ generateConfig({ + targets: {}, stylesConfig: { mode: 'standalone', output: 'styles.css', From abaaf2340315e11b49f2c01f2b072aa5b2354856 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Tue, 14 Feb 2023 16:54:28 +1100 Subject: [PATCH 3/5] Use the pkg.targets --- polaris-react/rollup.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polaris-react/rollup.config.mjs b/polaris-react/rollup.config.mjs index 899b8fc0aff..499a12d365b 100644 --- a/polaris-react/rollup.config.mjs +++ b/polaris-react/rollup.config.mjs @@ -53,7 +53,7 @@ function generateConfig({output, targets, stylesConfig}) { /** @type {import('rollup').RollupOptions} */ export default [ generateConfig({ - targets: {}, + targets: pkg.targets, stylesConfig: { mode: 'standalone', output: 'styles.css', From 433b2507d299a1fd85f8be616b3af65ab8180017 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Tue, 14 Feb 2023 17:18:54 +1100 Subject: [PATCH 4/5] Update rollup.config.mjs --- polaris-react/rollup.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polaris-react/rollup.config.mjs b/polaris-react/rollup.config.mjs index 499a12d365b..f0cce7d5bfe 100644 --- a/polaris-react/rollup.config.mjs +++ b/polaris-react/rollup.config.mjs @@ -53,7 +53,7 @@ function generateConfig({output, targets, stylesConfig}) { /** @type {import('rollup').RollupOptions} */ export default [ generateConfig({ - targets: pkg.targets, + targets: pkg.browserslist, stylesConfig: { mode: 'standalone', output: 'styles.css', From 170a362ed52bb9fb5fa58ec1d5f301a72571c570 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Tue, 14 Feb 2023 19:06:35 +1100 Subject: [PATCH 5/5] Update package.json --- polaris-tokens/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polaris-tokens/package.json b/polaris-tokens/package.json index f6fd9b026bd..7b9be46cb40 100644 --- a/polaris-tokens/package.json +++ b/polaris-tokens/package.json @@ -51,7 +51,7 @@ "last 3 chromeandroid versions", "last 1 firefoxandroid versions", "ios >= 13.4", - "node 16.13.0" + "node 16.17.0" ], "files": [ "dist"