diff --git a/package.json b/package.json index 5a7988a..c755d2c 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "test": "pnpm --filter './packages/**' test" }, "devDependencies": { + "@rstackjs/load-config": "catalog:", "@types/node": "catalog:", "cspell-ban-words": "catalog:", "husky": "catalog:", diff --git a/packages/rstack/rslib.config.ts b/packages/rstack/rslib.config.ts index 259a506..1b3500e 100644 --- a/packages/rstack/rslib.config.ts +++ b/packages/rstack/rslib.config.ts @@ -18,4 +18,7 @@ export default defineConfig({ RSTACK_VERSION: JSON.stringify(pkgJson.version), }, }, + output: { + externals: ['jiti'], + }, }); diff --git a/packages/rstack/src/config.ts b/packages/rstack/src/config.ts index fd6af26..718378a 100644 --- a/packages/rstack/src/config.ts +++ b/packages/rstack/src/config.ts @@ -1,4 +1,5 @@ -import { loadConfig, type RsbuildConfigDefinition } from '@rsbuild/core'; +import { loadConfig } from '@rstackjs/load-config'; +import type { RsbuildConfigDefinition } from '@rsbuild/core'; import type { RslibConfigDefinition } from '@rslib/core'; import type { RslintConfig } from '@rslint/core'; import type { UserConfig, UserConfigAsyncFn } from '@rspress/core'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 26643ac..d7a2373 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,6 +22,9 @@ catalogs: '@rspress/core': specifier: ^2.0.17 version: 2.0.17 + '@rstackjs/load-config': + specifier: ^0.1.1 + version: 0.1.1 '@rstest/adapter-rsbuild': specifier: ~0.11.0 version: 0.11.0 @@ -78,6 +81,9 @@ importers: .: devDependencies: + '@rstackjs/load-config': + specifier: 'catalog:' + version: 0.1.1 '@types/node': specifier: 'catalog:' version: 24.13.2 @@ -736,6 +742,14 @@ packages: '@rspress/shared@2.0.17': resolution: {integrity: sha512-ZzpZ4hm5svgwU0w5CpTLZy4vFD3uPo8+gXtWMOREYMzwfzJeHqwOyXwxHf6byGpx85mVK5DQqMDi61meAS7ZUw==} + '@rstackjs/load-config@0.1.1': + resolution: {integrity: sha512-YYtqGoM5DrrmZLGaYSUAC66qhhfjAfwXVvBScGJIfPXGa878rK0SJeO6b44W2pYfikm8yefzyV0OeedWO/PKkw==} + peerDependencies: + jiti: ^2.0.0 + peerDependenciesMeta: + jiti: + optional: true + '@rstest/adapter-rsbuild@0.11.0': resolution: {integrity: sha512-otrR3yqQ5Uyskm0hu8c0fjP1eFk6bMJALnYhUl6V1CKp/monoowFMa6XEqdY2d4aHv6oa8XWGLfU4LWne1Vg9A==} peerDependencies: @@ -2196,6 +2210,8 @@ snapshots: - '@module-federation/runtime-tools' - core-js + '@rstackjs/load-config@0.1.1': {} + '@rstest/adapter-rsbuild@0.11.0(@rsbuild/core@2.1.4)(@rstest/core@0.11.0)': dependencies: '@rsbuild/core': 2.1.4 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 0d8c803..d294fe4 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -16,6 +16,7 @@ catalog: '@rslib/core': '~0.23.2' '@rslint/core': '~0.6.5' '@rspress/core': '^2.0.17' + '@rstackjs/load-config': ^0.1.1 '@rstest/adapter-rsbuild': '~0.11.0' '@rstest/adapter-rslib': '~0.11.0' '@rstest/core': '~0.11.0' @@ -51,6 +52,7 @@ minimumReleaseAgeExclude: - '@rspress/*' - '@rstest/*' - '@rslint/*' + - '@rstackjs/*' - '@rstack-dev/doc-ui' - 'rsbuild-plugin-*' - '@swc/*' diff --git a/scripts/dictionary.txt b/scripts/dictionary.txt index be5413e..efd541f 100644 --- a/scripts/dictionary.txt +++ b/scripts/dictionary.txt @@ -6,5 +6,6 @@ rslint rspack rspress rstack +rstackjs rstest turborepo