@bleedingdev/modern-js-builder 3.2.0-ultramodern.11 → 3.2.0-ultramodern.110

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. package/dist/cjs/createBuilder.js +9 -5
  2. package/dist/cjs/index.js +9 -5
  3. package/dist/cjs/plugins/devtools.js +12 -8
  4. package/dist/cjs/plugins/emitRouteFile.js +9 -5
  5. package/dist/cjs/plugins/environmentDefaults.js +14 -6
  6. package/dist/cjs/plugins/globalVars.js +9 -5
  7. package/dist/cjs/plugins/htmlMinify.js +9 -5
  8. package/dist/cjs/plugins/manifest.js +9 -5
  9. package/dist/cjs/plugins/postcss.js +9 -5
  10. package/dist/cjs/plugins/rscConfig.js +15 -6
  11. package/dist/cjs/plugins/rsdoctor.js +12 -8
  12. package/dist/cjs/plugins/runtimeChunk.js +9 -5
  13. package/dist/cjs/shared/devServer.js +9 -5
  14. package/dist/cjs/shared/getCssSupport.js +9 -5
  15. package/dist/cjs/shared/manifest.js +12 -8
  16. package/dist/cjs/shared/parseCommonConfig.js +21 -10
  17. package/dist/cjs/shared/rsc/rsc-server-entry-loader.js +12 -8
  18. package/dist/cjs/shared/rsc/rscClientBrowserFallback.js +9 -5
  19. package/dist/cjs/shared/rsc/rscEmptyModule.js +12 -8
  20. package/dist/cjs/shared/utils.js +9 -5
  21. package/dist/esm/plugins/environmentDefaults.mjs +5 -1
  22. package/dist/esm/plugins/rscConfig.mjs +6 -1
  23. package/dist/esm/shared/parseCommonConfig.mjs +12 -5
  24. package/dist/esm-node/plugins/environmentDefaults.mjs +5 -1
  25. package/dist/esm-node/plugins/rscConfig.mjs +6 -1
  26. package/dist/esm-node/shared/parseCommonConfig.mjs +12 -5
  27. package/package.json +25 -25
package/dist/cjs/createBuilder.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
package/dist/cjs/index.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
package/dist/cjs/plugins/devtools.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -23,9 +27,6 @@ var __webpack_require__ = {};
23
27
  })();
24
28
  var __webpack_exports__ = {};
25
29
  __webpack_require__.r(__webpack_exports__);
26
- __webpack_require__.d(__webpack_exports__, {
27
- pluginDevtool: ()=>pluginDevtool
28
- });
29
30
  const pluginDevtool = (options)=>({
30
31
  name: 'builder:devtool',
31
32
  setup (api) {
@@ -38,6 +39,9 @@ const pluginDevtool = (options)=>({
38
39
  });
39
40
  }
40
41
  });
42
+ __webpack_require__.d(__webpack_exports__, {}, {
43
+ pluginDevtool: pluginDevtool
44
+ });
41
45
  exports.pluginDevtool = __webpack_exports__.pluginDevtool;
42
46
  for(var __rspack_i in __webpack_exports__)if (-1 === [
43
47
  "pluginDevtool"
package/dist/cjs/plugins/emitRouteFile.js CHANGED
@@ -10,11 +10,15 @@ var __webpack_require__ = {};
10
10
  };
11
11
  })();
12
12
  (()=>{
13
- __webpack_require__.d = (exports1, definition)=>{
14
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
15
- enumerable: true,
16
- get: definition[key]
17
- });
13
+ __webpack_require__.d = (exports1, getters, values)=>{
14
+ var define = (defs, kind)=>{
15
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
16
+ enumerable: true,
17
+ [kind]: defs[key]
18
+ });
19
+ };
20
+ define(getters, "get");
21
+ define(values, "value");
18
22
  };
19
23
  })();
