From 0cdbc3750e21e68af6ab8ebc07b1c90afdb810ba Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Tue, 14 Jun 2022 11:43:59 -0400 Subject: [PATCH] Update @vitejs/plugin-react for vite 3 support --- examples/react-18/package.json | 2 +- examples/react-ts/package.json | 2 +- examples/react/package.json | 2 +- packages/builder-vite/package.json | 2 +- yarn.lock | 240 +++++++++++++++++++++++++---- 5 files changed, 218 insertions(+), 30 deletions(-) diff --git a/examples/react-18/package.json b/examples/react-18/package.json index 6c092f5d..25919f9e 100644 --- a/examples/react-18/package.json +++ b/examples/react-18/package.json @@ -24,7 +24,7 @@ "@storybook/builder-vite": "workspace:*", "@storybook/react": "^6.5.0", "@storybook/test-runner": "0.1.0", - "@vitejs/plugin-react": "^1.3.0", + "@vitejs/plugin-react": "^2.0.0-alpha.2", "http-server": "^14.1.0", "jest": "^27.5.1", "npm-run-all": "^4.1.5", diff --git a/examples/react-ts/package.json b/examples/react-ts/package.json index 69ab6232..7dfce8d2 100644 --- a/examples/react-ts/package.json +++ b/examples/react-ts/package.json @@ -24,7 +24,7 @@ "@storybook/builder-vite": "workspace:*", "@storybook/react": "^6.5.0", "@storybook/test-runner": "0.1.0", - "@vitejs/plugin-react": "^1.3.0", + "@vitejs/plugin-react": "^2.0.0-alpha.2", "http-server": "^14.1.0", "jest": "^27.5.1", "npm-run-all": "^4.1.5", diff --git a/examples/react/package.json b/examples/react/package.json index ab20b5ad..acbcdb71 100644 --- a/examples/react/package.json +++ b/examples/react/package.json @@ -24,7 +24,7 @@ "@storybook/builder-vite": "workspace:*", "@storybook/react": "^6.5.0", "@storybook/test-runner": "0.1.0", - "@vitejs/plugin-react": "^1.3.0", + "@vitejs/plugin-react": "^2.0.0-alpha.2", "http-server": "^14.1.0", "jest": "^27.5.1", "npm-run-all": "^4.1.5", diff --git a/packages/builder-vite/package.json b/packages/builder-vite/package.json index a534ad8a..ddf2388f 100644 --- a/packages/builder-vite/package.json +++ b/packages/builder-vite/package.json @@ -17,7 +17,7 @@ "@mdx-js/mdx": "^1.6.22", "@storybook/csf-tools": "^6.4.3", "@storybook/source-loader": "^6.4.3", - "@vitejs/plugin-react": "^1.0.8", + "@vitejs/plugin-react": "^2.0.0-alpha.2", "ast-types": "^0.14.2", "es-module-lexer": "^0.9.3", "glob": "^7.2.0", diff --git a/yarn.lock b/yarn.lock index 723aa7fc..2f19a02a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -37,6 +37,13 @@ __metadata: languageName: node linkType: hard +"@babel/compat-data@npm:^7.17.10": + version: 7.18.5 + resolution: "@babel/compat-data@npm:7.18.5" + checksum: 1baee39fcf0992402ed12d6be43739f3bfb7f0cacddee8959236692ae926bcc3f4fe5abdd907870f4fc8b9fd798c1e6e2999ae97c9b8aedbd834fe03f2765e73 + languageName: node + linkType: hard + "@babel/core@npm:7.12.9": version: 7.12.9 resolution: "@babel/core@npm:7.12.9" @@ -61,7 +68,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.17.9, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.0": +"@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.0": version: 7.17.9 resolution: "@babel/core@npm:7.17.9" dependencies: @@ -84,6 +91,29 @@ __metadata: languageName: node linkType: hard +"@babel/core@npm:^7.18.2": + version: 7.18.5 + resolution: "@babel/core@npm:7.18.5" + dependencies: + "@ampproject/remapping": ^2.1.0 + "@babel/code-frame": ^7.16.7 + "@babel/generator": ^7.18.2 + "@babel/helper-compilation-targets": ^7.18.2 + "@babel/helper-module-transforms": ^7.18.0 + "@babel/helpers": ^7.18.2 + "@babel/parser": ^7.18.5 + "@babel/template": ^7.16.7 + "@babel/traverse": ^7.18.5 + "@babel/types": ^7.18.4 + convert-source-map: ^1.7.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.2.1 + semver: ^6.3.0 + checksum: e20c3d69a07eb564408d611b827c2f5db56f05f1ca7cb3046f3823a1cf6b13c032f02d4b8ffe1e4593699e86e0f25ca1aee6228486c1ebea48d21aaeb28e6718 + languageName: node + linkType: hard + "@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.12.5, @babel/generator@npm:^7.17.9, @babel/generator@npm:^7.7.2": version: 7.17.9 resolution: "@babel/generator@npm:7.17.9" @@ -95,6 +125,17 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.18.2": + version: 7.18.2 + resolution: "@babel/generator@npm:7.18.2" + dependencies: + "@babel/types": ^7.18.2 + "@jridgewell/gen-mapping": ^0.3.0 + jsesc: ^2.5.1 + checksum: d0661e95532ddd97566d41fec26355a7b28d1cbc4df95fe80cc084c413342935911b48db20910708db39714844ddd614f61c2ec4cca3fb10181418bdcaa2e7a3 + languageName: node + linkType: hard + "@babel/helper-annotate-as-pure@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-annotate-as-pure@npm:7.16.7" @@ -128,6 +169,20 @@ __metadata: languageName: node linkType: hard +"@babel/helper-compilation-targets@npm:^7.18.2": + version: 7.18.2 + resolution: "@babel/helper-compilation-targets@npm:7.18.2" + dependencies: + "@babel/compat-data": ^7.17.10 + "@babel/helper-validator-option": ^7.16.7 + browserslist: ^4.20.2 + semver: ^6.3.0 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 4f02e79f20c0b3f8db5049ba8c35027c41ccb3fc7884835d04e49886538e0f55702959db1bb75213c94a5708fec2dc81a443047559a4f184abb884c72c0059b4 + languageName: node + linkType: hard + "@babel/helper-create-class-features-plugin@npm:^7.16.10, @babel/helper-create-class-features-plugin@npm:^7.16.7, @babel/helper-create-class-features-plugin@npm:^7.17.6, @babel/helper-create-class-features-plugin@npm:^7.17.9": version: 7.17.9 resolution: "@babel/helper-create-class-features-plugin@npm:7.17.9" @@ -202,6 +257,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-environment-visitor@npm:^7.18.2": + version: 7.18.2 + resolution: "@babel/helper-environment-visitor@npm:7.18.2" + checksum: 1a9c8726fad454a082d077952a90f17188e92eabb3de236cb4782c49b39e3f69c327e272b965e9a20ff8abf37d30d03ffa6fd7974625a6c23946f70f7527f5e9 + languageName: node + linkType: hard + "@babel/helper-explode-assignable-expression@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-explode-assignable-expression@npm:7.16.7" @@ -264,6 +326,22 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-transforms@npm:^7.18.0": + version: 7.18.0 + resolution: "@babel/helper-module-transforms@npm:7.18.0" + dependencies: + "@babel/helper-environment-visitor": ^7.16.7 + "@babel/helper-module-imports": ^7.16.7 + "@babel/helper-simple-access": ^7.17.7 + "@babel/helper-split-export-declaration": ^7.16.7 + "@babel/helper-validator-identifier": ^7.16.7 + "@babel/template": ^7.16.7 + "@babel/traverse": ^7.18.0 + "@babel/types": ^7.18.0 + checksum: 824c3967c08d75bb36adc18c31dcafebcd495b75b723e2e17c6185e88daf5c6db62a6a75d9f791b5f38618a349e7cb32503e715a1b9a4e8bad4d0f43e3e6b523 + languageName: node + linkType: hard + "@babel/helper-optimise-call-expression@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-optimise-call-expression@npm:7.16.7" @@ -287,6 +365,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-plugin-utils@npm:^7.17.12": + version: 7.17.12 + resolution: "@babel/helper-plugin-utils@npm:7.17.12" + checksum: 4813cf0ddb0f143de032cb88d4207024a2334951db330f8216d6fa253ea320c02c9b2667429ef1a34b5e95d4cfbd085f6cb72d418999751c31d0baf2422cc61d + languageName: node + linkType: hard + "@babel/helper-remap-async-to-generator@npm:^7.16.8": version: 7.16.8 resolution: "@babel/helper-remap-async-to-generator@npm:7.16.8" @@ -375,6 +460,17 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.18.2": + version: 7.18.2 + resolution: "@babel/helpers@npm:7.18.2" + dependencies: + "@babel/template": ^7.16.7 + "@babel/traverse": ^7.18.2 + "@babel/types": ^7.18.2 + checksum: 94620242f23f6d5f9b83a02b1aa1632ffb05b0815e1bb53d3b46d64aa8e771066bba1db8bd267d9091fb00134cfaeda6a8d69d1d4cc2c89658631adfa077ae70 + languageName: node + linkType: hard + "@babel/highlight@npm:^7.16.7": version: 7.17.9 resolution: "@babel/highlight@npm:7.17.9" @@ -395,6 +491,15 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.18.5": + version: 7.18.5 + resolution: "@babel/parser@npm:7.18.5" + bin: + parser: ./bin/babel-parser.js + checksum: 4976349d8681af215fd5771bd5b74568cc95a2e8bf2afcf354bf46f73f3d6f08d54705f354b1d0012f914dd02a524b7d37c5c1204ccaafccb9db3c37dba96a9b + languageName: node + linkType: hard + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.16.7": version: 7.16.7 resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.16.7" @@ -791,6 +896,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-syntax-jsx@npm:^7.17.12": + version: 7.17.12 + resolution: "@babel/plugin-syntax-jsx@npm:7.17.12" + dependencies: + "@babel/helper-plugin-utils": ^7.17.12 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 6acd0bbca8c3e0100ad61f3b7d0b0111cd241a0710b120b298c4aa0e07be02eccbcca61ede1e7678ade1783a0979f20305b62263df6767fa3fbf658670d82af5 + languageName: node + linkType: hard + "@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4, @babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3": version: 7.10.4 resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4" @@ -1201,14 +1317,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-react-jsx-self@npm:^7.16.7": - version: 7.16.7 - resolution: "@babel/plugin-transform-react-jsx-self@npm:7.16.7" +"@babel/plugin-transform-react-jsx-self@npm:^7.17.12": + version: 7.17.12 + resolution: "@babel/plugin-transform-react-jsx-self@npm:7.17.12" dependencies: - "@babel/helper-plugin-utils": ^7.16.7 + "@babel/helper-plugin-utils": ^7.17.12 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: cf1e408eedf99de3e49689473f329f0a45f1d8642536398570267f564a0da785a676045f042ca6e5d026bcee271127e3b2555fd84949fb7fc87f8ba4fefec34e + checksum: 63a376abf90d1ecbfd9661c07f22330c60cddd35aee1ead0bbb9d6698a2ef055088e85be857c2a1d519d77247ceb4c297f690e55ef6b0c6c472cd4f6483f2211 languageName: node linkType: hard @@ -1223,7 +1339,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-react-jsx@npm:^7.12.12, @babel/plugin-transform-react-jsx@npm:^7.16.7, @babel/plugin-transform-react-jsx@npm:^7.17.3": +"@babel/plugin-transform-react-jsx@npm:^7.12.12, @babel/plugin-transform-react-jsx@npm:^7.16.7": version: 7.17.3 resolution: "@babel/plugin-transform-react-jsx@npm:7.17.3" dependencies: @@ -1238,6 +1354,21 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-jsx@npm:^7.17.12": + version: 7.17.12 + resolution: "@babel/plugin-transform-react-jsx@npm:7.17.12" + dependencies: + "@babel/helper-annotate-as-pure": ^7.16.7 + "@babel/helper-module-imports": ^7.16.7 + "@babel/helper-plugin-utils": ^7.17.12 + "@babel/plugin-syntax-jsx": ^7.17.12 + "@babel/types": ^7.17.12 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 02e9974d14821173bb8e84db4bdfccd546bfdbf445d91d6345f953591f16306cf5741861d72e0d0910f3ffa7d4084fafed99cedf736e7ba8bed0cf64320c2ea6 + languageName: node + linkType: hard + "@babel/plugin-transform-react-pure-annotations@npm:^7.16.7": version: 7.16.7 resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.16.7" @@ -1558,6 +1689,24 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.18.0, @babel/traverse@npm:^7.18.2, @babel/traverse@npm:^7.18.5": + version: 7.18.5 + resolution: "@babel/traverse@npm:7.18.5" + dependencies: + "@babel/code-frame": ^7.16.7 + "@babel/generator": ^7.18.2 + "@babel/helper-environment-visitor": ^7.18.2 + "@babel/helper-function-name": ^7.17.9 + "@babel/helper-hoist-variables": ^7.16.7 + "@babel/helper-split-export-declaration": ^7.16.7 + "@babel/parser": ^7.18.5 + "@babel/types": ^7.18.4 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: cc0470c880e15a748ca3424665c65836dba450fd0331fb28f9d30aa42acd06387b6321996517ab1761213f781fe8d657e2c3ad67c34afcb766d50653b393810f + languageName: node + linkType: hard + "@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.7, @babel/types@npm:^7.13.12, @babel/types@npm:^7.16.0, @babel/types@npm:^7.16.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.17.0, @babel/types@npm:^7.2.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.6.1, @babel/types@npm:^7.8.3, @babel/types@npm:^7.9.6": version: 7.17.0 resolution: "@babel/types@npm:7.17.0" @@ -1568,6 +1717,16 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.17.12, @babel/types@npm:^7.18.0, @babel/types@npm:^7.18.2, @babel/types@npm:^7.18.4": + version: 7.18.4 + resolution: "@babel/types@npm:7.18.4" + dependencies: + "@babel/helper-validator-identifier": ^7.16.7 + to-fast-properties: ^2.0.0 + checksum: 85df59beb99c1b95e9e41590442f2ffa1e5b1b558d025489db40c9f7c906bd03a17da26c3ec486e5800e80af27c42ca7eee9506d9212ab17766d2d68d30fbf52 + languageName: node + linkType: hard + "@base2/pretty-print-object@npm:1.0.1": version: 1.0.1 resolution: "@base2/pretty-print-object@npm:1.0.1" @@ -2158,6 +2317,17 @@ __metadata: languageName: node linkType: hard +"@jridgewell/gen-mapping@npm:^0.3.0": + version: 0.3.1 + resolution: "@jridgewell/gen-mapping@npm:0.3.1" + dependencies: + "@jridgewell/set-array": ^1.0.0 + "@jridgewell/sourcemap-codec": ^1.4.10 + "@jridgewell/trace-mapping": ^0.3.9 + checksum: e9e7bb3335dea9e60872089761d4e8e089597360cdb1af90370e9d53b7d67232c1e0a3ab65fbfef4fc785745193fbc56bff9f3a6cab6c6ce3f15e12b4191f86b + languageName: node + linkType: hard + "@jridgewell/resolve-uri@npm:^3.0.3": version: 3.0.6 resolution: "@jridgewell/resolve-uri@npm:3.0.6" @@ -2165,6 +2335,13 @@ __metadata: languageName: node linkType: hard +"@jridgewell/set-array@npm:^1.0.0": + version: 1.1.1 + resolution: "@jridgewell/set-array@npm:1.1.1" + checksum: cc5d91e0381c347e3edee4ca90b3c292df9e6e55f29acbe0dd97de8651b4730e9ab761406fd572effa79972a0edc55647b627f8c72315e276d959508853d9bf2 + languageName: node + linkType: hard + "@jridgewell/sourcemap-codec@npm:^1.4.10": version: 1.4.11 resolution: "@jridgewell/sourcemap-codec@npm:1.4.11" @@ -2182,6 +2359,16 @@ __metadata: languageName: node linkType: hard +"@jridgewell/trace-mapping@npm:^0.3.9": + version: 0.3.13 + resolution: "@jridgewell/trace-mapping@npm:0.3.13" + dependencies: + "@jridgewell/resolve-uri": ^3.0.3 + "@jridgewell/sourcemap-codec": ^1.4.10 + checksum: e38254e830472248ca10a6ed1ae75af5e8514f0680245a5e7b53bc3c030fd8691d4d3115d80595b45d3badead68269769ed47ecbbdd67db1343a11f05700e75a + languageName: node + linkType: hard + "@lit/reactive-element@npm:^1.3.0": version: 1.3.1 resolution: "@lit/reactive-element@npm:1.3.1" @@ -2355,7 +2542,7 @@ __metadata: languageName: node linkType: hard -"@rollup/pluginutils@npm:^4.1.0, @rollup/pluginutils@npm:^4.2.0, @rollup/pluginutils@npm:^4.2.1": +"@rollup/pluginutils@npm:^4.1.0, @rollup/pluginutils@npm:^4.2.1": version: 4.2.1 resolution: "@rollup/pluginutils@npm:4.2.1" dependencies: @@ -2911,7 +3098,7 @@ __metadata: "@storybook/source-loader": ^6.4.3 "@types/express": ^4.17.13 "@types/node": ^17.0.23 - "@vitejs/plugin-react": ^1.0.8 + "@vitejs/plugin-react": ^2.0.0-alpha.2 ast-types: ^0.14.2 es-module-lexer: ^0.9.3 glob: ^7.2.0 @@ -4597,19 +4784,20 @@ __metadata: languageName: node linkType: hard -"@vitejs/plugin-react@npm:^1.0.8, @vitejs/plugin-react@npm:^1.3.0": - version: 1.3.1 - resolution: "@vitejs/plugin-react@npm:1.3.1" +"@vitejs/plugin-react@npm:^2.0.0-alpha.2": + version: 2.0.0-alpha.3 + resolution: "@vitejs/plugin-react@npm:2.0.0-alpha.3" dependencies: - "@babel/core": ^7.17.9 - "@babel/plugin-transform-react-jsx": ^7.17.3 + "@babel/core": ^7.18.2 + "@babel/plugin-transform-react-jsx": ^7.17.12 "@babel/plugin-transform-react-jsx-development": ^7.16.7 - "@babel/plugin-transform-react-jsx-self": ^7.16.7 + "@babel/plugin-transform-react-jsx-self": ^7.17.12 "@babel/plugin-transform-react-jsx-source": ^7.16.7 - "@rollup/pluginutils": ^4.2.0 - react-refresh: ^0.12.0 - resolve: ^1.22.0 - checksum: 2d71677ec14b62589fd411bc9c76a0eba48469d06cf7b29106f0fae265bc386aeeb3071215d6a95f561a26c30a8bab8f523eedaabe7fe5f91b27d6317897bd47 + "@rollup/pluginutils": ^4.2.1 + react-refresh: ^0.13.0 + peerDependencies: + vite: ^3.0.0-alpha + checksum: 2a6414b8b721ba12932c622c178e73f3b0e5761bde686dfc8738775593427ad3d49798ade428b4c41e93df9e67f94896186d9c6054bc088f6d3b95a6b84d863e languageName: node linkType: hard @@ -9138,7 +9326,7 @@ __metadata: "@storybook/builder-vite": "workspace:*" "@storybook/react": ^6.5.0 "@storybook/test-runner": 0.1.0 - "@vitejs/plugin-react": ^1.3.0 + "@vitejs/plugin-react": ^2.0.0-alpha.2 http-server: ^14.1.0 jest: ^27.5.1 npm-run-all: ^4.1.5 @@ -9159,7 +9347,7 @@ __metadata: "@storybook/builder-vite": "workspace:*" "@storybook/react": ^6.5.0 "@storybook/test-runner": 0.1.0 - "@vitejs/plugin-react": ^1.3.0 + "@vitejs/plugin-react": ^2.0.0-alpha.2 http-server: ^14.1.0 jest: ^27.5.1 npm-run-all: ^4.1.5 @@ -9182,7 +9370,7 @@ __metadata: "@storybook/builder-vite": "workspace:*" "@storybook/react": ^6.5.0 "@storybook/test-runner": 0.1.0 - "@vitejs/plugin-react": ^1.3.0 + "@vitejs/plugin-react": ^2.0.0-alpha.2 http-server: ^14.1.0 jest: ^27.5.1 npm-run-all: ^4.1.5 @@ -15660,10 +15848,10 @@ __metadata: languageName: node linkType: hard -"react-refresh@npm:^0.12.0": - version: 0.12.0 - resolution: "react-refresh@npm:0.12.0" - checksum: 046522ed9e26c2846afb734303d9461a825a96f863ea373b9296a90e7112e1602bdf5954d8b48193e763f3ff0108f2e4c00e42f0e3d45382bb9d38dc87348867 +"react-refresh@npm:^0.13.0": + version: 0.13.0 + resolution: "react-refresh@npm:0.13.0" + checksum: 1cf2b87ed99e1d388aa3923078bc30cd3ce43ee86e8936944e961d3643c6e85da41ebed6a0996e8bdad75a0d2ce3b7e10638b45018231380d4a174f63a451f75 languageName: node linkType: hard