Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@
},
"dependencies": {
"@rspack/core": "2.0.0-beta.0",
"@swc/helpers": "^0.5.18",
"jiti": "^2.6.1"
"@swc/helpers": "^0.5.18"
},
"peerDependencies": {
"core-js": ">= 3.0.0"
Expand Down Expand Up @@ -74,6 +73,7 @@
"dotenv-expand": "12.0.3",
"html-rspack-plugin": "6.1.7",
"http-proxy-middleware": "^3.0.5",
"jiti": "^2.6.1",
"launch-editor-middleware": "^2.12.0",
"memfs": "^4.56.10",
"mrmime": "^2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/prebundle.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export type SourceMapGenerator = unknown;
{
name: 'postcss-loader',
externals: {
jiti: 'jiti',
jiti: '../jiti',
postcss: '../postcss/index.js',
},
ignoreDts: true,
Expand Down
68 changes: 47 additions & 21 deletions packages/core/rslib.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ const externals: Rspack.Configuration['externals'] = [
`"${name}" is not allowed to be imported, use "requireCompiledPackage" instead.`,
);
}
if (/jiti/.test(request)) {
return callback(undefined, '../compiled/jiti/lib/jiti.mjs');
}
if (test.test(request)) {
return callback(undefined, `../compiled/${name}/index.js`);
}
Expand Down Expand Up @@ -122,6 +125,46 @@ export default defineConfig({
externals,
},
lib: [
// Build client modules and copy dependencies to compiled folder
{
id: 'prepare',
format: 'esm',
syntax: 'es2017',
source: {
entry: {
hmr: 'src/client/hmr.ts',
overlay: 'src/client/overlay.ts',
},
define: {
// use define to avoid compile time evaluation of __webpack_hash__
BUILD_HASH: '__webpack_hash__',
},
},
output: {
target: 'web',
externals: ['./hmr.js'],
distPath: {
root: './dist/client',
},
copy: {
patterns: [
{
from: './node_modules/jiti',
to: path.join(import.meta.dirname, 'compiled/jiti'),
globOptions: {
dot: false,
},
},
],
},
},
performance: {
printFileSize: {
exclude: (asset) => /compiled/.test(asset.name),
},
},
plugins: [replacePlugin],
},
{
id: 'node',
format: 'esm',
Expand Down Expand Up @@ -163,29 +206,12 @@ export default defineConfig({
__filename: true,
},
},
},
{
id: 'client',
format: 'esm',
syntax: 'es2017',
source: {
entry: {
hmr: 'src/client/hmr.ts',
overlay: 'src/client/overlay.ts',
},
define: {
// use define to avoid compile time evaluation of __webpack_hash__
BUILD_HASH: '__webpack_hash__',
tools: {
rspack: {
// Wait the pre compiler to copy jiti to compiled folder
dependencies: ['prepare'],
},
},
output: {
target: 'web',
externals: ['./hmr.js'],
distPath: {
root: './dist/client',
},
},
plugins: [replacePlugin],
},
],
});
Loading
Loading