Skip to content

Commit f44804b

Browse files
authored
chore: migrate CommonJS rspack configs to ESM (#423)
1 parent a42e662 commit f44804b

File tree

97 files changed

+641
-574
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+641
-574
lines changed

pnpm-lock.yaml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
const { rspack } = require('@rspack/core');
2-
const { ReactRefreshRspackPlugin } = require('@rspack/plugin-react-refresh');
3-
const { RsdoctorRspackPlugin } = require('@rsdoctor/rspack-plugin');
1+
// @ts-check
2+
import { RsdoctorRspackPlugin } from '@rsdoctor/rspack-plugin';
3+
import { defineConfig } from '@rspack/cli';
4+
import { rspack } from '@rspack/core';
5+
import { ReactRefreshRspackPlugin } from '@rspack/plugin-react-refresh';
46

5-
/** @type {import('@rspack/cli').Configuration} */
6-
module.exports = {
7+
export default defineConfig({
78
entry: {
89
main: './src/index.tsx',
910
},
@@ -54,4 +55,4 @@ module.exports = {
5455
experiments: {
5556
css: true,
5657
},
57-
};
58+
});

rspack/basic-ts/rspack.config.mjs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
// @ts-check
22
import path from 'node:path';
3-
import { fileURLToPath } from 'node:url';
43
import { defineConfig } from '@rspack/cli';
54
import { rspack } from '@rspack/core';
65

7-
const __dirname = path.dirname(fileURLToPath(import.meta.url));
8-
96
export default defineConfig({
107
entry: './src/index.ts',
118
resolve: {
129
tsConfig: {
13-
configFile: path.resolve(__dirname, 'tsconfig.json'),
10+
configFile: path.resolve(import.meta.dirname, 'tsconfig.json'),
1411
},
1512
extensions: ['...', '.ts'],
1613
},

rspack/builtin-swc-loader/rspack.config.mjs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
// @ts-check
2-
3-
import { createRequire } from 'node:module';
42
import path from 'node:path';
53
import { fileURLToPath } from 'node:url';
64
import { defineConfig } from '@rspack/cli';
75
import { rspack } from '@rspack/core';
86

9-
const __dirname = path.dirname(fileURLToPath(import.meta.url));
10-
const require = createRequire(import.meta.url);
117
const isProduction = process.env.NODE_ENV === 'production';
128

139
export default defineConfig({
@@ -17,7 +13,7 @@ export default defineConfig({
1713
resolve: {
1814
extensions: ['...', '.jsx'],
1915
alias: {
20-
'@swc/helpers': path.dirname(require.resolve('@swc/helpers/package.json')),
16+
'@swc/helpers': path.dirname(fileURLToPath(import.meta.resolve('@swc/helpers/package.json'))),
2117
},
2218
},
2319
module: {
@@ -56,7 +52,7 @@ export default defineConfig({
5652
[
5753
'@swc/plugin-relay',
5854
{
59-
rootDir: __dirname,
55+
rootDir: import.meta.dirname,
6056
artifactDirectory: 'src/__generated__',
6157
language: 'typescript',
6258
},
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
const { rspack } = require('@rspack/core');
2-
const { ReactRefreshRspackPlugin } = require('@rspack/plugin-react-refresh');
3-
/** @type {import('@rspack/cli').Configuration} */
4-
const config = {
1+
// @ts-check
2+
import { defineConfig } from '@rspack/cli';
3+
import { rspack } from '@rspack/core';
4+
import { ReactRefreshRspackPlugin } from '@rspack/plugin-react-refresh';
5+
6+
export default defineConfig({
57
entry: {
68
main: './src/index.tsx',
79
},
@@ -55,5 +57,4 @@ const config = {
5557
],
5658
}),
5759
],
58-
};
59-
module.exports = config;
60+
});
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
const { rspack } = require('@rspack/core');
2-
const { ReactRefreshRspackPlugin } = require('@rspack/plugin-react-refresh');
1+
// @ts-check
2+
import { defineConfig } from '@rspack/cli';
3+
import { rspack } from '@rspack/core';
4+
import { ReactRefreshRspackPlugin } from '@rspack/plugin-react-refresh';
35

4-
/** @type {import('@rspack/cli').Configuration} */
5-
const config = {
6+
export default defineConfig({
67
entry: {
78
main: './src/index.jsx',
89
},
@@ -56,5 +57,4 @@ const config = {
5657
],
5758
}),
5859
],
59-
};
60-
module.exports = config;
60+
});

rspack/css-chunking-plugin/rspack.config.js renamed to rspack/css-chunking-plugin/rspack.config.mjs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
const { rspack } = require('@rspack/core');
1+
// @ts-check
2+
import { defineConfig } from '@rspack/cli';
3+
import { rspack } from '@rspack/core';
24

3-
/** @type {import('@rspack/cli').Configuration} */
4-
const config = {
5+
export default defineConfig({
56
entry: './src/index.js',
67
module: {
78
rules: [
@@ -27,6 +28,4 @@ const config = {
2728
minSize: 0,
2829
},
2930
},
30-
};
31-
32-
module.exports = config;
31+
});

rspack/css-parser-generator-options/rspack.config.js renamed to rspack/css-parser-generator-options/rspack.config.mjs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
const path = require('path');
2-
const { rspack } = require('@rspack/core');
1+
// @ts-check
2+
import path from 'node:path';
3+
import { defineConfig } from '@rspack/cli';
4+
import { rspack } from '@rspack/core';
35

4-
/** @type {import('@rspack/cli').Configuration} */
5-
const config = {
6+
export default defineConfig({
67
entry: './src/index.js',
78
module: {
89
parser: {
@@ -19,12 +20,12 @@ const config = {
1920
rules: [
2021
{
2122
test: /\.css$/,
22-
exclude: path.resolve(__dirname, 'src/legacy'),
23+
exclude: path.resolve(import.meta.dirname, 'src/legacy'),
2324
type: 'css/auto',
2425
},
2526
{
2627
// files in src/legacy and ends with .css will be CSS Modules
27-
include: path.resolve(__dirname, 'src/legacy'),
28+
include: path.resolve(import.meta.dirname, 'src/legacy'),
2829
test: /\.css$/,
2930
type: 'css/module',
3031
parser: {
@@ -47,6 +48,4 @@ const config = {
4748
template: './index.html',
4849
}),
4950
],
50-
};
51-
52-
module.exports = config;
51+
});

rspack/dll-reference/rspack.config.js

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// @ts-check
2+
import path from 'node:path';
3+
import { defineConfig } from '@rspack/cli';
4+
import { rspack } from '@rspack/core';
5+
6+
export default defineConfig({
7+
entry: './index',
8+
output: {
9+
path: path.resolve(import.meta.dirname, 'dist'),
10+
},
11+
resolve: {
12+
extensions: ['...', '.ts', '.tsx', '.js', '.jsx'],
13+
},
14+
plugins: [
15+
new rspack.DllReferencePlugin({
16+
manifest: path.resolve(import.meta.dirname, '../dll/dist/alpha.manifest.json'),
17+
extensions: ['.js', '.ts'],
18+
}),
19+
new rspack.DllReferencePlugin({
20+
manifest: path.resolve(import.meta.dirname, '../dll/dist/beta.manifest.json'),
21+
scope: 'beta',
22+
extensions: ['.js', '.jsx', '.ts', '.tsx'],
23+
}),
24+
],
25+
mode: 'development',
26+
});

0 commit comments

Comments
 (0)