feat!: remove experiments.SubResourceIntegrityPlugin (#12642)

.github/workflows/reusable-build-test.yml

@@ -71,7 +71,7 @@ jobs:
       matrix:
         node: ${{ fromJSON(
           inputs.target == 'wasm32-wasip1-threads'&& '[24]'
-          || contains(inputs.target, 'linux') && '[18, 20, 22]'
+          || contains(inputs.target, 'linux') && '[20, 22, 24]'
           || '[22]') }}
     name: Test Node ${{ matrix.node }}
     defaults:
@@ -105,7 +105,7 @@ jobs:
       - name: Pnpm Install
         uses: ./.github/actions/pnpm/install-dependencies
         with:
-          save-if: ${{ github.ref_name == 'main' && matrix.node == '18' }}
+          save-if: ${{ github.ref_name == 'main' && matrix.node == '20' }}
 
       ### x86_64-unknown-linux-gnu
       - name: Test x86_64-unknown-linux-gnu

package.json

@@ -74,7 +74,7 @@
     "cross-env": "^10.1.0",
     "husky": "^9.1.7",
     "is-ci": "4.1.0",
-    "@rstest/core": "^0.7.8",
+    "@rstest/core": "^0.7.9",
     "lint-staged": "^16.2.7",
     "prettier": "3.7.4",
     "prettier-2": "npm:prettier@2.8.8",

packages/create-rspack/rslib.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from '@rslib/core';
 
 export default defineConfig({
-  lib: [{ format: 'esm', syntax: ['node 18.12'] }],
+  lib: [{ format: 'esm', syntax: ['es2023'] }],
 });

packages/create-rspack/tsconfig.json

@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.base.json",
   "include": ["src"],
   "compilerOptions": {
-    "module": "NodeNext",
     "outDir": "dist",
     "rootDir": "src"
   }

packages/rspack-browser/package.json

@@ -5,7 +5,6 @@
   "license": "MIT",
   "description": "Rspack for running in the browser. This is still in early stage and may not follow the semver.",
   "type": "module",
-  "main": "./dist/index.mjs",
   "types": "./dist/browser/index.d.ts",
   "publishConfig": {
     "access": "public",
@@ -14,9 +13,9 @@
   "exports": {
     ".": {
       "types": "./dist/browser/index.d.ts",
-      "default": "./dist/index.mjs"
+      "default": "./dist/index.js"
     },
-    "./wasi-worker-browser.mjs": "./wasi-worker-browser.mjs",
+    "./wasi-worker-browser.js": "./wasi-worker-browser.js",
     "./package.json": "./package.json"
   },
   "scripts": {

packages/rspack-cli/bin/rspack.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const nodeModule = require('node:module');
+import nodeModule from 'node:module';
 
 // enable on-disk code caching of all modules loaded by Node.js
 // requires Nodejs >= 22.8.0
@@ -15,7 +15,7 @@ if (enableCompileCache) {
 // make it easier to identify the process via activity monitor or other tools
 process.title = 'rspack-node';
 
-const { RspackCLI } = require('../dist/index');
+import { RspackCLI } from '../dist/index.js';
 
 async function runCLI() {
   const cli = new RspackCLI();

packages/rspack-cli/package.json

@@ -10,15 +10,14 @@
     "directory": "packages/rspack-cli"
   },
   "license": "MIT",
+  "type": "module",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "default": "./dist/index.js"
     },
     "./package.json": "./package.json"
   },
-  "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "bin": {
     "rspack": "./bin/rspack.js"

packages/rspack-cli/rslib.config.mts

@@ -1,17 +1,18 @@
-import { createRequire } from 'node:module';
 import { defineConfig } from '@rslib/core';
-
-const require = createRequire(import.meta.url);
+import packageJson from './package.json' with { type: 'json' };
 
 export default defineConfig({
   lib: [
-    { format: 'cjs', syntax: ['node 18.12'], dts: { bundle: false } },
-    { format: 'esm', syntax: ['node 18.12'] },
+    {
+      format: 'esm',
+      syntax: ['es2023'],
+      dts: true,
+    },
   ],
   source: {
     tsconfigPath: './tsconfig.build.json',
     define: {
-      RSPACK_CLI_VERSION: JSON.stringify(require('./package.json').version),
+      RSPACK_CLI_VERSION: JSON.stringify(packageJson.version),
     },
   },
 });

packages/rspack-cli/rstest.config.ts

@@ -16,7 +16,7 @@ export default defineConfig({
   testEnvironment: 'node',
   globals: true,
   testTimeout: process.env.CI ? 200000 : 30000,
-  include: ['tests/**/*.test.ts', 'tests/**/*.test.js'],
+  include: ['tests/**/*.test.{ts,js,cts}'],
   source: {
     tsconfigPath: 'tests/tsconfig.json',
   },

packages/rspack-cli/src/utils/crossImport.ts

@@ -1,6 +1,9 @@
+import { createRequire } from 'node:module';
 import { pathToFileURL } from 'node:url';
 import { isEsmFile } from './isEsmFile';
 
+const require = createRequire(import.meta.url);
+
 export const crossImport = async <T = any>(path: string): Promise<T> => {
   if (isEsmFile(path)) {
     const url = pathToFileURL(path).href;

packages/rspack-cli/src/utils/loadConfig.ts

@@ -1,4 +1,5 @@
 import fs from 'node:fs';
+import { createRequire } from 'node:module';
 import path from 'node:path';
 import type { MultiRspackOptions, RspackOptions } from '@rspack/core';
 import { addHook } from 'pirates';
@@ -9,6 +10,8 @@ import isTsFile, { TS_EXTENSION } from './isTsFile';
 import type { CommonOptions } from './options';
 import { rspack } from './rspackCore';
 
+const require = createRequire(import.meta.url);
+
 const injectInlineSourceMap = ({
   code,
   map,

packages/rspack-cli/src/utils/rspackCore.ts

@@ -1,12 +1 @@
-import { createRequire } from 'node:module';
-
-/**
- * Currently, Rspack only provides a CJS bundle, so we use require to load it
- * for better startup performance.
- * https://github.com/nodejs/node/issues/59913
- */
-// @ts-expect-error can be removed after add `type: "module"` to package.json
-const require = createRequire(import.meta.url);
-const rspack: (typeof import('@rspack/core'))['rspack'] = require('@rspack/core');
-
-export { rspack };
+export { rspack } from '@rspack/core';

packages/rspack-cli/tests/api/type/js-api-cjs.test.ts → packages/rspack-cli/tests/api/type/js-api-cjs.test.cts

@@ -5,21 +5,24 @@ import assert from 'node:assert';
 
 type IsFunction<T> = T extends (...args: any[]) => any ? true : false;
 
+// not real Node.js behavior
 // https://github.com/web-infra-dev/rspack/issues/8095
 describe.concurrent(
   'js-api-type should be correct when requiring from @rspack/core',
   () => {
     it('cjs default require', async () => {
+      // const rspack = require('@rspack/core')
       type Truthy = IsFunction<typeof rspackCjsDefaultRequire>;
       const truthy: Truthy = true;
       truthy;
       assert(rspackCjsDefaultRequire.BannerPlugin);
-      assert(typeof rspackCjsDefaultRequire === 'function');
-      const compiler = rspackCjsDefaultRequire({});
+      assert(typeof rspackCjsDefaultRequire === 'object');
+      const compiler = rspackCjsDefaultRequire.default({});
       assert(compiler);
     });
 
     it('cjs named require', async () => {
+      // const { rspack } = require('@rspack/core')
       type Truthy = IsFunction<typeof rspackCjsNamedRequire>;
       const truthy: Truthy = true;
       truthy;
@@ -29,9 +32,13 @@ describe.concurrent(
       assert(compiler);
     });
 
-    it('rspack.default should not exist in cjs require', async () => {
+    it('rspack.default', async () => {
+      // const { rspack } = require('@rspack/core')
+      // rspack.default should be undefined
       assert(!(rspackCjsNamedRequire as any).default);
-      assert(!(rspackCjsDefaultRequire as any).default);
+      // const rspack = require('@rspack/core')
+      // rspack.default should be defined
+      assert(!!(rspackCjsDefaultRequire as any).default);
     });
   },
 );

packages/rspack-cli/tests/api/type/js-api-esm.test.mts → packages/rspack-cli/tests/api/type/js-api-esm.test.ts

@@ -5,15 +5,14 @@ import rspackEsmDefaultImport, {
 
 type IsFunction<T> = T extends (...args: any[]) => any ? true : false;
 
+// not real Node.js behavior
 // https://github.com/web-infra-dev/rspack/issues/8095
 describe.concurrent(
   'js-api-type should be correct when importing from @rspack/core',
   () => {
     it('esm default import', async () => {
-      // rspack has no default export now
-      type Falsy = IsFunction<typeof rspackEsmDefaultImport>;
-      const falsy: Falsy = false;
-      falsy;
+      assert(rspackEsmDefaultImport);
+      assert(typeof rspackEsmDefaultImport === 'function');
       assert(rspackEsmDefaultImport.BannerPlugin);
     });
 

packages/rspack-cli/tests/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

packages/rspack-cli/tsconfig.json

@@ -3,7 +3,9 @@
   "include": ["src"],
   "compilerOptions": {
     "outDir": "dist",
-    "rootDir": "src"
+    "rootDir": "src",
+    "module": "ES2022",
+    "moduleResolution": "bundler"
   },
   "references": [
     {

packages/rspack-test-tools/src/helper/expect/placeholder.ts

@@ -21,6 +21,10 @@ const placeholderSerializer = createSnapshotSerializer({
       match: __RSPACK_PATH__,
       mark: 'rspack_root',
     },
+    {
+      match: /<ROOT>\/packages\/rspack/g,
+      mark: 'rspack_root',
+    },
     {
       match: /:\d+:\d+-\d+:\d+/g,
       mark: 'line_col_range',