20
24
  (()=>{
package/dist/cjs/plugins/environmentDefaults.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -84,7 +88,11 @@ const pluginEnvironmentDefaults = (distPath = {})=>({
84
88
  });
85
89
  api.modifyBundlerChain(async (chain, { environment })=>{
86
90
  const isServiceWorker = environment.name === utils_js_namespaceObject.SERVICE_WORKER_ENVIRONMENT_NAME;
87
- if (isServiceWorker) chain.output.library({
91
+ if (isServiceWorker && true === chain.output.get('module')) chain.output.library({
92
+ ...chain.output.get('library') || {},
93
+ type: 'module'
94
+ });
95
+ else if (isServiceWorker) chain.output.library({
88
96
  ...chain.output.get('library') || {},
89
97
  type: 'commonjs2'
90
98
  });
package/dist/cjs/plugins/globalVars.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
package/dist/cjs/plugins/htmlMinify.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
package/dist/cjs/plugins/manifest.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
package/dist/cjs/plugins/postcss.js CHANGED
@@ -13,11 +13,15 @@ var __webpack_require__ = {};
13
13
  };
14
14
  })();
15
15
  (()=>{
16
- __webpack_require__.d = (exports1, definition)=>{
17
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
18
- enumerable: true,
19
- get: definition[key]
20
- });
16
+ __webpack_require__.d = (exports1, getters, values)=>{
17
+ var define = (defs, kind)=>{
18
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
19
+ enumerable: true,
20
+ [kind]: defs[key]
21
+ });
22
+ };
23
+ define(getters, "get");
24
+ define(values, "value");
21
25
  };
22
26
  })();
23
27
  (()=>{
package/dist/cjs/plugins/rscConfig.js CHANGED
@@ -10,11 +10,15 @@ var __webpack_require__ = {};
10
10
  };
11
11
  })();
12
12
  (()=>{
13
- __webpack_require__.d = (exports1, definition)=>{
14
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
15
- enumerable: true,
16
- get: definition[key]
17
- });
13
+ __webpack_require__.d = (exports1, getters, values)=>{
14
+ var define = (defs, kind)=>{
15
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
16
+ enumerable: true,
17
+ [kind]: defs[key]
18
+ });
19
+ };
20
+ define(getters, "get");
21
+ define(values, "value");
18
22
  };
19
23
  })();
