@modern-js/app-tools 2.68.18 → 2.68.19

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 (4) hide show
  1. package/dist/cjs/builder/generator/index.js +15 -1
  2. package/dist/esm/builder/generator/index.js +15 -2
  3. package/dist/esm-node/builder/generator/index.js +15 -1
  4. package/package.json +16 -16
package/dist/cjs/builder/generator/index.js CHANGED
@@ -40,7 +40,21 @@ async function generateBuilder(options, bundlerType) {
40
40
  const { normalizedConfig, appContext } = options;
41
41
  const tempBuilderConfig = (0, import_createBuilderProviderConfig.createBuilderProviderConfig)(normalizedConfig, appContext);
42
42
  const { environments, builderConfig } = (0, import_getBuilderEnvironments.getBuilderEnvironments)(normalizedConfig, appContext, tempBuilderConfig);
43
- builderConfig.environments = builderConfig.environments ? (0, import_core.mergeRsbuildConfig)(environments, builderConfig.environments) : environments;
43
+ if (builderConfig.environments) {
44
+ const mergedEnvironments = {
45
+ ...environments
46
+ };
47
+ for (const name in builderConfig.environments) {
48
+ if (environments[name]) {
49
+ mergedEnvironments[name] = (0, import_core.mergeRsbuildConfig)(environments[name], builderConfig.environments[name]);
50
+ } else {
51
+ mergedEnvironments[name] = builderConfig.environments[name];
52
+ }
53
+ }
54
+ builderConfig.environments = mergedEnvironments;
55
+ } else {
56
+ builderConfig.environments = environments;
57
+ }
44
58
  const builder = await (0, import_uni_builder.createUniBuilder)({
45
59
  cwd: appContext.appDirectory,
46
60
  rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,
package/dist/esm/builder/generator/index.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
2
+ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
2
3
  import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
3
4
  import { createUniBuilder } from "@modern-js/uni-builder";
4
5
  import { mergeRsbuildConfig } from "@rsbuild/core";
@@ -10,14 +11,26 @@ function generateBuilder(options, bundlerType) {
10
11
  }
11
12
  function _generateBuilder() {
12
13
  _generateBuilder = _async_to_generator(function(options, bundlerType) {
13
- var normalizedConfig, appContext, tempBuilderConfig, _getBuilderEnvironments, environments, builderConfig, builder;
14
+ var normalizedConfig, appContext, tempBuilderConfig, _getBuilderEnvironments, environments, builderConfig, mergedEnvironments, name, builder;
14
15
  return _ts_generator(this, function(_state) {
15
16
  switch (_state.label) {
16
17
  case 0:
17
18
  normalizedConfig = options.normalizedConfig, appContext = options.appContext;
18
19
  tempBuilderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
19
20
  _getBuilderEnvironments = getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig), environments = _getBuilderEnvironments.environments, builderConfig = _getBuilderEnvironments.builderConfig;
20
- builderConfig.environments = builderConfig.environments ? mergeRsbuildConfig(environments, builderConfig.environments) : environments;
21
+ if (builderConfig.environments) {
22
+ mergedEnvironments = _object_spread({}, environments);
23
+ for (var name2 in builderConfig.environments) {
24
+ if (environments[name2]) {
25
+ mergedEnvironments[name2] = mergeRsbuildConfig(environments[name2], builderConfig.environments[name2]);
26
+ } else {
27
+ mergedEnvironments[name2] = builderConfig.environments[name2];
28
+ }
29
+ }
30
+ builderConfig.environments = mergedEnvironments;
31
+ } else {
32
+ builderConfig.environments = environments;
33
+ }
21
34
  return [
22
35
  4,
23
36
  createUniBuilder({
package/dist/esm-node/builder/generator/index.js CHANGED
@@ -7,7 +7,21 @@ async function generateBuilder(options, bundlerType) {
7
7
  const { normalizedConfig, appContext } = options;
8
8
  const tempBuilderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
9
9
  const { environments, builderConfig } = getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig);
10
- builderConfig.environments = builderConfig.environments ? mergeRsbuildConfig(environments, builderConfig.environments) : environments;
10
+ if (builderConfig.environments) {
11
+ const mergedEnvironments = {
12
+ ...environments
13
+ };
14
+ for (const name in builderConfig.environments) {
15
+ if (environments[name]) {
16
+ mergedEnvironments[name] = mergeRsbuildConfig(environments[name], builderConfig.environments[name]);
17
+ } else {
18
+ mergedEnvironments[name] = builderConfig.environments[name];
19
+ }
20
+ }
21
+ builderConfig.environments = mergedEnvironments;
22
+ } else {
23
+ builderConfig.environments = environments;
24
+ }
11
25
  const builder = await createUniBuilder({
12
26
  cwd: appContext.appDirectory,
13
27
  rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.68.18",
18
+ "version": "2.68.19",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -85,7 +85,7 @@
85
85
  "@babel/parser": "^7.22.15",
86
86
  "@babel/traverse": "^7.23.2",
87
87
  "@babel/types": "^7.26.0",
88
- "@rsbuild/core": "1.5.17",
88
+ "@rsbuild/core": "1.6.1",
89
89
  "@rsbuild/plugin-node-polyfill": "1.4.2",
90
90
  "@swc/helpers": "^0.5.17",
91
91
  "es-module-lexer": "^1.1.0",
@@ -96,20 +96,20 @@
96
96
  "ndepe": "^0.1.12",
97
97
  "pkg-types": "^1.3.1",
98
98
  "std-env": "^3.7.0",
99
- "@modern-js/node-bundle-require": "2.68.18",
100
- "@modern-js/core": "2.68.18",
101
- "@modern-js/plugin": "2.68.18",
102
- "@modern-js/plugin-i18n": "2.68.18",
103
- "@modern-js/plugin-data-loader": "2.68.18",
104
- "@modern-js/prod-server": "2.68.18",
105
- "@modern-js/plugin-v2": "2.68.18",
106
- "@modern-js/rsbuild-plugin-esbuild": "2.68.18",
107
- "@modern-js/server": "2.68.18",
108
- "@modern-js/server-utils": "2.68.18",
109
- "@modern-js/types": "2.68.18",
110
- "@modern-js/server-core": "2.68.18",
111
- "@modern-js/uni-builder": "2.68.18",
112
- "@modern-js/utils": "2.68.18"
99
+ "@modern-js/core": "2.68.19",
100
+ "@modern-js/node-bundle-require": "2.68.19",
101
+ "@modern-js/plugin": "2.68.19",
102
+ "@modern-js/plugin-data-loader": "2.68.19",
103
+ "@modern-js/plugin-i18n": "2.68.19",
104
+ "@modern-js/rsbuild-plugin-esbuild": "2.68.19",
105
+ "@modern-js/plugin-v2": "2.68.19",
106
+ "@modern-js/server": "2.68.19",
107
+ "@modern-js/prod-server": "2.68.19",
108
+ "@modern-js/server-core": "2.68.19",
109
+ "@modern-js/server-utils": "2.68.19",
110
+ "@modern-js/types": "2.68.19",
111
+ "@modern-js/uni-builder": "2.68.19",
112
+ "@modern-js/utils": "2.68.19"
113
113
  },
114
114
  "devDependencies": {
115
115
  "@rsbuild/plugin-webpack-swc": "1.1.2",