Merge branch 'main' into renovate/all-patch

Author: Timeless0911

.github/renovate.json5

@@ -1,7 +1,7 @@
 {
   $schema: 'https://docs.renovatebot.com/renovate-schema.json',
   extends: ['config:recommended', 'schedule:weekly'],
-  ignorePaths: ['**/tests/**', '**/node_modules/**'],
+  ignorePaths: ['**/tests/**', '**/node_modules/**', '**/e2e/cases/**'],
   packageRules: [
     // Use chore as semantic commit type for commit messages
     {
@@ -50,6 +50,8 @@
   ignoreDeps: [
     // manually update some packages
     'pnpm',
+    '@rspack/core',
+    '@rspack/core-canary',
     // align Node.js version minimum requirements
     '@types/node',
     'node',

e2e/README.md

@@ -30,7 +30,7 @@ Rslib will try to cover the common scenarios in the [integration test cases of M
 | minify          | 🟢     |                                                                                                      |
 | platform        | 🟢     |                                                                                                      |
 | redirect        | ⚪️     |                                                                                                      |
-| resolve         | ⚪️     |                                                                                                      |
+| resolve         | 🟢     |                                                                                                      |
 | shims           | 🟡     | Support shims `__filename` and `__dirname` in esm</br> `import.meta.url` in cjs need to be supported |
 | sideEffects     | ⚪️     |                                                                                                      |
 | sourceDir       | ⚪️     |                                                                                                      |

e2e/cases/alias/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "alias-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}

e2e/cases/auto-external/default/package.json

@@ -1,7 +1,7 @@
 {
   "name": "auto-external-default-test",
   "dependencies": {
-    "ora": "8.0.1",
+    "ora": "8.1.0",
     "react": "^18.3.1"
   }
 }

e2e/cases/auto-external/false/package.json

@@ -1,7 +1,7 @@
 {
   "name": "auto-external-false-test",
   "dependencies": {
-    "ora": "8.0.1",
+    "ora": "8.1.0",
     "react": "^18.3.1"
   }
 }

e2e/cases/minify/default/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "minify-default-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}

e2e/cases/resolve/data-url/index.ts

@@ -0,0 +1,3 @@
+import x from 'data:text/javascript,export default 42';
+
+console.log('x:', x);

e2e/cases/resolve/data-url/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "resolve-data-url-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}

e2e/cases/resolve/data-url/rslib.config.ts

@@ -0,0 +1,11 @@
+import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
+import { defineConfig } from '@rslib/core';
+
+export default defineConfig({
+  lib: [generateBundleEsmConfig(), generateBundleCjsConfig()],
+  source: {
+    entry: {
+      index: './index.ts',
+    },
+  },
+});

e2e/cases/resolve/false/bar.ts

@@ -0,0 +1 @@
+export const bar = 'bar';

e2e/cases/resolve/false/browser-false/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "browser-false",
+  "version": "1.0.0",
+  "private": true,
+  "browser": {
+    "./util": false
+  }
+}

e2e/cases/resolve/false/index.ts

@@ -0,0 +1,5 @@
+import { bar } from './bar';
+import foo from './browser-false/util';
+
+console.log('foo:', foo); // the value of `foo` should `{}`
+console.log('bar: ', bar);

e2e/cases/resolve/false/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "resolve-false-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}

e2e/cases/resolve/false/rslib.config.ts

@@ -0,0 +1,11 @@
+import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
+import { defineConfig } from '@rslib/core';
+
+export default defineConfig({
+  lib: [generateBundleEsmConfig(), generateBundleCjsConfig()],
+  source: {
+    entry: {
+      index: './index.ts',
+    },
+  },
+});

e2e/cases/resolve/index.test.ts

@@ -0,0 +1,94 @@
+import { join } from 'node:path';
+import { buildAndGetResults } from '@e2e/helper';
+import { expect, test } from 'vitest';
+
+test('resolve data url', async () => {
+  const fixturePath = join(__dirname, 'data-url');
+  const { entries, isSuccess } = await buildAndGetResults(fixturePath);
+
+  expect(isSuccess).toBeTruthy();
+  expect(entries.esm).toMatchInlineSnapshot(`
+    "// CONCATENATED MODULE: data:text/javascript,export default 42
+    const javascript_export_default_42 = 42;
+    // CONCATENATED MODULE: ./index.ts
+    console.log('x:', javascript_export_default_42);
+    "
+  `);
+});
+
+// TODO: false module path is different from linux and windows
+// EXTERNAL MODULE: <ROOT>/rslib/e2e/cases/resolve/false/./browser-false/util (ignored)
+test.todo('resolve false', async () => {
+  const fixturePath = join(__dirname, 'false');
+  const { entries, isSuccess } = await buildAndGetResults(fixturePath);
+
+  expect(isSuccess).toBeTruthy();
+  expect(entries.esm).toMatchSnapshot();
+});
+
+test('resolve node protocol', async () => {
+  const fixturePath = join(__dirname, 'node-protocol');
+  const { entries, isSuccess } = await buildAndGetResults(fixturePath);
+
+  expect(isSuccess).toBeTruthy();
+  expect(entries.esm).toMatchInlineSnapshot(`
+    "import * as __WEBPACK_EXTERNAL_MODULE_node_path__ from \\"node:path\\";
+    // CONCATENATED MODULE: external \\"node:path\\"
+    var external_node_path_namespaceObject = __WEBPACK_EXTERNAL_MODULE_node_path__;
+    // CONCATENATED MODULE: ./index.ts
+    const { join } = external_node_path_namespaceObject[\\"default\\"];
+    export { join };
+    "
+  `);
+});
+
+test('resolve with condition exports', async () => {
+  const fixturePath = join(__dirname, 'with-condition-exports');
+  const { contents, isSuccess } = await buildAndGetResults(fixturePath);
+
+  const nodeResults = Object.values(contents.esm0!);
+  const browserResults = Object.values(contents.esm1!);
+
+  expect(isSuccess).toBeTruthy();
+
+  expect(nodeResults[0]).toContain('lib1 mjs');
+  expect(nodeResults[1]).toContain('lib2 module');
+  expect(nodeResults[2]).toContain('node');
+  expect(nodeResults[3]).toContain('lib1 cjs');
+
+  expect(browserResults[0]).toContain('lib1 mjs');
+  expect(browserResults[1]).toContain('lib2 module');
+  expect(browserResults[2]).toContain('browser');
+  expect(browserResults[3]).toContain('lib1 cjs');
+});
+
+test('resolve with js extensions', async () => {
+  const fixturePath = join(__dirname, 'with-js-extensions');
+  const { entries, isSuccess } = await buildAndGetResults(fixturePath);
+
+  expect(isSuccess).toBeTruthy();
+  expect(entries.esm).toMatchInlineSnapshot(`
+    "// CONCATENATED MODULE: ./example.mts
+    const value = 1;
+    // CONCATENATED MODULE: ./index.ts
+    console.log(value);
+    "
+  `);
+});
+
+test('resolve with main fields', async () => {
+  const fixturePath = join(__dirname, 'with-main-fields');
+  const { contents, isSuccess } = await buildAndGetResults(fixturePath);
+  const results = Object.values(contents);
+
+  expect(isSuccess).toBeTruthy();
+  expect(Object.values(results[0]!)[0]).toMatchInlineSnapshot(`
+    "// CONCATENATED MODULE: ./node_modules/lib1/src/index.ts
+    const value = 1;
+    // CONCATENATED MODULE: ./entry1.ts
+    console.log(value);
+    "
+  `);
+  expect(Object.values(results[1]!)[0]).toContain('main');
+  expect(Object.values(results[2]!)[0]).toContain('browser');
+});

e2e/cases/resolve/node-protocol/index.ts

@@ -0,0 +1,3 @@
+import path from 'node:path';
+
+export const { join } = path;

e2e/cases/resolve/node-protocol/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "resolve-node-protocol-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}

e2e/cases/resolve/node-protocol/rslib.config.ts

@@ -0,0 +1,14 @@
+import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
+import { defineConfig } from '@rslib/core';
+
+export default defineConfig({
+  lib: [generateBundleEsmConfig(), generateBundleCjsConfig()],
+  source: {
+    entry: {
+      index: './index.ts',
+    },
+  },
+  output: {
+    target: 'node',
+  },
+});

e2e/cases/resolve/with-condition-exports/.gitignore

@@ -0,0 +1,2 @@
+!node_modules
+node_modules/.*

e2e/cases/resolve/with-condition-exports/entry1.ts

@@ -0,0 +1,3 @@
+import { value } from 'lib1';
+
+console.log(value);

e2e/cases/resolve/with-condition-exports/entry2.ts

@@ -0,0 +1,3 @@
+import { value } from 'lib2';
+
+console.log(value);

e2e/cases/resolve/with-condition-exports/entry3.ts

@@ -0,0 +1,3 @@
+import { value } from 'lib3';
+
+console.log(value);

e2e/cases/resolve/with-condition-exports/entry4.ts

@@ -0,0 +1 @@
+console.log(require('lib1').value);

e2e/cases/resolve/with-condition-exports/node_modules/lib1/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "resolve-with-condition-exports-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}

e2e/cases/resolve/with-condition-exports/node_modules/lib1/src/index.cjs

@@ -0,0 +1,30 @@
+import { generateBundleEsmConfig } from '@e2e/helper';
+import { defineConfig } from '@rslib/core';
+
+export default defineConfig({
+  lib: [
+    generateBundleEsmConfig({
+      output: {
+        distPath: {
+          root: './dist/node',
+        },
+        target: 'node',
+      },
+    }),
+    generateBundleEsmConfig({
+      output: {
+        distPath: {
+          root: './dist/browser',
+        },
+      },
+    }),
+  ],
+  source: {
+    entry: {
+      entry1: ['./entry1.ts'],
+      entry2: ['./entry2.ts'],
+      entry3: ['./entry3.ts'],
+      entry4: ['./entry4.ts'],
+    },
+  },
+});

e2e/cases/resolve/with-condition-exports/node_modules/lib1/src/index.mjs

@@ -0,0 +1 @@
+export const value = 1;

e2e/cases/resolve/with-condition-exports/node_modules/lib2/package.json

@@ -0,0 +1,3 @@
+import { value } from './example';
+
+console.log(value);

e2e/cases/resolve/with-condition-exports/node_modules/lib2/src/index.cjs

@@ -0,0 +1,6 @@
+{
+  "name": "resolve-with-js-extensions-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module"
+}