20
24
  (()=>{
@@ -39,6 +43,9 @@ __webpack_require__.d(__webpack_exports__, {
39
43
  const external_path_namespaceObject = require("path");
40
44
  var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
41
45
  const ASYNC_STORAGE_PATTERN = /universal[/\\]async_storage/;
46
+ const SERVER_LOADER_ENTRY_PATTERN = /[/\\](?:server-loader-combined|route-server-loaders)\.js$/;
47
+ const RENDER_RSC_SOURCE_PATTERN = /render[/\\].*[/\\]server[/\\]rsc/;
48
+ const RENDER_RSC_RSLIB_ENTRY_PATTERN = /render[/\\]dist[/\\]esm[/\\]rsc\.mjs$/;
42
49
  const RSC_COMMON_LAYER = 'rsc-common';
43
50
  const ENTRY_NAME_VAR = '__MODERN_JS_ENTRY_NAME';
44
51
  const createVirtualModule = (content)=>`data:text/javascript,${encodeURIComponent(content)}`;
@@ -136,8 +143,10 @@ async function getRscPlugins(enableRsc, internalDirectory) {
136
143
  return [
137
144
  pluginRSC({
138
145
  layers: {
146
+ ssr: SERVER_LOADER_ENTRY_PATTERN,
139
147
  rsc: [
140
- /render[/\\].*[/\\]server[/\\]rsc/,
148
+ RENDER_RSC_SOURCE_PATTERN,
149
+ RENDER_RSC_RSLIB_ENTRY_PATTERN,
141
150
  /AppProxy/,
142
151
  routesFileReg
143
152
  ]
package/dist/cjs/plugins/rsdoctor.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -23,9 +27,6 @@ var __webpack_require__ = {};
23
27
  })();
24
28
  var __webpack_exports__ = {};
25
29
  __webpack_require__.r(__webpack_exports__);
26
- __webpack_require__.d(__webpack_exports__, {
27
- pluginRsdoctor: ()=>pluginRsdoctor
28
- });
29
30
  const isRsdoctorEnabled = (config)=>{
30
31
  if (void 0 === config) return false;
31
32
  if ('boolean' == typeof config) return config;
@@ -55,6 +56,9 @@ const pluginRsdoctor = (config)=>{
55
56
  }
56
57
  };
57
58
  };
59
+ __webpack_require__.d(__webpack_exports__, {}, {
60
+ pluginRsdoctor: pluginRsdoctor
61
+ });
58
62
  exports.pluginRsdoctor = __webpack_exports__.pluginRsdoctor;
59
63
  for(var __rspack_i in __webpack_exports__)if (-1 === [
60
64
  "pluginRsdoctor"
package/dist/cjs/plugins/runtimeChunk.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
package/dist/cjs/shared/devServer.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
package/dist/cjs/shared/getCssSupport.js CHANGED
@@ -10,11 +10,15 @@ var __webpack_require__ = {};
10
10
  };
11
11
  })();
12
12
  (()=>{
13
- __webpack_require__.d = (exports1, definition)=>{
14
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
15
- enumerable: true,
16
- get: definition[key]
17
- });
13
+ __webpack_require__.d = (exports1, getters, values)=>{
14
+ var define = (defs, kind)=>{
15
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
16
+ enumerable: true,
17
+ [kind]: defs[key]
18
+ });
19
+ };
20
+ define(getters, "get");
21
+ define(values, "value");
18
22
  };
19
23
  })();
20
24
  (()=>{
package/dist/cjs/shared/manifest.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -23,9 +27,6 @@ var __webpack_require__ = {};
23
27
  })();
24
28
  var __webpack_exports__ = {};
25
29
  __webpack_require__.r(__webpack_exports__);
26
- __webpack_require__.d(__webpack_exports__, {
27
- generateManifest: ()=>generateManifest
28
- });
29
30
  const generateManifest = (seed, files, entries)=>{
30
31
  const manifestFiles = files.reduce((manifest, file)=>{
31
32
  manifest[file.name] = file.path;
@@ -37,6 +38,9 @@ const generateManifest = (seed, files, entries)=>{
37
38
  entrypoints: entrypointFiles
38
39
  };
39
40
  };
41
+ __webpack_require__.d(__webpack_exports__, {}, {
42
+ generateManifest: generateManifest
43
+ });
40
44
  exports.generateManifest = __webpack_exports__.generateManifest;
41
45
  for(var __rspack_i in __webpack_exports__)if (-1 === [
42
46
  "generateManifest"
package/dist/cjs/shared/parseCommonConfig.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -105,17 +109,24 @@ async function parseCommonConfig(builderConfig, options) {
105
109
  html.appIcon = appIcon;
106
110
  extraConfig.tools ??= {};
107
111
  if (false !== htmlPlugin) extraConfig.tools.htmlPlugin = (config)=>{
112
+ const defaultTemplateParameters = {
113
+ title: config.title,
114
+ meta: void 0,
115
+ mountId: html.mountId
116
+ };
108
117
  if ('function' == typeof config.templateParameters) {
109
118
  const originFn = config.templateParameters;
110
- config.templateParameters = (...args)=>{
111
- const res = originFn(...args);
119
+ config.templateParameters = async (...args)=>{
120
+ const res = await originFn(...args);
112
121
  return {
113
- title: config.title,
114
- meta: void 0,
122
+ ...defaultTemplateParameters,
115
123
  ...res
116
124
  };
117
125
  };
118
- }
126
+ } else config.templateParameters = {
127
+ ...defaultTemplateParameters,
128
+ ...config.templateParameters
129
+ };
119
130
  };
120
131
  if (!dev.lazyCompilation) dev.lazyCompilation = false;
121
132
  const { rsbuildDev, rsbuildServer } = (0, external_devServer_js_namespaceObject.transformToRsbuildServerOptions)(dev || {}, devServer || {}, server || {});
package/dist/cjs/shared/rsc/rsc-server-entry-loader.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -23,15 +27,15 @@ var __webpack_require__ = {};
23
27
  })();
24
28
  var __webpack_exports__ = {};
25
29
  __webpack_require__.r(__webpack_exports__);
26
- __webpack_require__.d(__webpack_exports__, {
27
- default: ()=>rscServerEntryLoader
28
- });
29
30
  function rscServerEntryLoader(source) {
30
31
  this.cacheable(true);
31
32
  const hasServerEntryDirective = source.includes("'use server-entry'") || source.includes('"use server-entry"') || source.includes('`use server-entry`');
32
33
  if (hasServerEntryDirective) return source;
33
34
  return `'use server-entry';\n${source}`;
34
35
  }
36
+ __webpack_require__.d(__webpack_exports__, {
37
+ default: ()=>rscServerEntryLoader
38
+ });
35
39
  exports["default"] = __webpack_exports__["default"];
36
40
  for(var __rspack_i in __webpack_exports__)if (-1 === [
37
41
  "default"
package/dist/cjs/shared/rsc/rscClientBrowserFallback.js CHANGED
@@ -10,11 +10,15 @@ var __webpack_require__ = {};
10
10
  };
11
11
  })();
12
12
  (()=>{
13
- __webpack_require__.d = (exports1, definition)=>{
14
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
15
- enumerable: true,
16
- get: definition[key]
17
- });
13
+ __webpack_require__.d = (exports1, getters, values)=>{
14
+ var define = (defs, kind)=>{
15
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
16
+ enumerable: true,
17
+ [kind]: defs[key]
18
+ });
19
+ };
20
+ define(getters, "get");
21
+ define(values, "value");
18
22
  };
19
23
  })();
20
24
  (()=>{
package/dist/cjs/shared/rsc/rscEmptyModule.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  var __webpack_require__ = {};
3
3
  (()=>{
4
- __webpack_require__.d = (exports1, definition)=>{
5
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
6
- enumerable: true,
7
- get: definition[key]
8
- });
4
+ __webpack_require__.d = (exports1, getters, values)=>{
5
+ var define = (defs, kind)=>{
6
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
7
+ enumerable: true,
8
+ [kind]: defs[key]
9
+ });
10
+ };
11
+ define(getters, "get");
12
+ define(values, "value");
9
13
  };
10
14
  })();
