@modern-js/app-tools 2.26.0 → 2.26.1-alpha.0

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/shared/bundlerPlugins/RouterPlugin.js +21 -12
  2. package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js +45 -34
  3. package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js +21 -12
  4. package/package.json +10 -10
package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js CHANGED
@@ -119,18 +119,6 @@ class RouterPlugin {
119
119
  const manifest = {
120
120
  routeAssets
121
121
  };
122
- const injectedContent = `
123
- ;(function(){
124
- window.${_constants.ROUTE_MANIFEST} = ${JSON.stringify(manifest, (k, v) => {
125
- if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
126
- return v.map((item) => {
127
- return item.replace(publicPath, "");
128
- });
129
- }
130
- return v;
131
- })};
132
- })();
133
- `;
134
122
  const entrypointsArray = Array.from(compilation.entrypoints.entries());
135
123
  const entryChunkIds = entrypointsArray.map((entrypoint) => entrypoint[0]);
136
124
  const entryChunks = [
@@ -150,6 +138,27 @@ class RouterPlugin {
150
138
  if (!asset) {
151
139
  continue;
152
140
  }
141
+ const relatedAssets = {};
142
+ Object.keys(routeAssets).forEach((routeId) => {
143
+ if (routeId.startsWith(`${chunkId}_`)) {
144
+ relatedAssets[routeId] = routeAssets[routeId];
145
+ }
146
+ });
147
+ const manifest2 = {
148
+ routeAssets: relatedAssets
149
+ };
150
+ const injectedContent = `
151
+ ;(function(){
152
+ window.${_constants.ROUTE_MANIFEST} = ${JSON.stringify(manifest2, (k, v) => {
153
+ if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
154
+ return v.map((item) => {
155
+ return item.replace(publicPath, "");
156
+ });
157
+ }
158
+ return v;
159
+ })};
160
+ })();
161
+ `;
153
162
  const { source } = asset.sourceAndMap();
154
163
  const map = chunkToSourceMap.get(chunkId);
155
164
  const newContent = `${injectedContent}${source.toString()}`;
package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js CHANGED
@@ -98,8 +98,43 @@ export var RouterPlugin = /* @__PURE__ */ function() {
98
98
  name: PLUGIN_NAME,
99
99
  stage: Compilation.PROCESS_ASSETS_STAGE_REPORT
100
100
  }, /* @__PURE__ */ _async_to_generator(function() {
101
- var stats, publicPath, _stats_chunks, chunks, namedChunkGroups, routeAssets, prevManifestAsset, prevManifestStr, prevManifest, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, assets, referenceCssAssets, manifest, injectedContent, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, entryChunkFileIds, i, file, chunkId, asset, source, map, newContent, newSource;
101
+ var _loop, stats, publicPath, _stats_chunks, chunks, namedChunkGroups, routeAssets, prevManifestAsset, prevManifestStr, prevManifest, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _step_value, name, chunkGroup, assets, referenceCssAssets, manifest, entrypointsArray, entryChunkIds, entryChunks, entryChunkFiles, entryChunkFileIds, i;
102
102
  return _ts_generator(this, function(_state) {
103
+ _loop = function(i2) {
104
+ var file = entryChunkFiles[i2];
105
+ var chunkId = entryChunkFileIds[i2];
106
+ var asset = compilation.assets[file];
107
+ if (!asset) {
108
+ return "continue";
109
+ }
110
+ var relatedAssets = {};
111
+ Object.keys(routeAssets).forEach(function(routeId) {
112
+ if (routeId.startsWith("".concat(chunkId, "_"))) {
113
+ relatedAssets[routeId] = routeAssets[routeId];
114
+ }
115
+ });
116
+ var manifest2 = {
117
+ routeAssets: relatedAssets
118
+ };
119
+ var injectedContent = "\n ;(function(){\n window.".concat(ROUTE_MANIFEST, " = ").concat(JSON.stringify(manifest2, function(k, v) {
120
+ if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
121
+ return v.map(function(item) {
122
+ return item.replace(publicPath, "");
123
+ });
124
+ }
125
+ return v;
126
+ }), ";\n })();\n ");
127
+ var source = asset.sourceAndMap().source;
128
+ var map = chunkToSourceMap.get(chunkId);
129
+ var newContent = "".concat(injectedContent).concat(source.toString());
130
+ var newSource = new SourceMapSource(newContent, file, map, source.toString(), map);
131
+ compilation.updateAsset(
132
+ file,
133
+ newSource,
134
+ // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
135
+ void 0
136
+ );
137
+ };
103
138
  stats = compilation.getStats().toJson({
104
139
  all: false,
105
140
  publicPath: true,
@@ -124,12 +159,12 @@ export var RouterPlugin = /* @__PURE__ */ function() {
124
159
  try {
125
160
  for (_iterator = Object.entries(namedChunkGroups)[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
126
161
  _step_value = _sliced_to_array(_step.value, 2), name = _step_value[0], chunkGroup = _step_value[1];
127
- assets = chunkGroup.assets.map(function(asset2) {
128
- var filename = asset2.name;
162
+ assets = chunkGroup.assets.map(function(asset) {
163
+ var filename = asset.name;
129
164
  return publicPath ? normalizePath(publicPath) + filename : filename;
130
165
  });
131
- referenceCssAssets = assets.filter(function(asset2) {
132
- return /\.css$/.test(asset2);
166
+ referenceCssAssets = assets.filter(function(asset) {
167
+ return /\.css$/.test(asset);
133
168
  });
134
169
  routeAssets[name] = {
135
170
  chunkIds: chunkGroup.chunks,
@@ -137,11 +172,11 @@ export var RouterPlugin = /* @__PURE__ */ function() {
137
172
  referenceCssAssets: referenceCssAssets
138
173
  };
139
174
  if (prevManifest.routeAssets[name]) {
140
- mergeWith(routeAssets[name], prevManifest.routeAssets[name], function(obj, source2) {
175
+ mergeWith(routeAssets[name], prevManifest.routeAssets[name], function(obj, source) {
141
176
  if (Array.isArray(obj)) {
142
- return obj.concat(source2);
177
+ return obj.concat(source);
143
178
  }
144
- return Object.assign(source2, obj);
179
+ return Object.assign(source, obj);
145
180
  });
146
181
  }
147
182
  }
@@ -162,14 +197,6 @@ export var RouterPlugin = /* @__PURE__ */ function() {
162
197
  manifest = {
163
198
  routeAssets: routeAssets
164
199
  };
165
- injectedContent = "\n ;(function(){\n window.".concat(ROUTE_MANIFEST, " = ").concat(JSON.stringify(manifest, function(k, v) {
166
- if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
167
- return v.map(function(item) {
168
- return item.replace(publicPath, "");
169
- });
170
- }
171
- return v;
172
- }), ";\n })();\n ");
173
200
  entrypointsArray = Array.from(compilation.entrypoints.entries());
174
201
  entryChunkIds = entrypointsArray.map(function(entrypoint) {
175
202
  return entrypoint[0];
@@ -188,24 +215,8 @@ export var RouterPlugin = /* @__PURE__ */ function() {
188
215
  entryChunkFileIds = entryChunks.map(function(chunk) {
189
216
  return chunk.id;
190
217
  });
191
- for (i = 0; i <= entryChunkFiles.length - 1; i++) {
192
- file = entryChunkFiles[i];
193
- chunkId = entryChunkFileIds[i];
194
- asset = compilation.assets[file];
195
- if (!asset) {
196
- continue;
197
- }
198
- source = asset.sourceAndMap().source;
199
- map = chunkToSourceMap.get(chunkId);
200
- newContent = "".concat(injectedContent).concat(source.toString());
201
- newSource = new SourceMapSource(newContent, file, map, source.toString(), map);
202
- compilation.updateAsset(
203
- file,
204
- newSource,
205
- // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
206
- void 0
207
- );
208
- }
218
+ for (i = 0; i <= entryChunkFiles.length - 1; i++)
219
+ _loop(i);
209
220
  if (prevManifestAsset) {
210
221
  compilation.updateAsset(
211
222
  ROUTE_MANIFEST_FILE,
package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js CHANGED
@@ -109,18 +109,6 @@ export class RouterPlugin {
109
109
  const manifest = {
110
110
  routeAssets
111
111
  };
112
- const injectedContent = `
113
- ;(function(){
114
- window.${ROUTE_MANIFEST} = ${JSON.stringify(manifest, (k, v) => {
115
- if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
116
- return v.map((item) => {
117
- return item.replace(publicPath, "");
118
- });
119
- }
120
- return v;
121
- })};
122
- })();
123
- `;
124
112
  const entrypointsArray = Array.from(compilation.entrypoints.entries());
125
113
  const entryChunkIds = entrypointsArray.map((entrypoint) => entrypoint[0]);
126
114
  const entryChunks = [
@@ -140,6 +128,27 @@ export class RouterPlugin {
140
128
  if (!asset) {
141
129
  continue;
142
130
  }
131
+ const relatedAssets = {};
132
+ Object.keys(routeAssets).forEach((routeId) => {
133
+ if (routeId.startsWith(`${chunkId}_`)) {
134
+ relatedAssets[routeId] = routeAssets[routeId];
135
+ }
136
+ });
137
+ const manifest2 = {
138
+ routeAssets: relatedAssets
139
+ };
140
+ const injectedContent = `
141
+ ;(function(){
142
+ window.${ROUTE_MANIFEST} = ${JSON.stringify(manifest2, (k, v) => {
143
+ if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
144
+ return v.map((item) => {
145
+ return item.replace(publicPath, "");
146
+ });
147
+ }
148
+ return v;
149
+ })};
150
+ })();
151
+ `;
143
152
  const { source } = asset.sourceAndMap();
144
153
  const map = chunkToSourceMap.get(chunkId);
145
154
  const newContent = `${injectedContent}${source.toString()}`;
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.26.0",
18
+ "version": "2.26.1-alpha.0",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -74,23 +74,23 @@
74
74
  "rspack-plugin-virtual-module": "0.1.0",
75
75
  "@swc/helpers": "0.5.1",
76
76
  "@modern-js/builder": "2.26.0",
77
- "@modern-js/builder-plugin-esbuild": "2.26.0",
78
77
  "@modern-js/builder-plugin-node-polyfill": "2.26.0",
78
+ "@modern-js/builder-plugin-esbuild": "2.26.0",
79
+ "@modern-js/core": "2.26.0",
79
80
  "@modern-js/builder-shared": "2.26.0",
80
81
  "@modern-js/builder-webpack-provider": "2.26.0",
81
- "@modern-js/core": "2.26.0",
82
82
  "@modern-js/new-action": "2.26.0",
83
83
  "@modern-js/node-bundle-require": "2.26.0",
84
84
  "@modern-js/plugin": "2.26.0",
85
- "@modern-js/plugin-data-loader": "2.26.0",
86
- "@modern-js/plugin-i18n": "2.26.0",
87
85
  "@modern-js/plugin-lint": "2.26.0",
88
86
  "@modern-js/prod-server": "2.26.0",
87
+ "@modern-js/plugin-i18n": "2.26.0",
89
88
  "@modern-js/server": "2.26.0",
90
89
  "@modern-js/types": "2.26.0",
91
- "@modern-js/upgrade": "2.26.0",
92
90
  "@modern-js/utils": "2.26.0",
93
- "@modern-js/server-core": "2.26.0"
91
+ "@modern-js/server-core": "2.26.0",
92
+ "@modern-js/upgrade": "2.26.0",
93
+ "@modern-js/plugin-data-loader": "2.26.0"
94
94
  },
95
95
  "devDependencies": {
96
96
  "@types/babel__traverse": "^7.14.2",
@@ -99,10 +99,10 @@
99
99
  "jest": "^29",
100
100
  "typescript": "^5",
101
101
  "webpack": "^5.88.1",
102
- "@modern-js/builder-plugin-swc": "2.26.0",
103
102
  "@modern-js/builder-rspack-provider": "2.26.0",
104
- "@scripts/jest-config": "2.26.0",
105
- "@scripts/build": "2.26.0"
103
+ "@modern-js/builder-plugin-swc": "2.26.0",
104
+ "@scripts/build": "2.26.0",
105
+ "@scripts/jest-config": "2.26.0"
106
106
  },
107
107
  "peerDependencies": {
108
108
  "@modern-js/builder-rspack-provider": "^2.26.0"