From 7782fdb78514b3194715942d3f77716ac070daca Mon Sep 17 00:00:00 2001 From: Wei Date: Wed, 2 Oct 2024 19:23:51 +0800 Subject: [PATCH] refactor: package directory (#134) --- README.md | 6 ++--- .../README.md | 0 .../package.json | 2 +- .../preset.js | 0 .../src/index.ts | 0 .../src/preset.ts | 0 .../src/types.ts | 0 .../tsconfig.json | 0 .../LICENSE | 0 .../README.md | 0 .../package.json | 2 +- .../preset.js | 0 .../src/index.ts | 0 .../src/loaders/docgen-resolver.ts | 0 .../src/loaders/react-docgen-loader.test.ts | 0 .../src/loaders/react-docgen-loader.ts | 0 .../docgen-handlers/actualNameHandler.ts | 0 .../src/plugins/docgen-resolver.ts | 0 .../src/plugins/react-docgen.test.ts | 0 .../src/plugins/react-docgen.ts | 0 .../src/preset.ts | 0 .../src/react-docs.ts | 0 .../src/requirer.ts | 0 .../src/types.ts | 0 .../tsconfig.json | 0 .../vitest.config.ts | 0 .../{vue3-rsbuild => framework-vue3}/LICENSE | 0 .../README.md | 0 .../package.json | 2 +- .../preset.js | 0 .../src/framework-preset-vue3-docs.ts | 0 .../src/index.ts | 0 .../src/preset.ts | 0 .../src/types.ts | 0 .../tsconfig.json | 0 .../vitest.config.ts | 0 pnpm-lock.yaml | 22 +++++++++---------- 37 files changed, 17 insertions(+), 17 deletions(-) rename packages/{html-rsbuild => framework-html}/README.md (100%) rename packages/{html-rsbuild => framework-html}/package.json (98%) rename packages/{html-rsbuild => framework-html}/preset.js (100%) rename packages/{html-rsbuild => framework-html}/src/index.ts (100%) rename packages/{html-rsbuild => framework-html}/src/preset.ts (100%) rename packages/{html-rsbuild => framework-html}/src/types.ts (100%) rename packages/{html-rsbuild => framework-html}/tsconfig.json (100%) rename packages/{react-rsbuild => framework-react}/LICENSE (100%) rename packages/{react-rsbuild => framework-react}/README.md (100%) rename packages/{react-rsbuild => framework-react}/package.json (98%) rename packages/{react-rsbuild => framework-react}/preset.js (100%) rename packages/{react-rsbuild => framework-react}/src/index.ts (100%) rename packages/{react-rsbuild => framework-react}/src/loaders/docgen-resolver.ts (100%) rename packages/{react-rsbuild => framework-react}/src/loaders/react-docgen-loader.test.ts (100%) rename packages/{react-rsbuild => framework-react}/src/loaders/react-docgen-loader.ts (100%) rename packages/{react-rsbuild => framework-react}/src/plugins/docgen-handlers/actualNameHandler.ts (100%) rename packages/{react-rsbuild => framework-react}/src/plugins/docgen-resolver.ts (100%) rename packages/{react-rsbuild => framework-react}/src/plugins/react-docgen.test.ts (100%) rename packages/{react-rsbuild => framework-react}/src/plugins/react-docgen.ts (100%) rename packages/{react-rsbuild => framework-react}/src/preset.ts (100%) rename packages/{react-rsbuild => framework-react}/src/react-docs.ts (100%) rename packages/{react-rsbuild => framework-react}/src/requirer.ts (100%) rename packages/{react-rsbuild => framework-react}/src/types.ts (100%) rename packages/{react-rsbuild => framework-react}/tsconfig.json (100%) rename packages/{react-rsbuild => framework-react}/vitest.config.ts (100%) rename packages/{vue3-rsbuild => framework-vue3}/LICENSE (100%) rename packages/{vue3-rsbuild => framework-vue3}/README.md (100%) rename packages/{vue3-rsbuild => framework-vue3}/package.json (98%) rename packages/{vue3-rsbuild => framework-vue3}/preset.js (100%) rename packages/{vue3-rsbuild => framework-vue3}/src/framework-preset-vue3-docs.ts (100%) rename packages/{vue3-rsbuild => framework-vue3}/src/index.ts (100%) rename packages/{vue3-rsbuild => framework-vue3}/src/preset.ts (100%) rename packages/{vue3-rsbuild => framework-vue3}/src/types.ts (100%) rename packages/{vue3-rsbuild => framework-vue3}/tsconfig.json (100%) rename packages/{vue3-rsbuild => framework-vue3}/vitest.config.ts (100%) diff --git a/README.md b/README.md index b18dc5f..81e1705 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ The repository contains the Storybook Rsbuild builder and UI framework integrati | package | description | | ------------------------------------------------------- | ------------------------------------------------------------ | | [storybook-builder-rsbuild](./packages/builder-rsbuild) | Rsbuild powered builder for Storybook | -| [storybook-react-rsbuild](./packages/react-rsbuild) | React integration for Storybook with Rsbuild builder | -| [storybook-vue3-rsbuild](./packages/vue3-rsbuild) | Vue 3 integration for Storybook with Rsbuild builder | -| [storybook-html-rsbuild](./packages/html-rsbuild) | Vanilla JS/TS integration for Storybook with Rsbuild builder | +| [storybook-react-rsbuild](./packages/framework-react) | React integration for Storybook with Rsbuild builder | +| [storybook-vue3-rsbuild](./packages/framework-vue3) | Vue 3 integration for Storybook with Rsbuild builder | +| [storybook-html-rsbuild](./packages/framework-html) | Vanilla JS/TS integration for Storybook with Rsbuild builder | ## Usage diff --git a/packages/html-rsbuild/README.md b/packages/framework-html/README.md similarity index 100% rename from packages/html-rsbuild/README.md rename to packages/framework-html/README.md diff --git a/packages/html-rsbuild/package.json b/packages/framework-html/package.json similarity index 98% rename from packages/html-rsbuild/package.json rename to packages/framework-html/package.json index 0ba0905..b783554 100644 --- a/packages/html-rsbuild/package.json +++ b/packages/framework-html/package.json @@ -9,7 +9,7 @@ "repository": { "type": "git", "url": "https://github.com/rspack-contrib/storybook-rsbuild", - "directory": "packages/vanilla-rsbuild" + "directory": "packages/framework-html" }, "license": "MIT", "exports": { diff --git a/packages/html-rsbuild/preset.js b/packages/framework-html/preset.js similarity index 100% rename from packages/html-rsbuild/preset.js rename to packages/framework-html/preset.js diff --git a/packages/html-rsbuild/src/index.ts b/packages/framework-html/src/index.ts similarity index 100% rename from packages/html-rsbuild/src/index.ts rename to packages/framework-html/src/index.ts diff --git a/packages/html-rsbuild/src/preset.ts b/packages/framework-html/src/preset.ts similarity index 100% rename from packages/html-rsbuild/src/preset.ts rename to packages/framework-html/src/preset.ts diff --git a/packages/html-rsbuild/src/types.ts b/packages/framework-html/src/types.ts similarity index 100% rename from packages/html-rsbuild/src/types.ts rename to packages/framework-html/src/types.ts diff --git a/packages/html-rsbuild/tsconfig.json b/packages/framework-html/tsconfig.json similarity index 100% rename from packages/html-rsbuild/tsconfig.json rename to packages/framework-html/tsconfig.json diff --git a/packages/react-rsbuild/LICENSE b/packages/framework-react/LICENSE similarity index 100% rename from packages/react-rsbuild/LICENSE rename to packages/framework-react/LICENSE diff --git a/packages/react-rsbuild/README.md b/packages/framework-react/README.md similarity index 100% rename from packages/react-rsbuild/README.md rename to packages/framework-react/README.md diff --git a/packages/react-rsbuild/package.json b/packages/framework-react/package.json similarity index 98% rename from packages/react-rsbuild/package.json rename to packages/framework-react/package.json index 9fda2b4..61415dd 100644 --- a/packages/react-rsbuild/package.json +++ b/packages/framework-react/package.json @@ -9,7 +9,7 @@ "repository": { "type": "git", "url": "https://github.com/rspack-contrib/storybook-rsbuild", - "directory": "packages/react-rsbuild" + "directory": "packages/framework-react" }, "license": "MIT", "exports": { diff --git a/packages/react-rsbuild/preset.js b/packages/framework-react/preset.js similarity index 100% rename from packages/react-rsbuild/preset.js rename to packages/framework-react/preset.js diff --git a/packages/react-rsbuild/src/index.ts b/packages/framework-react/src/index.ts similarity index 100% rename from packages/react-rsbuild/src/index.ts rename to packages/framework-react/src/index.ts diff --git a/packages/react-rsbuild/src/loaders/docgen-resolver.ts b/packages/framework-react/src/loaders/docgen-resolver.ts similarity index 100% rename from packages/react-rsbuild/src/loaders/docgen-resolver.ts rename to packages/framework-react/src/loaders/docgen-resolver.ts diff --git a/packages/react-rsbuild/src/loaders/react-docgen-loader.test.ts b/packages/framework-react/src/loaders/react-docgen-loader.test.ts similarity index 100% rename from packages/react-rsbuild/src/loaders/react-docgen-loader.test.ts rename to packages/framework-react/src/loaders/react-docgen-loader.test.ts diff --git a/packages/react-rsbuild/src/loaders/react-docgen-loader.ts b/packages/framework-react/src/loaders/react-docgen-loader.ts similarity index 100% rename from packages/react-rsbuild/src/loaders/react-docgen-loader.ts rename to packages/framework-react/src/loaders/react-docgen-loader.ts diff --git a/packages/react-rsbuild/src/plugins/docgen-handlers/actualNameHandler.ts b/packages/framework-react/src/plugins/docgen-handlers/actualNameHandler.ts similarity index 100% rename from packages/react-rsbuild/src/plugins/docgen-handlers/actualNameHandler.ts rename to packages/framework-react/src/plugins/docgen-handlers/actualNameHandler.ts diff --git a/packages/react-rsbuild/src/plugins/docgen-resolver.ts b/packages/framework-react/src/plugins/docgen-resolver.ts similarity index 100% rename from packages/react-rsbuild/src/plugins/docgen-resolver.ts rename to packages/framework-react/src/plugins/docgen-resolver.ts diff --git a/packages/react-rsbuild/src/plugins/react-docgen.test.ts b/packages/framework-react/src/plugins/react-docgen.test.ts similarity index 100% rename from packages/react-rsbuild/src/plugins/react-docgen.test.ts rename to packages/framework-react/src/plugins/react-docgen.test.ts diff --git a/packages/react-rsbuild/src/plugins/react-docgen.ts b/packages/framework-react/src/plugins/react-docgen.ts similarity index 100% rename from packages/react-rsbuild/src/plugins/react-docgen.ts rename to packages/framework-react/src/plugins/react-docgen.ts diff --git a/packages/react-rsbuild/src/preset.ts b/packages/framework-react/src/preset.ts similarity index 100% rename from packages/react-rsbuild/src/preset.ts rename to packages/framework-react/src/preset.ts diff --git a/packages/react-rsbuild/src/react-docs.ts b/packages/framework-react/src/react-docs.ts similarity index 100% rename from packages/react-rsbuild/src/react-docs.ts rename to packages/framework-react/src/react-docs.ts diff --git a/packages/react-rsbuild/src/requirer.ts b/packages/framework-react/src/requirer.ts similarity index 100% rename from packages/react-rsbuild/src/requirer.ts rename to packages/framework-react/src/requirer.ts diff --git a/packages/react-rsbuild/src/types.ts b/packages/framework-react/src/types.ts similarity index 100% rename from packages/react-rsbuild/src/types.ts rename to packages/framework-react/src/types.ts diff --git a/packages/react-rsbuild/tsconfig.json b/packages/framework-react/tsconfig.json similarity index 100% rename from packages/react-rsbuild/tsconfig.json rename to packages/framework-react/tsconfig.json diff --git a/packages/react-rsbuild/vitest.config.ts b/packages/framework-react/vitest.config.ts similarity index 100% rename from packages/react-rsbuild/vitest.config.ts rename to packages/framework-react/vitest.config.ts diff --git a/packages/vue3-rsbuild/LICENSE b/packages/framework-vue3/LICENSE similarity index 100% rename from packages/vue3-rsbuild/LICENSE rename to packages/framework-vue3/LICENSE diff --git a/packages/vue3-rsbuild/README.md b/packages/framework-vue3/README.md similarity index 100% rename from packages/vue3-rsbuild/README.md rename to packages/framework-vue3/README.md diff --git a/packages/vue3-rsbuild/package.json b/packages/framework-vue3/package.json similarity index 98% rename from packages/vue3-rsbuild/package.json rename to packages/framework-vue3/package.json index 0a3462b..6359c06 100644 --- a/packages/vue3-rsbuild/package.json +++ b/packages/framework-vue3/package.json @@ -9,7 +9,7 @@ "repository": { "type": "git", "url": "https://github.com/rspack-contrib/storybook-rsbuild", - "directory": "packages/vue3-rsbuild" + "directory": "packages/framework-vue3" }, "license": "MIT", "exports": { diff --git a/packages/vue3-rsbuild/preset.js b/packages/framework-vue3/preset.js similarity index 100% rename from packages/vue3-rsbuild/preset.js rename to packages/framework-vue3/preset.js diff --git a/packages/vue3-rsbuild/src/framework-preset-vue3-docs.ts b/packages/framework-vue3/src/framework-preset-vue3-docs.ts similarity index 100% rename from packages/vue3-rsbuild/src/framework-preset-vue3-docs.ts rename to packages/framework-vue3/src/framework-preset-vue3-docs.ts diff --git a/packages/vue3-rsbuild/src/index.ts b/packages/framework-vue3/src/index.ts similarity index 100% rename from packages/vue3-rsbuild/src/index.ts rename to packages/framework-vue3/src/index.ts diff --git a/packages/vue3-rsbuild/src/preset.ts b/packages/framework-vue3/src/preset.ts similarity index 100% rename from packages/vue3-rsbuild/src/preset.ts rename to packages/framework-vue3/src/preset.ts diff --git a/packages/vue3-rsbuild/src/types.ts b/packages/framework-vue3/src/types.ts similarity index 100% rename from packages/vue3-rsbuild/src/types.ts rename to packages/framework-vue3/src/types.ts diff --git a/packages/vue3-rsbuild/tsconfig.json b/packages/framework-vue3/tsconfig.json similarity index 100% rename from packages/vue3-rsbuild/tsconfig.json rename to packages/framework-vue3/tsconfig.json diff --git a/packages/vue3-rsbuild/vitest.config.ts b/packages/framework-vue3/vitest.config.ts similarity index 100% rename from packages/vue3-rsbuild/vitest.config.ts rename to packages/framework-vue3/vitest.config.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5c16617..930993d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -127,7 +127,7 @@ importers: specifier: ^5.6.2 version: 5.6.2 - packages/html-rsbuild: + packages/framework-html: dependencies: '@rollup/pluginutils': specifier: ^5.1.2 @@ -170,7 +170,7 @@ importers: specifier: ^5.6.2 version: 5.6.2 - packages/react-rsbuild: + packages/framework-react: dependencies: '@rollup/pluginutils': specifier: ^5.1.2 @@ -225,7 +225,7 @@ importers: specifier: ^5.6.2 version: 5.6.2 - packages/vue3-rsbuild: + packages/framework-vue3: dependencies: '@storybook/vue3': specifier: ^8.2.1 @@ -300,7 +300,7 @@ importers: version: 8.4.0-alpha.0 storybook-react-rsbuild: specifier: workspace:* - version: file:packages/react-rsbuild(@rsbuild/core@1.0.8)(@storybook/test@8.4.0-alpha.0(storybook@8.4.0-alpha.0))(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(rollup@4.17.2)(storybook@8.4.0-alpha.0)(typescript@5.6.2)(webpack@5.94.0(@swc/core@1.7.26)) + version: file:packages/framework-react(@rsbuild/core@1.0.8)(@storybook/test@8.4.0-alpha.0(storybook@8.4.0-alpha.0))(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(rollup@4.17.2)(storybook@8.4.0-alpha.0)(typescript@5.6.2)(webpack@5.94.0(@swc/core@1.7.26)) typescript: specifier: ^5.6.2 version: 5.6.2 @@ -358,7 +358,7 @@ importers: version: 8.4.0-alpha.0 storybook-react-rsbuild: specifier: workspace:* - version: link:../../packages/react-rsbuild + version: link:../../packages/framework-react typescript: specifier: ^5.6.2 version: 5.6.2 @@ -446,7 +446,7 @@ importers: version: 8.3.4 storybook-react-rsbuild: specifier: workspace:* - version: link:../../packages/react-rsbuild + version: link:../../packages/framework-react typescript: specifier: ^5.6.2 version: 5.6.2 @@ -482,7 +482,7 @@ importers: version: 8.4.0-alpha.0 storybook-html-rsbuild: specifier: workspace:* - version: link:../../packages/html-rsbuild + version: link:../../packages/framework-html typescript: specifier: ^5.5.2 version: 5.6.2 @@ -528,7 +528,7 @@ importers: version: 8.4.0-alpha.0 storybook-vue3-rsbuild: specifier: workspace:* - version: link:../../packages/vue3-rsbuild + version: link:../../packages/framework-vue3 typescript: specifier: ^5.6.2 version: 5.6.2 @@ -6236,8 +6236,8 @@ packages: steno@0.4.4: resolution: {integrity: sha512-EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w==} - storybook-react-rsbuild@file:packages/react-rsbuild: - resolution: {directory: packages/react-rsbuild, type: directory} + storybook-react-rsbuild@file:packages/framework-react: + resolution: {directory: packages/framework-react, type: directory} engines: {node: '>=18.0.0'} peerDependencies: '@rsbuild/core': ^1.0.1 @@ -14274,7 +14274,7 @@ snapshots: graceful-fs: 4.2.11 optional: true - storybook-react-rsbuild@file:packages/react-rsbuild(@rsbuild/core@1.0.8)(@storybook/test@8.4.0-alpha.0(storybook@8.4.0-alpha.0))(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(rollup@4.17.2)(storybook@8.4.0-alpha.0)(typescript@5.6.2)(webpack@5.94.0(@swc/core@1.7.26)): + storybook-react-rsbuild@file:packages/framework-react(@rsbuild/core@1.0.8)(@storybook/test@8.4.0-alpha.0(storybook@8.4.0-alpha.0))(react-dom@16.14.0(react@16.14.0))(react@16.14.0)(rollup@4.17.2)(storybook@8.4.0-alpha.0)(typescript@5.6.2)(webpack@5.94.0(@swc/core@1.7.26)): dependencies: '@rollup/pluginutils': 5.1.2(rollup@4.17.2) '@rsbuild/core': 1.0.8