11
15
  (()=>{
@@ -23,10 +27,10 @@ var __webpack_require__ = {};
23
27
  })();
24
28
  var __webpack_exports__ = {};
25
29
  __webpack_require__.r(__webpack_exports__);
26
- __webpack_require__.d(__webpack_exports__, {
27
- default: ()=>__rspack_default_export
28
- });
29
30
  const __rspack_default_export = {};
31
+ __webpack_require__.d(__webpack_exports__, {}, {
32
+ default: __rspack_default_export
33
+ });
30
34
  exports["default"] = __webpack_exports__["default"];
31
35
  for(var __rspack_i in __webpack_exports__)if (-1 === [
32
36
  "default"
package/dist/cjs/shared/utils.js CHANGED
@@ -10,11 +10,15 @@ var __webpack_require__ = {};
10
10
  };
11
11
  })();
12
12
  (()=>{
13
- __webpack_require__.d = (exports1, definition)=>{
14
- for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
15
- enumerable: true,
16
- get: definition[key]
17
- });
13
+ __webpack_require__.d = (exports1, getters, values)=>{
14
+ var define = (defs, kind)=>{
15
+ for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
16
+ enumerable: true,
17
+ [kind]: defs[key]
18
+ });
19
+ };
20
+ define(getters, "get");
21
+ define(values, "value");
18
22
  };
19
23
  })();
