diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 51fdeaecf..c8bb43c01 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -542,9 +542,11 @@ importers: specifier: ^1.0.5 version: 1.0.5(@rsbuild/core@1.1.5)(typescript@5.6.3) - tests/integration/cli: {} + tests/integration/cli/build: {} - tests/integration/cli/custom-root: {} + tests/integration/cli/build/custom-root: {} + + tests/integration/cli/inspect: {} tests/integration/copy: {} diff --git a/tests/integration/cli/build.test.ts b/tests/integration/cli/build/build.test.ts similarity index 78% rename from tests/integration/cli/build.test.ts rename to tests/integration/cli/build/build.test.ts index 98ee5f6be..e52d77055 100644 --- a/tests/integration/cli/build.test.ts +++ b/tests/integration/cli/build/build.test.ts @@ -15,8 +15,8 @@ describe('build command', async () => { const fileNames = Object.keys(files).sort(); expect(fileNames).toMatchInlineSnapshot(` [ - "/tests/integration/cli/dist/cjs/index.cjs", - "/tests/integration/cli/dist/esm/index.js", + "/tests/integration/cli/build/dist/cjs/index.cjs", + "/tests/integration/cli/build/dist/esm/index.js", ] `); }); @@ -31,7 +31,7 @@ describe('build command', async () => { const fileNames = Object.keys(files).sort(); expect(fileNames).toMatchInlineSnapshot(` [ - "/tests/integration/cli/dist/esm/index.js", + "/tests/integration/cli/build/dist/esm/index.js", ] `); }); @@ -46,8 +46,8 @@ describe('build command', async () => { const fileNames = Object.keys(files).sort(); expect(fileNames).toMatchInlineSnapshot(` [ - "/tests/integration/cli/dist/cjs/index.cjs", - "/tests/integration/cli/dist/esm/index.js", + "/tests/integration/cli/build/dist/cjs/index.cjs", + "/tests/integration/cli/build/dist/esm/index.js", ] `); }); @@ -65,15 +65,14 @@ describe('build command', async () => { const fileNames = Object.keys(files).sort(); expect(fileNames).toMatchInlineSnapshot(` [ - "/tests/integration/cli/dist/custom/index.cjs", - "/tests/integration/cli/dist/custom/index.js", + "/tests/integration/cli/build/dist/custom/index.cjs", + "/tests/integration/cli/build/dist/custom/index.js", ] `); }); test('--root', async () => { await fse.remove(path.join(__dirname, 'dist')); - console.log('__dirname: ', __dirname); execSync('npx rslib build --root custom-root', { cwd: __dirname, }); @@ -82,8 +81,8 @@ describe('build command', async () => { const fileNames = Object.keys(files).sort(); expect(fileNames).toMatchInlineSnapshot(` [ - "/tests/integration/cli/dist/root/index.cjs", - "/tests/integration/cli/dist/root/index.js", + "/tests/integration/cli/build/dist/root/index.cjs", + "/tests/integration/cli/build/dist/root/index.js", ] `); }); diff --git a/tests/integration/cli/custom-config/rslib.config.custom.ts b/tests/integration/cli/build/custom-config/rslib.config.custom.ts similarity index 100% rename from tests/integration/cli/custom-config/rslib.config.custom.ts rename to tests/integration/cli/build/custom-config/rslib.config.custom.ts diff --git a/tests/integration/cli/custom-root/package.json b/tests/integration/cli/build/custom-root/package.json similarity index 100% rename from tests/integration/cli/custom-root/package.json rename to tests/integration/cli/build/custom-root/package.json diff --git a/tests/integration/cli/custom-root/rslib.config.ts b/tests/integration/cli/build/custom-root/rslib.config.ts similarity index 100% rename from tests/integration/cli/custom-root/rslib.config.ts rename to tests/integration/cli/build/custom-root/rslib.config.ts diff --git a/tests/integration/cli/package.json b/tests/integration/cli/build/package.json similarity index 69% rename from tests/integration/cli/package.json rename to tests/integration/cli/build/package.json index 0c4b53d8a..7727b606d 100644 --- a/tests/integration/cli/package.json +++ b/tests/integration/cli/build/package.json @@ -1,5 +1,5 @@ { - "name": "cli-test", + "name": "cli-build-test", "version": "1.0.0", "private": true, "type": "module" diff --git a/tests/integration/cli/rslib.config.ts b/tests/integration/cli/build/rslib.config.ts similarity index 100% rename from tests/integration/cli/rslib.config.ts rename to tests/integration/cli/build/rslib.config.ts diff --git a/tests/integration/cli/src/index.ts b/tests/integration/cli/build/src/index.ts similarity index 100% rename from tests/integration/cli/src/index.ts rename to tests/integration/cli/build/src/index.ts diff --git a/tests/integration/cli/inspect.test.ts b/tests/integration/cli/inspect/inspect.test.ts similarity index 73% rename from tests/integration/cli/inspect.test.ts rename to tests/integration/cli/inspect/inspect.test.ts index 88b2a71dc..610707935 100644 --- a/tests/integration/cli/inspect.test.ts +++ b/tests/integration/cli/inspect/inspect.test.ts @@ -16,13 +16,13 @@ describe('inspect command', async () => { const fileNames = Object.keys(files).sort(); expect(fileNames).toMatchInlineSnapshot(` - [ - "/tests/integration/cli/dist/.rsbuild/rsbuild.config.cjs.mjs", - "/tests/integration/cli/dist/.rsbuild/rsbuild.config.esm.mjs", - "/tests/integration/cli/dist/.rsbuild/rspack.config.cjs.mjs", - "/tests/integration/cli/dist/.rsbuild/rspack.config.esm.mjs", - ] - `); + [ + "/tests/integration/cli/inspect/dist/.rsbuild/rsbuild.config.cjs.mjs", + "/tests/integration/cli/inspect/dist/.rsbuild/rsbuild.config.esm.mjs", + "/tests/integration/cli/inspect/dist/.rsbuild/rspack.config.cjs.mjs", + "/tests/integration/cli/inspect/dist/.rsbuild/rspack.config.esm.mjs", + ] + `); // esm rsbuild config const rsbuildConfigEsm = fileNames.find((item) => @@ -52,11 +52,11 @@ describe('inspect command', async () => { // Rsbuild will emit dump files to `dist/esm` if only one environment is specified. expect(fileNames).toMatchInlineSnapshot(` - [ - "/tests/integration/cli/dist/esm/.rsbuild/rsbuild.config.mjs", - "/tests/integration/cli/dist/esm/.rsbuild/rspack.config.esm.mjs", - ] - `); + [ + "/tests/integration/cli/inspect/dist/esm/.rsbuild/rsbuild.config.mjs", + "/tests/integration/cli/inspect/dist/esm/.rsbuild/rspack.config.esm.mjs", + ] + `); // esm rsbuild config const rsbuildConfigEsm = fileNames.find((item) => @@ -84,12 +84,12 @@ describe('inspect command', async () => { // Rsbuild will emit dump files to `dist/esm` if only one environment is specified. expect(fileNames).toMatchInlineSnapshot(` - [ - "/tests/integration/cli/dist/.rsbuild/rsbuild.config.cjs.mjs", - "/tests/integration/cli/dist/.rsbuild/rsbuild.config.esm.mjs", - "/tests/integration/cli/dist/.rsbuild/rspack.config.cjs.mjs", - "/tests/integration/cli/dist/.rsbuild/rspack.config.esm.mjs", - ] - `); + [ + "/tests/integration/cli/inspect/dist/.rsbuild/rsbuild.config.cjs.mjs", + "/tests/integration/cli/inspect/dist/.rsbuild/rsbuild.config.esm.mjs", + "/tests/integration/cli/inspect/dist/.rsbuild/rspack.config.cjs.mjs", + "/tests/integration/cli/inspect/dist/.rsbuild/rspack.config.esm.mjs", + ] + `); }); }); diff --git a/tests/integration/cli/inspect/package.json b/tests/integration/cli/inspect/package.json new file mode 100644 index 000000000..5cb660511 --- /dev/null +++ b/tests/integration/cli/inspect/package.json @@ -0,0 +1,6 @@ +{ + "name": "cli-inspect-test", + "version": "1.0.0", + "private": true, + "type": "module" +} diff --git a/tests/integration/cli/inspect/rslib.config.ts b/tests/integration/cli/inspect/rslib.config.ts new file mode 100644 index 000000000..54b107d05 --- /dev/null +++ b/tests/integration/cli/inspect/rslib.config.ts @@ -0,0 +1,6 @@ +import { defineConfig } from '@rslib/core'; +import { generateBundleCjsConfig, generateBundleEsmConfig } from 'test-helper'; + +export default defineConfig({ + lib: [generateBundleEsmConfig(), generateBundleCjsConfig()], +}); diff --git a/tests/integration/cli/inspect/src/index.ts b/tests/integration/cli/inspect/src/index.ts new file mode 100644 index 000000000..3329a7d97 --- /dev/null +++ b/tests/integration/cli/inspect/src/index.ts @@ -0,0 +1 @@ +export const foo = 'foo';