fix: align resolve.extensions with webpack builder (#80)

rspack-contrib · Sep 3, 2024 · 09cd950 · 09cd950
1 parent 028b3d3
commit 09cd950
Show file tree

Hide file tree

Showing 9 changed files with 584 additions and 738 deletions.
diff --git a/packages/builder-rsbuild/package.json b/packages/builder-rsbuild/package.json
@@ -88,7 +88,7 @@
     "add": "^2.0.6",
     "pretty-hrtime": "^1.0.3",
     "slash": "^5.0.0",
-    "storybook": "8.2.8",
+    "storybook": "8.3.0-beta.2",
     "typescript": "^5.3.2"
   },
   "peerDependencies": {

diff --git a/packages/builder-rsbuild/src/preview/iframe-rsbuild.config.ts b/packages/builder-rsbuild/src/preview/iframe-rsbuild.config.ts
@@ -288,6 +288,15 @@ export default async (
 
         config.resolve ??= {}
         config.resolve.symlinks = !isPreservingSymlinks()
+        config.resolve.extensions = [
+          '.mjs',
+          '.js',
+          '.jsx',
+          '.ts',
+          '.tsx',
+          '.json',
+          '.cjs',
+        ]
 
         config.watchOptions = {
           ignored: /node_modules/,
@@ -356,7 +365,8 @@ export default async (
         inject: false,
         template,
         templateParameters: {
-          version: packageJson.version,
+          version:
+            packageJson?.version ?? '0.0.0-storybook-rsbuild-unknown-version',
           globals: {
             CONFIG_TYPE: configType,
             LOGLEVEL: logLevel,

diff --git a/packages/react-rsbuild/package.json b/packages/react-rsbuild/package.json
@@ -57,10 +57,10 @@
   },
   "devDependencies": {
     "@rsbuild/core": "1.0.1-beta.14",
-    "@storybook/types": "8.2.8",
+    "@storybook/types": "8.3.0-beta.2",
     "@types/resolve": "^1.20.6",
     "add": "^2.0.6",
-    "storybook": "8.2.8",
+    "storybook": "8.3.0-beta.2",
     "typescript": "^5.3.2"
   },
   "peerDependencies": {

diff --git a/packages/vue3-rsbuild/package.json b/packages/vue3-rsbuild/package.json
@@ -47,7 +47,7 @@
   "devDependencies": {
     "@rsbuild/core": "1.0.1-beta.14",
     "@types/node": "^18.0.0",
-    "storybook": "8.2.8",
+    "storybook": "8.3.0-beta.2",
     "typescript": "^5.3.2"
   },
   "peerDependencies": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/sandboxes/react-16/package.json b/sandboxes/react-16/package.json
@@ -20,16 +20,16 @@
     "@chromatic-com/storybook": "^1.4.0",
     "@rsbuild/core": "1.0.1-beta.14",
     "@rsbuild/plugin-react": "1.0.1-beta.14",
-    "@storybook/addon-essentials": "8.2.8",
-    "@storybook/addon-interactions": "8.2.8",
-    "@storybook/addon-links": "8.2.8",
-    "@storybook/addon-onboarding": "8.2.8",
-    "@storybook/blocks": "8.2.8",
-    "@storybook/react": "8.2.8",
-    "@storybook/test": "8.2.8",
+    "@storybook/addon-essentials": "8.3.0-beta.2",
+    "@storybook/addon-interactions": "8.3.0-beta.2",
+    "@storybook/addon-links": "8.3.0-beta.2",
+    "@storybook/addon-onboarding": "8.3.0-beta.2",
+    "@storybook/blocks": "8.3.0-beta.2",
+    "@storybook/react": "8.3.0-beta.2",
+    "@storybook/test": "8.3.0-beta.2",
     "@types/react": "^16",
     "@types/react-dom": "^16",
-    "storybook": "8.2.8",
+    "storybook": "8.3.0-beta.2",
     "storybook-react-rsbuild": "workspace:*",
     "typescript": "^5.3.2"
   },

diff --git a/sandboxes/react-18/package.json b/sandboxes/react-18/package.json
@@ -20,16 +20,16 @@
     "@chromatic-com/storybook": "^1.4.0",
     "@rsbuild/core": "1.0.1-beta.14",
     "@rsbuild/plugin-react": "1.0.1-beta.14",
-    "@storybook/addon-essentials": "8.2.8",
-    "@storybook/addon-interactions": "8.2.8",
-    "@storybook/addon-links": "8.2.8",
-    "@storybook/addon-onboarding": "8.2.8",
-    "@storybook/blocks": "8.2.8",
-    "@storybook/react": "8.2.8",
-    "@storybook/test": "8.2.8",
+    "@storybook/addon-essentials": "8.3.0-beta.2",
+    "@storybook/addon-interactions": "8.3.0-beta.2",
+    "@storybook/addon-links": "8.3.0-beta.2",
+    "@storybook/addon-onboarding": "8.3.0-beta.2",
+    "@storybook/blocks": "8.3.0-beta.2",
+    "@storybook/react": "8.3.0-beta.2",
+    "@storybook/test": "8.3.0-beta.2",
     "@types/react": "^18",
     "@types/react-dom": "^18",
-    "storybook": "8.2.8",
+    "storybook": "8.3.0-beta.2",
     "storybook-react-rsbuild": "workspace:*",
     "typescript": "^5.3.2"
   }

diff --git a/sandboxes/react-18/src/stories/Page.stories.ts b/sandboxes/react-18/src/stories/Page.stories.ts
@@ -19,7 +19,7 @@ export const LoggedOut: Story = {}
 
 // More on interaction testing: https://storybook.js.org/docs/writing-tests/interaction-testing
 export const LoggedIn: Story = {
-  play: async ({ canvasElement }) => {
+  play: async ({ canvasElement }: any) => {
     const canvas = within(canvasElement)
     const loginButton = canvas.getByRole('button', { name: /Log in/i })
     await expect(loginButton).toBeInTheDocument()

diff --git a/sandboxes/vue3/package.json b/sandboxes/vue3/package.json
@@ -16,14 +16,14 @@
     "@chromatic-com/storybook": "^1.4.0",
     "@rsbuild/core": "1.0.1-beta.14",
     "@rsbuild/plugin-vue": "1.0.1-beta.14",
-    "@storybook/addon-essentials": "8.2.8",
-    "@storybook/addon-interactions": "8.2.8",
-    "@storybook/addon-links": "8.2.8",
-    "@storybook/addon-onboarding": "8.2.8",
-    "@storybook/blocks": "8.2.8",
-    "@storybook/test": "8.2.8",
-    "@storybook/vue3": "8.2.8",
-    "storybook": "8.2.8",
+    "@storybook/addon-essentials": "8.3.0-beta.2",
+    "@storybook/addon-interactions": "8.3.0-beta.2",
+    "@storybook/addon-links": "8.3.0-beta.2",
+    "@storybook/addon-onboarding": "8.3.0-beta.2",
+    "@storybook/blocks": "8.3.0-beta.2",
+    "@storybook/test": "8.3.0-beta.2",
+    "@storybook/vue3": "8.3.0-beta.2",
+    "storybook": "8.3.0-beta.2",
     "storybook-vue3-rsbuild": "workspace:*",
     "typescript": "^5.3.2"
   }