20
24
  (()=>{
package/dist/esm/plugins/environmentDefaults.mjs CHANGED
@@ -56,7 +56,11 @@ const pluginEnvironmentDefaults = (distPath = {})=>({
56
56
  });
57
57
  api.modifyBundlerChain(async (chain, { environment })=>{
58
58
  const isServiceWorker = environment.name === SERVICE_WORKER_ENVIRONMENT_NAME;
59
- if (isServiceWorker) chain.output.library({
59
+ if (isServiceWorker && true === chain.output.get('module')) chain.output.library({
60
+ ...chain.output.get('library') || {},
61
+ type: 'module'
62
+ });
63
+ else if (isServiceWorker) chain.output.library({
60
64
  ...chain.output.get('library') || {},
61
65
  type: 'commonjs2'
62
66
  });
package/dist/esm/plugins/rscConfig.mjs CHANGED
@@ -1,5 +1,8 @@
1
1
  import path from "path";
2
2
  const ASYNC_STORAGE_PATTERN = /universal[/\\]async_storage/;
3
+ const SERVER_LOADER_ENTRY_PATTERN = /[/\\](?:server-loader-combined|route-server-loaders)\.js$/;
4
+ const RENDER_RSC_SOURCE_PATTERN = /render[/\\].*[/\\]server[/\\]rsc/;
5
+ const RENDER_RSC_RSLIB_ENTRY_PATTERN = /render[/\\]dist[/\\]esm[/\\]rsc\.mjs$/;
3
6
  const RSC_COMMON_LAYER = 'rsc-common';
4
7
  const ENTRY_NAME_VAR = '__MODERN_JS_ENTRY_NAME';
5
8
  const createVirtualModule = (content)=>`data:text/javascript,${encodeURIComponent(content)}`;
@@ -97,8 +100,10 @@ async function getRscPlugins(enableRsc, internalDirectory) {
97
100
  return [
98
101
  pluginRSC({
99
102
  layers: {
103
+ ssr: SERVER_LOADER_ENTRY_PATTERN,
100
104
  rsc: [
101
- /render[/\\].*[/\\]server[/\\]rsc/,
105
+ RENDER_RSC_SOURCE_PATTERN,
106
+ RENDER_RSC_RSLIB_ENTRY_PATTERN,
102
107
  /AppProxy/,
103
108
  routesFileReg
104
109
  ]
package/dist/esm/shared/parseCommonConfig.mjs CHANGED
@@ -76,17 +76,24 @@ async function parseCommonConfig(builderConfig, options) {
76
76
  html.appIcon = appIcon;
77
77
  extraConfig.tools ??= {};
78
78
  if (false !== htmlPlugin) extraConfig.tools.htmlPlugin = (config)=>{
79
+ const defaultTemplateParameters = {
80
+ title: config.title,
81
+ meta: void 0,
82
+ mountId: html.mountId
83
+ };
79
84
  if ('function' == typeof config.templateParameters) {
80
85
  const originFn = config.templateParameters;
81
- config.templateParameters = (...args)=>{
82
- const res = originFn(...args);
86
+ config.templateParameters = async (...args)=>{
87
+ const res = await originFn(...args);
83
88
  return {
84
- title: config.title,
85
- meta: void 0,
89
+ ...defaultTemplateParameters,
86
90
  ...res
87
91
  };
88
92
  };
89
- }
93
+ } else config.templateParameters = {
94
+ ...defaultTemplateParameters,
95
+ ...config.templateParameters
96
+ };
90
97
  };
91
98
  if (!dev.lazyCompilation) dev.lazyCompilation = false;
92
99
  const { rsbuildDev, rsbuildServer } = transformToRsbuildServerOptions(dev || {}, devServer || {}, server || {});
package/dist/esm-node/plugins/environmentDefaults.mjs CHANGED
@@ -57,7 +57,11 @@ const pluginEnvironmentDefaults = (distPath = {})=>({
57
57
  });
58
58
  api.modifyBundlerChain(async (chain, { environment })=>{
59
59
  const isServiceWorker = environment.name === SERVICE_WORKER_ENVIRONMENT_NAME;
60
- if (isServiceWorker) chain.output.library({
60
+ if (isServiceWorker && true === chain.output.get('module')) chain.output.library({
61
+ ...chain.output.get('library') || {},
62
+ type: 'module'
63
+ });
64
+ else if (isServiceWorker) chain.output.library({
61
65
  ...chain.output.get('library') || {},
62
66
  type: 'commonjs2'
63
67
  });
package/dist/esm-node/plugins/rscConfig.mjs CHANGED
@@ -5,6 +5,9 @@ import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
5
5
  import { dirname as __rspack_dirname } from "node:path";
6
6
  var rscConfig_dirname = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
7
7
  const ASYNC_STORAGE_PATTERN = /universal[/\\]async_storage/;
8
+ const SERVER_LOADER_ENTRY_PATTERN = /[/\\](?:server-loader-combined|route-server-loaders)\.js$/;
9
+ const RENDER_RSC_SOURCE_PATTERN = /render[/\\].*[/\\]server[/\\]rsc/;
10
+ const RENDER_RSC_RSLIB_ENTRY_PATTERN = /render[/\\]dist[/\\]esm[/\\]rsc\.mjs$/;
8
11
  const RSC_COMMON_LAYER = 'rsc-common';
9
12
  const ENTRY_NAME_VAR = '__MODERN_JS_ENTRY_NAME';
10
13
  const createVirtualModule = (content)=>`data:text/javascript,${encodeURIComponent(content)}`;
@@ -102,8 +105,10 @@ async function getRscPlugins(enableRsc, internalDirectory) {
102
105
  return [
103
106
  pluginRSC({
104
107
  layers: {
108
+ ssr: SERVER_LOADER_ENTRY_PATTERN,
105
109
  rsc: [
106
- /render[/\\].*[/\\]server[/\\]rsc/,
110
+ RENDER_RSC_SOURCE_PATTERN,
111
+ RENDER_RSC_RSLIB_ENTRY_PATTERN,
107
112
  /AppProxy/,
108
113
  routesFileReg
109
114
  ]
package/dist/esm-node/shared/parseCommonConfig.mjs CHANGED
@@ -77,17 +77,24 @@ async function parseCommonConfig(builderConfig, options) {
77
77
  html.appIcon = appIcon;
78
78
  extraConfig.tools ??= {};
79
79
  if (false !== htmlPlugin) extraConfig.tools.htmlPlugin = (config)=>{
80
+ const defaultTemplateParameters = {
81
+ title: config.title,
82
+ meta: void 0,
83
+ mountId: html.mountId
84
+ };
80
85
  if ('function' == typeof config.templateParameters) {
81
86
  const originFn = config.templateParameters;
82
- config.templateParameters = (...args)=>{
83
- const res = originFn(...args);
87
+ config.templateParameters = async (...args)=>{
88
+ const res = await originFn(...args);
84
89
  return {
85
- title: config.title,
86
- meta: void 0,
90
+ ...defaultTemplateParameters,
87
91
  ...res
88
92
  };
89
93
  };
90
- }
94
+ } else config.templateParameters = {
95
+ ...defaultTemplateParameters,
96
+ ...config.templateParameters
97
+ };
91
98
  };
92
99
  if (!dev.lazyCompilation) dev.lazyCompilation = false;
93
100
  const { rsbuildDev, rsbuildServer } = transformToRsbuildServerOptions(dev || {}, devServer || {}, server || {});
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bleedingdev/modern-js-builder",
3
- "version": "3.2.0-ultramodern.11",
3
+ "version": "3.2.0-ultramodern.110",
4
4
  "description": "A builder for Modern.js",
5
5
  "repository": {
6
6
  "type": "git",
@@ -26,28 +26,28 @@
26
26
  "dist"
27
27
  ],
28
28
  "dependencies": {
29
- "@rsbuild/core": "2.0.6",
30
- "@rsbuild/plugin-assets-retry": "2.0.0",
31
- "@rsbuild/plugin-check-syntax": "1.6.1",
32
- "@rsbuild/plugin-css-minimizer": "2.0.0",
33
- "@rsbuild/plugin-less": "1.6.3",
34
- "@rsbuild/plugin-react": "2.0.0",
35
- "@rsbuild/plugin-rem": "1.0.5",
36
- "@rsbuild/plugin-sass": "1.5.2",
37
- "@rsbuild/plugin-source-build": "1.0.5",
38
- "@rsbuild/plugin-svgr": "2.0.2",
39
- "@rsbuild/plugin-type-check": "1.3.4",
40
- "@rsbuild/plugin-typed-css-modules": "1.2.2",
41
- "@rsdoctor/rspack-plugin": "^1.5.11",
42
- "@swc/core": "1.15.33",
43
- "@swc/helpers": "^0.5.21",
29
+ "@rsbuild/core": "2.0.10",
30
+ "@rsbuild/plugin-assets-retry": "2.0.1",
31
+ "@rsbuild/plugin-check-syntax": "2.0.0",
32
+ "@rsbuild/plugin-css-minimizer": "2.0.1",
33
+ "@rsbuild/plugin-less": "1.6.4",
34
+ "@rsbuild/plugin-react": "2.0.1",
35
+ "@rsbuild/plugin-rem": "1.0.6",
36
+ "@rsbuild/plugin-sass": "1.5.3",
37
+ "@rsbuild/plugin-source-build": "1.0.6",
38
+ "@rsbuild/plugin-svgr": "2.0.3",
39
+ "@rsbuild/plugin-type-check": "1.3.5",
40
+ "@rsbuild/plugin-typed-css-modules": "1.2.3",
41
+ "@rsdoctor/rspack-plugin": "^1.5.12",
42
+ "@swc/core": "1.15.40",
43
+ "@swc/helpers": "^0.5.23",
44
44
  "autoprefixer": "10.5.0",
45
45
  "browserslist": "4.28.2",
46
46
  "core-js": "^3.49.0",
47
47
  "cssnano": "8.0.1",
48
48
  "html-minifier-terser": "^7.2.0",
49
49
  "lodash": "^4.18.1",
50
- "postcss": "^8.5.14",
50
+ "postcss": "^8.5.15",
51
51
  "postcss-custom-properties": "15.0.1",
52
52
  "postcss-flexbugs-fixes": "5.0.2",
53
53
  "postcss-font-variant": "5.0.0",
@@ -58,25 +58,25 @@
58
58
  "postcss-page-break": "3.0.4",
59
59
  "rsbuild-plugin-rsc": "0.1.0",
60
60
  "rspack-manifest-plugin": "5.2.1",
61
- "ts-deepmerge": "7.0.3",
62
- "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.11"
61
+ "ts-deepmerge": "8.0.0",
62
+ "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.110"
63
63
  },
64
64
  "devDependencies": {
65
65
  "@rslib/core": "0.21.5",
66
66
  "@types/html-minifier-terser": "^7.0.2",
67
67
  "@types/lodash": "^4.17.24",
68
- "@typescript/native-preview": "7.0.0-dev.20260516.1",
69
- "react": "^19.2.6",
70
- "terser": "^5.47.1",
71
- "@scripts/rstest-config": "2.66.0",
72
- "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.11"
68
+ "@typescript/native-preview": "7.0.0-dev.20260606.1",
69
+ "react": "^19.2.7",
70
+ "terser": "^5.48.0",
71
+ "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.110",
72
+ "@scripts/rstest-config": "2.66.0"
73
73
  },
74
74
  "publishConfig": {
75
75
  "access": "public",
76
76
  "registry": "https://registry.npmjs.org/"
77
77
  },
78
78
  "scripts": {
79
- "build": "rslib build",
79
+ "build": "rslib build && pnpm -w tsgo:dts \"$PWD\"",
80
80
  "dev": "rslib build --watch",
81
81
  "test": "rstest run",
82
82
  "test:watch": "rstest watch"