@tarojs/webpack5-prebundle 3.8.0-canary.0 → 4.0.0-alpha.10
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.
- package/LICENSE +11 -4
- package/dist/index.d.ts +4 -1
- package/dist/index.js +11 -8
- package/dist/index.js.map +1 -1
- package/dist/mini.js +13 -13
- package/dist/mini.js.map +1 -1
- package/dist/prebundle/bundle.d.ts +17 -4
- package/dist/prebundle/bundle.js +34 -41
- package/dist/prebundle/bundle.js.map +1 -1
- package/dist/prebundle/index.d.ts +5 -1
- package/dist/prebundle/index.js +31 -23
- package/dist/prebundle/index.js.map +1 -1
- package/dist/prebundle/scanImports.d.ts +2 -1
- package/dist/prebundle/scanImports.js +20 -23
- package/dist/prebundle/scanImports.js.map +1 -1
- package/dist/utils/index.d.ts +0 -1
- package/dist/utils/index.js +9 -14
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/path.js.map +1 -1
- package/dist/utils/webpack.js +2 -2
- package/dist/utils/webpack.js.map +1 -1
- package/dist/web.js +15 -9
- package/dist/web.js.map +1 -1
- package/dist/webpack/TaroContainerEntryModule.d.ts +1 -0
- package/dist/webpack/TaroContainerEntryModule.js.map +1 -1
- package/dist/webpack/TaroContainerPlugin.d.ts +1 -0
- package/dist/webpack/TaroContainerPlugin.js.map +1 -1
- package/dist/webpack/TaroContainerReferencePlugin.d.ts +2 -0
- package/dist/webpack/TaroContainerReferencePlugin.js +3 -3
- package/dist/webpack/TaroContainerReferencePlugin.js.map +1 -1
- package/dist/webpack/TaroModuleFederationPlugin.d.ts +2 -0
- package/dist/webpack/TaroModuleFederationPlugin.js.map +1 -1
- package/dist/webpack/TaroRemoteRuntimeModule.js.map +1 -1
- package/package.json +18 -20
package/LICENSE
CHANGED
|
@@ -154,7 +154,14 @@ See `/LICENSE` for details of the license.
|
|
|
154
154
|
|
|
155
155
|
==================
|
|
156
156
|
|
|
157
|
-
MIT (
|
|
158
|
-
The following files embed [
|
|
159
|
-
`/packages/taro-components
|
|
160
|
-
See `/LICENSE` for details of the license.
|
|
157
|
+
MIT (weui):
|
|
158
|
+
The following files embed [weui](https://github.com/Tencent/weui) MIT:
|
|
159
|
+
`/packages/taro-components/src/components/*.scss`
|
|
160
|
+
See `/LICENSE.txt` for details of the license.
|
|
161
|
+
|
|
162
|
+
==================
|
|
163
|
+
|
|
164
|
+
Apache-2.0 (intersection-observer):
|
|
165
|
+
The following files embed [intersection-observer](https://github.com/GoogleChromeLabs/intersection-observer) Apache-2.0:
|
|
166
|
+
`/packages/taro-api/src/polyfill/intersection-observer.ts`
|
|
167
|
+
See `/LICENSE.txt` for details of the license.
|
package/dist/index.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { PLATFORM_TYPE } from '@tarojs/shared';
|
|
2
|
-
import webpackDevServer from 'webpack-dev-server';
|
|
3
2
|
import { IPrebundle } from './prebundle';
|
|
4
3
|
import { type IWebPrebundleConfig } from './web';
|
|
5
4
|
import type { Compiler, EntryObject } from 'webpack';
|
|
6
5
|
import type Chain from 'webpack-chain';
|
|
6
|
+
import type webpackDevServer from 'webpack-dev-server';
|
|
7
7
|
import type { IMiniPrebundleConfig } from './mini';
|
|
8
8
|
export * from './prebundle';
|
|
9
9
|
export interface IPrebundleParam {
|
|
@@ -21,6 +21,9 @@ export interface IPrebundleParam {
|
|
|
21
21
|
publicPath?: string;
|
|
22
22
|
runtimePath?: string | string[];
|
|
23
23
|
isBuildPlugin?: boolean;
|
|
24
|
+
alias?: Record<string, any>;
|
|
25
|
+
defineConstants?: Record<string, any>;
|
|
26
|
+
modifyAppConfig?: (appConfig: any) => Promise<any>;
|
|
24
27
|
}
|
|
25
28
|
export default class TaroPrebundle {
|
|
26
29
|
protected params: IPrebundleParam;
|
package/dist/index.js
CHANGED
|
@@ -38,8 +38,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
38
38
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
39
39
|
};
|
|
40
40
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
41
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
41
42
|
const shared_1 = require("@tarojs/shared");
|
|
42
|
-
const path_1 = __importDefault(require("path"));
|
|
43
43
|
const web_1 = require("./web");
|
|
44
44
|
__exportStar(require("./prebundle"), exports);
|
|
45
45
|
class TaroPrebundle {
|
|
@@ -55,7 +55,7 @@ class TaroPrebundle {
|
|
|
55
55
|
var _a, _b;
|
|
56
56
|
const platformType = this.platformType;
|
|
57
57
|
const env = this.env;
|
|
58
|
-
const { appPath = process.cwd(), chain, chunkDirectory = 'chunk', devServer = (_a = chain.devServer) === null || _a === void 0 ? void 0 : _a.entries(), enableSourceMap = false, entryFileName = 'app', entry = this.entry, isWatch = false, publicPath = chain.output.get('publicPath') || '/', runtimePath, sourceRoot = 'src', isBuildPlugin } = this.params;
|
|
58
|
+
const { appPath = process.cwd(), chain, chunkDirectory = 'chunk', devServer = (_a = chain.devServer) === null || _a === void 0 ? void 0 : _a.entries(), enableSourceMap = false, entryFileName = 'app', entry = this.entry, isWatch = false, publicPath = chain.output.get('publicPath') || '/', runtimePath, sourceRoot = 'src', isBuildPlugin, alias, defineConstants, modifyAppConfig, } = this.params;
|
|
59
59
|
let chunkFilename = (_b = chain.output.get('chunkFilename')) !== null && _b !== void 0 ? _b : `${chunkDirectory}/[name].js`;
|
|
60
60
|
chunkFilename = chunkFilename.replace(/\[([a-z]*hash)[^[\]\s]*\]/ig, '_$1_');
|
|
61
61
|
chain.output.set('chunkFilename', chunkFilename);
|
|
@@ -73,7 +73,10 @@ class TaroPrebundle {
|
|
|
73
73
|
publicPath,
|
|
74
74
|
runtimePath,
|
|
75
75
|
sourceRoot,
|
|
76
|
-
isBuildPlugin
|
|
76
|
+
isBuildPlugin,
|
|
77
|
+
alias,
|
|
78
|
+
defineConstants,
|
|
79
|
+
modifyAppConfig,
|
|
77
80
|
};
|
|
78
81
|
}
|
|
79
82
|
get entry() {
|
|
@@ -83,8 +86,8 @@ class TaroPrebundle {
|
|
|
83
86
|
return entry;
|
|
84
87
|
}, {});
|
|
85
88
|
}
|
|
86
|
-
run(
|
|
87
|
-
return __awaiter(this,
|
|
89
|
+
run() {
|
|
90
|
+
return __awaiter(this, arguments, void 0, function* (options = {}) {
|
|
88
91
|
this.options = options;
|
|
89
92
|
if (!options.enable)
|
|
90
93
|
return;
|
|
@@ -119,9 +122,9 @@ class TaroPrebundle {
|
|
|
119
122
|
else {
|
|
120
123
|
resource = item.import[0];
|
|
121
124
|
}
|
|
122
|
-
const { dir, name } =
|
|
123
|
-
const filePath =
|
|
124
|
-
const bootPath =
|
|
125
|
+
const { dir, name } = node_path_1.default.parse(resource);
|
|
126
|
+
const filePath = node_path_1.default.join(dir, name).replace(/\.config/, '');
|
|
127
|
+
const bootPath = node_path_1.default.relative(this.config.appPath, `${filePath}.boot.js`);
|
|
125
128
|
web_1.VirtualModule.writeModule(bootPath, '/** bootstrap application code */');
|
|
126
129
|
});
|
|
127
130
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA+D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4B;AAE5B,2CAA+D;AAG/D,+BAA+D;AAO/D,8CAA2B;AAwB3B,MAAqB,aAAa;IAQhC,YAAuB,MAAuB;QAAvB,WAAM,GAAN,MAAM,CAAiB;QAC5C,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,IAAI,EAAE,aAAa,GAAG,KAAK,EAAE,GAAG,MAAM,CAAA;QAE5E,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,sBAAa,CAAC,GAAG,CAAA;QACtF,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,YAAY,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QAClD,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,QAAQ,CAAA;IAC5B,CAAC;IAED,IAAI,MAAM;;QACR,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAA;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;QACpB,MAAM,EACJ,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,EACvB,KAAK,EACL,cAAc,GAAG,OAAO,EACxB,SAAS,GAAG,MAAA,KAAK,CAAC,SAAS,0CAAE,OAAO,EAAE,EACtC,eAAe,GAAG,KAAK,EACvB,aAAa,GAAG,KAAK,EACrB,KAAK,GAAG,IAAI,CAAC,KAAK,EAClB,OAAO,GAAG,KAAK,EACf,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,EAClD,WAAW,EACX,UAAU,GAAG,KAAK,EAClB,aAAa,EACb,KAAK,EACL,eAAe,EACf,eAAe,GAChB,GAAG,IAAI,CAAC,MAAM,CAAA;QACf,IAAI,aAAa,GAAG,MAAA,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,mCAAI,GAAG,cAAc,YAAY,CAAA;QACtF,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAA;QAC5E,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,aAAa,CAAC,CAAA;QAEhD,OAAO;YACL,OAAO;YACP,KAAK;YACL,aAAa;YACb,SAAS;YACT,eAAe;YACf,aAAa;YACb,KAAK;YACL,GAAG;YACH,OAAO;YACP,YAAY;YACZ,UAAU;YACV,WAAW;YACX,UAAU;YACV,aAAa;YACb,KAAK;YACL,eAAe;YACf,eAAe;SAChB,CAAA;IACH,CAAC;IAED,IAAI,KAAK;QACP,6DAA6D;QAC7D,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC5F,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAA;YAC3B,OAAO,KAAK,CAAA;QACd,CAAC,EAAE,EAAiB,CAAC,CAAA;IACvB,CAAC;IAEK,GAAG;6DAAE,UAAsB,EAAE;YACjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;YACtB,IAAI,CAAC,OAAO,CAAC,MAAM;gBAAE,OAAM;YAE3B,IAAI,eAA8B,CAAA;YAElC,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC1B,KAAK,KAAK;oBACR,eAAe,GAAG,IAAI,CAAC,wDAAa,OAAO,GAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;oBAChF,MAAK;gBACP;oBACE,eAAe,GAAG,IAAI,CAAC,wDAAa,QAAQ,GAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;YACtF,CAAC;YAED,OAAO,eAAe,CAAC,GAAG,EAAE,CAAA;QAC9B,CAAC;KAAA;IAEK,iBAAiB,CAAE,QAAkB;;YACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM;gBAAE,OAAM;YAEhC,IAAI,IAAI,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;gBAChC,mBAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;gBAE7B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBACzC,IAAI,QAAQ,GAAG,EAAE,CAAA;oBACjB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;wBACxB,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;oBACpB,CAAC;yBAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;wBACpC,QAAQ,GAAG,IAAI,CAAA;oBACjB,CAAC;yBAAM,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;wBAC3C,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAA;oBACxB,CAAC;yBAAM,CAAC;wBACN,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;oBAC3B,CAAC;oBACD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,mBAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;oBAC1C,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;oBAC7D,MAAM,QAAQ,GAAG,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,QAAQ,UAAU,CAAC,CAAA;oBAC1E,mBAAa,CAAC,WAAW,CAAC,QAAQ,EAAE,mCAAmC,CAAC,CAAA;gBAC1E,CAAC,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;KAAA;CACF;AA/GD,gCA+GC"}
|
package/dist/mini.js
CHANGED
|
@@ -37,9 +37,9 @@ exports.MiniPrebundle = void 0;
|
|
|
37
37
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
38
38
|
* SOFTWARE.
|
|
39
39
|
*/
|
|
40
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
41
|
+
const node_perf_hooks_1 = require("node:perf_hooks");
|
|
40
42
|
const helper_1 = require("@tarojs/helper");
|
|
41
|
-
const path_1 = __importDefault(require("path"));
|
|
42
|
-
const perf_hooks_1 = require("perf_hooks");
|
|
43
43
|
const webpack_1 = require("webpack");
|
|
44
44
|
const prebundle_1 = __importDefault(require("./prebundle"));
|
|
45
45
|
const bundle_1 = require("./prebundle/bundle");
|
|
@@ -52,7 +52,7 @@ class MiniPrebundle extends prebundle_1.default {
|
|
|
52
52
|
}
|
|
53
53
|
bundle() {
|
|
54
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
55
|
-
const PREBUNDLE_START =
|
|
55
|
+
const PREBUNDLE_START = node_perf_hooks_1.performance.now();
|
|
56
56
|
this.metadata.bundleHash = yield (0, utils_1.getBundleHash)(this.appPath, this.deps, this.chain, this.cacheDir);
|
|
57
57
|
if (this.preMetadata.bundleHash !== this.metadata.bundleHash) {
|
|
58
58
|
this.isUseCache = false;
|
|
@@ -79,7 +79,7 @@ class MiniPrebundle extends prebundle_1.default {
|
|
|
79
79
|
return depOutput.exports.includes('TaroRootElement');
|
|
80
80
|
});
|
|
81
81
|
if (dep) {
|
|
82
|
-
this.metadata.taroRuntimeBundlePath =
|
|
82
|
+
this.metadata.taroRuntimeBundlePath = node_path_1.default.join(this.appPath, dep.path);
|
|
83
83
|
}
|
|
84
84
|
return true;
|
|
85
85
|
}
|
|
@@ -90,15 +90,15 @@ class MiniPrebundle extends prebundle_1.default {
|
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
else {
|
|
93
|
-
this.metadata.taroRuntimeBundlePath =
|
|
93
|
+
this.metadata.taroRuntimeBundlePath = node_path_1.default.join(this.appPath, this.preMetadata.taroRuntimeBundlePath);
|
|
94
94
|
}
|
|
95
95
|
this.measure('Prebundle duration', PREBUNDLE_START);
|
|
96
96
|
});
|
|
97
97
|
}
|
|
98
98
|
buildLib() {
|
|
99
|
-
var _a;
|
|
100
99
|
return __awaiter(this, void 0, void 0, function* () {
|
|
101
|
-
|
|
100
|
+
var _a;
|
|
101
|
+
const BUILD_LIB_START = node_perf_hooks_1.performance.now();
|
|
102
102
|
const exposes = {};
|
|
103
103
|
const devtool = this.config.enableSourceMap && 'hidden-source-map';
|
|
104
104
|
const mainBuildOutput = this.chain.output.entries();
|
|
@@ -141,19 +141,19 @@ class MiniPrebundle extends prebundle_1.default {
|
|
|
141
141
|
helper_1.fs.existsSync(this.remoteCacheDir) && helper_1.fs.emptyDirSync(this.remoteCacheDir);
|
|
142
142
|
for (const id of this.deps.keys()) {
|
|
143
143
|
const flatId = (0, utils_1.flattenId)(id);
|
|
144
|
-
exposes[`./${id}`] =
|
|
144
|
+
exposes[`./${id}`] = node_path_1.default.join(this.prebundleCacheDir, `${flatId}.js`);
|
|
145
145
|
}
|
|
146
146
|
this.metadata.runtimeRequirements = new Set();
|
|
147
147
|
const compiler = this.getRemoteWebpackCompiler({
|
|
148
148
|
cache: {
|
|
149
149
|
type: 'filesystem',
|
|
150
|
-
cacheDirectory:
|
|
150
|
+
cacheDirectory: node_path_1.default.join(this.cacheDir, 'webpack-cache'),
|
|
151
151
|
buildDependencies: {
|
|
152
152
|
config: Object.values(exposes)
|
|
153
153
|
}
|
|
154
154
|
},
|
|
155
155
|
devtool,
|
|
156
|
-
entry:
|
|
156
|
+
entry: node_path_1.default.resolve(__dirname, './webpack/index.js'),
|
|
157
157
|
mode: this.mode,
|
|
158
158
|
output,
|
|
159
159
|
plugins: [
|
|
@@ -185,7 +185,7 @@ class MiniPrebundle extends prebundle_1.default {
|
|
|
185
185
|
const remoteAssets = ((_a = assets === null || assets === void 0 ? void 0 : assets.filter(item => this.config.isBuildPlugin
|
|
186
186
|
? item.name !== 'plugin/runtime.js'
|
|
187
187
|
: item.name !== 'runtime.js')) === null || _a === void 0 ? void 0 : _a.map(item => ({
|
|
188
|
-
name:
|
|
188
|
+
name: node_path_1.default.join('prebundle', item.name)
|
|
189
189
|
}))) || [];
|
|
190
190
|
resolve(remoteAssets);
|
|
191
191
|
});
|
|
@@ -196,7 +196,7 @@ class MiniPrebundle extends prebundle_1.default {
|
|
|
196
196
|
this.metadata.runtimeRequirements = new Set(this.preMetadata.runtimeRequirements);
|
|
197
197
|
this.metadata.remoteAssets = this.preMetadata.remoteAssets;
|
|
198
198
|
}
|
|
199
|
-
helper_1.fs.copy(this.remoteCacheDir,
|
|
199
|
+
helper_1.fs.copy(this.remoteCacheDir, node_path_1.default.join(this.getIsBuildPluginPath(mainBuildOutput.path, this.config.isBuildPlugin), 'prebundle'));
|
|
200
200
|
this.measure(`Build remote ${constant_1.MF_NAME} duration`, BUILD_LIB_START);
|
|
201
201
|
});
|
|
202
202
|
}
|
|
@@ -212,7 +212,7 @@ class MiniPrebundle extends prebundle_1.default {
|
|
|
212
212
|
* TODO:
|
|
213
213
|
* - 目前只处理了 Page entry，例如原生小程序组件 js entry 等并没有处理
|
|
214
214
|
*/
|
|
215
|
-
const entries = this.getEntries(this.entryPath);
|
|
215
|
+
const entries = yield this.getEntries(this.entryPath);
|
|
216
216
|
// plugin-platform 等插件的 runtime 文件入口
|
|
217
217
|
const runtimePath = typeof this.config.runtimePath === 'string' ? [this.config.runtimePath] : this.config.runtimePath || [];
|
|
218
218
|
const { include = [], exclude = [] } = this.option;
|
package/dist/mini.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mini.js","sourceRoot":"","sources":["../src/mini.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qDAAqD;AACrD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,
|
|
1
|
+
{"version":3,"file":"mini.js","sourceRoot":"","sources":["../src/mini.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,11 +13,24 @@ interface BundleConfig {
|
|
|
13
13
|
prebundleOutputDir: string;
|
|
14
14
|
customEsbuildConfig?: Record<string, any>;
|
|
15
15
|
customSwcConfig?: swc.Config;
|
|
16
|
+
mainFields?: string[];
|
|
16
17
|
}
|
|
17
|
-
export declare function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig, customSwcConfig }: BundleConfig): Promise<esbuild.BuildResult
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
export declare function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig, customSwcConfig, mainFields }: BundleConfig): Promise<esbuild.BuildResult<{
|
|
19
|
+
absWorkingDir: string;
|
|
20
|
+
bundle: true;
|
|
21
|
+
write: false;
|
|
22
|
+
entryPoints: string[];
|
|
23
|
+
mainFields: string[];
|
|
24
|
+
format: "esm";
|
|
25
|
+
loader: any;
|
|
26
|
+
define: any;
|
|
27
|
+
splitting: true;
|
|
28
|
+
metafile: true;
|
|
29
|
+
ignoreAnnotations: true;
|
|
30
|
+
outdir: string;
|
|
31
|
+
plugins: any[];
|
|
32
|
+
}>>;
|
|
33
|
+
export declare function getSwcPlugin({ appPath, flatIdExports, }: {
|
|
21
34
|
appPath: string;
|
|
22
35
|
flatIdExports: Map<string, ExportsData>;
|
|
23
36
|
}, config?: swc.Config): esbuild.Plugin;
|
package/dist/prebundle/bundle.js
CHANGED
|
@@ -13,10 +13,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.getSwcPlugin = exports.bundle = void 0;
|
|
16
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
16
17
|
const helper_1 = require("@tarojs/helper");
|
|
17
18
|
const es_module_lexer_1 = require("es-module-lexer");
|
|
18
19
|
const lodash_1 = require("lodash");
|
|
19
|
-
const path_1 = __importDefault(require("path"));
|
|
20
20
|
const utils_1 = require("../utils");
|
|
21
21
|
const constant_1 = require("../utils/constant");
|
|
22
22
|
// esbuild generates nested directory output with lowest common ancestor base
|
|
@@ -25,8 +25,8 @@ const constant_1 = require("../utils/constant");
|
|
|
25
25
|
// 1. flatten all ids to eliminate slash
|
|
26
26
|
// 2. in the plugin, read the entry ourselves as virtual files to retain the
|
|
27
27
|
// path.
|
|
28
|
-
function bundle(
|
|
29
|
-
return __awaiter(this,
|
|
28
|
+
function bundle(_a) {
|
|
29
|
+
return __awaiter(this, arguments, void 0, function* ({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig = {}, customSwcConfig = {}, mainFields = [...helper_1.defaultMainFields] }) {
|
|
30
30
|
yield es_module_lexer_1.init;
|
|
31
31
|
const flattenDeps = new Map();
|
|
32
32
|
const flatIdExports = new Map();
|
|
@@ -46,10 +46,8 @@ function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig
|
|
|
46
46
|
}
|
|
47
47
|
flatIdExports.set(flatId, exportsData);
|
|
48
48
|
}
|
|
49
|
-
helper_1.fs.existsSync(prebundleOutputDir)
|
|
50
|
-
|
|
51
|
-
: helper_1.fs.ensureDirSync(prebundleOutputDir);
|
|
52
|
-
return helper_1.esbuild.build(Object.assign(Object.assign({}, customEsbuildConfig), { absWorkingDir: appPath, bundle: true, write: false, entryPoints: Array.from(flattenDeps.keys()), mainFields: ['main:h5', 'browser', 'module', 'jsnext:main', 'main'], format: 'esm', loader: (0, lodash_1.defaults)(customEsbuildConfig.loader, helper_1.defaultEsbuildLoader), define: Object.assign(Object.assign({}, (0, utils_1.getDefines)(chain)), {
|
|
49
|
+
helper_1.fs.existsSync(prebundleOutputDir) ? helper_1.fs.emptyDirSync(prebundleOutputDir) : helper_1.fs.ensureDirSync(prebundleOutputDir);
|
|
50
|
+
return helper_1.esbuild.build(Object.assign(Object.assign({}, customEsbuildConfig), { absWorkingDir: appPath, bundle: true, write: false, entryPoints: Array.from(flattenDeps.keys()), mainFields, format: 'esm', loader: (0, lodash_1.defaults)(customEsbuildConfig.loader, helper_1.defaultEsbuildLoader), define: Object.assign(Object.assign({}, (0, utils_1.getDefines)(chain)), {
|
|
53
51
|
// AMD 被 esbuild 转 ESM 后，是套着 ESM 外皮的 AMD 语法模块。
|
|
54
52
|
// Webpack HarmonyDetectionParserPlugin 会阻止 AMDDefineDependencyParserPlugin 对这些模块的处理。
|
|
55
53
|
// 导致这些模块报错（如 lodash）。目前的办法是把 define 置为 false，不支持 AMD 导出。
|
|
@@ -57,39 +55,39 @@ function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig
|
|
|
57
55
|
getEntryPlugin({
|
|
58
56
|
flattenDeps,
|
|
59
57
|
flatIdExports,
|
|
60
|
-
prebundleOutputDir
|
|
58
|
+
prebundleOutputDir,
|
|
61
59
|
}),
|
|
62
|
-
...customEsbuildConfig.plugins || [],
|
|
63
|
-
getSwcPlugin({ appPath, flatIdExports }, customSwcConfig)
|
|
60
|
+
...(customEsbuildConfig.plugins || []),
|
|
61
|
+
getSwcPlugin({ appPath, flatIdExports }, customSwcConfig),
|
|
64
62
|
] }));
|
|
65
63
|
});
|
|
66
64
|
}
|
|
67
65
|
exports.bundle = bundle;
|
|
68
|
-
function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
66
|
+
function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir, }) {
|
|
69
67
|
const resolve = (0, utils_1.getResolve)();
|
|
70
68
|
return {
|
|
71
69
|
name: 'entry',
|
|
72
70
|
setup(build) {
|
|
73
71
|
// assets
|
|
74
|
-
build.onResolve({ filter: constant_1.assetsRE }, (
|
|
75
|
-
const filePath = yield resolve(
|
|
76
|
-
const fileExt =
|
|
77
|
-
const fileBasename =
|
|
72
|
+
build.onResolve({ filter: constant_1.assetsRE }, (_a) => __awaiter(this, [_a], void 0, function* ({ path: id, importer }) {
|
|
73
|
+
const filePath = yield resolve(node_path_1.default.dirname(importer), id);
|
|
74
|
+
const fileExt = node_path_1.default.extname(filePath);
|
|
75
|
+
const fileBasename = node_path_1.default.basename(filePath, fileExt);
|
|
78
76
|
const fileContent = yield helper_1.fs.readFile(filePath);
|
|
79
|
-
const outputFile =
|
|
77
|
+
const outputFile = node_path_1.default.join(prebundleOutputDir, `${fileBasename}-${(0, helper_1.getHash)(filePath)}${fileExt}`);
|
|
80
78
|
yield helper_1.fs.writeFile(outputFile, fileContent);
|
|
81
|
-
return (0, helper_1.externalEsbuildModule)({ path: `./${
|
|
79
|
+
return (0, helper_1.externalEsbuildModule)({ path: `./${node_path_1.default.relative(prebundleOutputDir, outputFile)}` });
|
|
82
80
|
}));
|
|
83
|
-
build.onResolve({ filter: constant_1.moduleRE }, (
|
|
81
|
+
build.onResolve({ filter: constant_1.moduleRE }, (_b) => __awaiter(this, [_b], void 0, function* ({ path: id, importer }) {
|
|
84
82
|
// entry
|
|
85
83
|
if (!importer && flattenDeps.has(id)) {
|
|
86
84
|
return {
|
|
87
85
|
path: id,
|
|
88
|
-
namespace: 'entry'
|
|
86
|
+
namespace: 'entry',
|
|
89
87
|
};
|
|
90
88
|
}
|
|
91
89
|
try {
|
|
92
|
-
const resolvedPath = yield resolve(
|
|
90
|
+
const resolvedPath = yield resolve(node_path_1.default.dirname(importer), id);
|
|
93
91
|
if (typeof resolvedPath === 'string' && !constant_1.assetsRE.test(resolvedPath)) {
|
|
94
92
|
return { path: resolvedPath };
|
|
95
93
|
}
|
|
@@ -101,10 +99,10 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
101
99
|
return (0, helper_1.externalEsbuildModule)({ path: id });
|
|
102
100
|
}
|
|
103
101
|
}));
|
|
104
|
-
build.onLoad({ filter: constant_1.moduleRE, namespace: 'entry' }, (
|
|
105
|
-
var
|
|
102
|
+
build.onLoad({ filter: constant_1.moduleRE, namespace: 'entry' }, (_c) => __awaiter(this, [_c], void 0, function* ({ path: id }) {
|
|
103
|
+
var _d;
|
|
106
104
|
let js = '';
|
|
107
|
-
const filePath = (
|
|
105
|
+
const filePath = (_d = flattenDeps.get(id)) === null || _d === void 0 ? void 0 : _d.replace(/\\/g, '\\\\');
|
|
108
106
|
const exportsData = flatIdExports.get(id);
|
|
109
107
|
const [importsList, exportsList] = exportsData;
|
|
110
108
|
const hasReExports = exportsData.hasReExports;
|
|
@@ -119,9 +117,7 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
119
117
|
// export default
|
|
120
118
|
js += `import d from "${filePath}";export default d;`;
|
|
121
119
|
}
|
|
122
|
-
if (hasReExports ||
|
|
123
|
-
exportsList.length > 1 ||
|
|
124
|
-
exportsList[0] !== 'default') {
|
|
120
|
+
if (hasReExports || exportsList.length > 1 || exportsList[0] !== 'default') {
|
|
125
121
|
// export * from 'xx'
|
|
126
122
|
// export const xx
|
|
127
123
|
js += `export * from "${filePath}";`;
|
|
@@ -134,19 +130,19 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
134
130
|
return {
|
|
135
131
|
loader: 'js',
|
|
136
132
|
resolveDir: process.cwd(),
|
|
137
|
-
contents: js
|
|
133
|
+
contents: js,
|
|
138
134
|
};
|
|
139
135
|
}));
|
|
140
|
-
}
|
|
136
|
+
},
|
|
141
137
|
};
|
|
142
138
|
}
|
|
143
|
-
function getSwcPlugin({ appPath, flatIdExports }, config) {
|
|
139
|
+
function getSwcPlugin({ appPath, flatIdExports, }, config) {
|
|
144
140
|
return {
|
|
145
141
|
name: 'swc-plugin',
|
|
146
142
|
setup(build) {
|
|
147
|
-
build.onEnd((
|
|
148
|
-
var
|
|
149
|
-
yield Promise.all(outputFiles.map((
|
|
143
|
+
build.onEnd((_a) => __awaiter(this, [_a], void 0, function* ({ outputFiles = [], metafile = {} }) {
|
|
144
|
+
var _b, _c;
|
|
145
|
+
yield Promise.all(outputFiles.map((_d) => __awaiter(this, [_d], void 0, function* ({ path, text }) {
|
|
150
146
|
if (!helper_1.REG_SCRIPTS.test(path))
|
|
151
147
|
return;
|
|
152
148
|
const { code } = helper_1.swc.transformSync(text, (0, lodash_1.defaults)(config, { jsc: { target: 'es2015' } }));
|
|
@@ -159,18 +155,15 @@ function getSwcPlugin({ appPath, flatIdExports }, config) {
|
|
|
159
155
|
const metaOutput = metafile.outputs;
|
|
160
156
|
for (const outputName in metaOutput) {
|
|
161
157
|
const output = metaOutput[outputName];
|
|
162
|
-
if (!((
|
|
158
|
+
if (!((_b = output.entryPoint) === null || _b === void 0 ? void 0 : _b.startsWith('entry:')))
|
|
163
159
|
continue;
|
|
164
160
|
const entry = output.entryPoint.replace(/^entry:/, '');
|
|
165
161
|
if (!flatIdExports.has(entry))
|
|
166
162
|
continue;
|
|
167
|
-
if (((
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
const destPath = path_1.default.join(appPath, outputName.replace(/(\.js)$/, '.core$1'));
|
|
172
|
-
processAll.push(helper_1.fs.move(srcPath, destPath)
|
|
173
|
-
.then(() => helper_1.fs.writeFile(srcPath, `var m = require('./${path_1.default.basename(destPath)}');
|
|
163
|
+
if (((_c = flatIdExports.get(entry)) === null || _c === void 0 ? void 0 : _c.needInterop) && output.exports.length === 1 && output.exports[0] === 'default') {
|
|
164
|
+
const srcPath = node_path_1.default.join(appPath, outputName);
|
|
165
|
+
const destPath = node_path_1.default.join(appPath, outputName.replace(/(\.js)$/, '.core$1'));
|
|
166
|
+
processAll.push(helper_1.fs.move(srcPath, destPath).then(() => helper_1.fs.writeFile(srcPath, `var m = require('./${node_path_1.default.basename(destPath)}');
|
|
174
167
|
module.exports = m.default;
|
|
175
168
|
exports.default = module.exports;
|
|
176
169
|
`)));
|
|
@@ -178,7 +171,7 @@ function getSwcPlugin({ appPath, flatIdExports }, config) {
|
|
|
178
171
|
}
|
|
179
172
|
yield Promise.all(processAll);
|
|
180
173
|
}));
|
|
181
|
-
}
|
|
174
|
+
},
|
|
182
175
|
};
|
|
183
176
|
}
|
|
184
177
|
exports.getSwcPlugin = getSwcPlugin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/prebundle/bundle.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/prebundle/bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,9 @@ export interface IPrebundleConfig {
|
|
|
19
19
|
platformType: PLATFORM_TYPE;
|
|
20
20
|
sourceRoot: string;
|
|
21
21
|
isBuildPlugin?: boolean;
|
|
22
|
+
alias?: Record<string, any>;
|
|
23
|
+
defineConstants?: Record<string, any>;
|
|
24
|
+
modifyAppConfig?: (appConfig: any) => Promise<any>;
|
|
22
25
|
}
|
|
23
26
|
type TMode = 'production' | 'development' | 'none';
|
|
24
27
|
export default class BasePrebundle<T extends IPrebundleConfig = IPrebundleConfig> {
|
|
@@ -33,6 +36,7 @@ export default class BasePrebundle<T extends IPrebundleConfig = IPrebundleConfig
|
|
|
33
36
|
env: string;
|
|
34
37
|
mode: TMode;
|
|
35
38
|
platformType: PLATFORM_TYPE;
|
|
39
|
+
mainFields: string[];
|
|
36
40
|
prebundleCacheDir: string;
|
|
37
41
|
remoteCacheDir: string;
|
|
38
42
|
metadataPath: string;
|
|
@@ -48,7 +52,7 @@ export default class BasePrebundle<T extends IPrebundleConfig = IPrebundleConfig
|
|
|
48
52
|
get entryPath(): string;
|
|
49
53
|
parseEntries(entry?: EntryObject): string[];
|
|
50
54
|
/** 找出所有 webpack entry */
|
|
51
|
-
getEntries(appJsPath: string): string[]
|
|
55
|
+
getEntries(appJsPath: string): Promise<string[]>;
|
|
52
56
|
setDeps(entries: string[], include?: string[], exclude?: string[]): Promise<void>;
|
|
53
57
|
bundle(): any;
|
|
54
58
|
handleBundleError(errors?: esbuild.Message[]): any;
|
package/dist/prebundle/index.js
CHANGED
|
@@ -12,9 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
16
|
+
const node_perf_hooks_1 = require("node:perf_hooks");
|
|
15
17
|
const helper_1 = require("@tarojs/helper");
|
|
16
|
-
const path_1 = __importDefault(require("path"));
|
|
17
|
-
const perf_hooks_1 = require("perf_hooks");
|
|
18
18
|
const webpack_1 = __importDefault(require("webpack"));
|
|
19
19
|
const utils_1 = require("../utils");
|
|
20
20
|
const constant_1 = require("../utils/constant");
|
|
@@ -39,13 +39,14 @@ class BasePrebundle {
|
|
|
39
39
|
this.customSwcConfig = swc;
|
|
40
40
|
this.env = env;
|
|
41
41
|
this.platformType = platformType;
|
|
42
|
-
this.mode = ['production', 'development', 'none'].find(e => e === env)
|
|
43
|
-
|
|
44
|
-
this.prebundleCacheDir =
|
|
45
|
-
this.remoteCacheDir =
|
|
46
|
-
this.metadataPath =
|
|
42
|
+
this.mode = ['production', 'development', 'none'].find(e => e === env) ||
|
|
43
|
+
(!isWatch || process.env.NODE_ENV === 'production' ? 'production' : 'development');
|
|
44
|
+
this.prebundleCacheDir = node_path_1.default.resolve(cacheDir, './prebundle');
|
|
45
|
+
this.remoteCacheDir = node_path_1.default.resolve(cacheDir, './remote');
|
|
46
|
+
this.metadataPath = node_path_1.default.join(cacheDir, 'metadata.json');
|
|
47
47
|
this.metadata = {};
|
|
48
48
|
this.preMetadata = {};
|
|
49
|
+
this.mainFields = [...helper_1.defaultMainFields];
|
|
49
50
|
this.measure = (0, utils_1.getMeasure)(this.option.timings);
|
|
50
51
|
try {
|
|
51
52
|
if (force !== true) {
|
|
@@ -100,21 +101,26 @@ class BasePrebundle {
|
|
|
100
101
|
}
|
|
101
102
|
/** 找出所有 webpack entry */
|
|
102
103
|
getEntries(appJsPath) {
|
|
103
|
-
const { appPath, sourceRoot } = this.config;
|
|
104
|
-
const entries = this.parseEntries(this.config.entry);
|
|
105
|
-
const appConfigPath = (0, helper_1.resolveMainFilePath)(`${appJsPath.replace(path_1.default.extname(appJsPath), '')}.config`);
|
|
106
|
-
if (helper_1.fs.existsSync(appConfigPath)) {
|
|
107
|
-
const appConfig = (0, helper_1.readConfig)(appConfigPath);
|
|
108
|
-
appConfig.pages.forEach((page) => {
|
|
109
|
-
const pageJsPath = (0, helper_1.resolveMainFilePath)(path_1.default.join(appPath, sourceRoot, page));
|
|
110
|
-
entries.push(pageJsPath);
|
|
111
|
-
});
|
|
112
|
-
}
|
|
113
|
-
return entries;
|
|
114
|
-
}
|
|
115
|
-
setDeps(entries, include = [], exclude = []) {
|
|
116
104
|
return __awaiter(this, void 0, void 0, function* () {
|
|
117
|
-
const
|
|
105
|
+
const { appPath, sourceRoot } = this.config;
|
|
106
|
+
const entries = this.parseEntries(this.config.entry);
|
|
107
|
+
const appConfigPath = (0, helper_1.resolveMainFilePath)(`${appJsPath.replace(node_path_1.default.extname(appJsPath), '')}.config`);
|
|
108
|
+
if (helper_1.fs.existsSync(appConfigPath)) {
|
|
109
|
+
const appConfig = (0, helper_1.readConfig)(appConfigPath, this.config);
|
|
110
|
+
if (typeof this.config.modifyAppConfig === 'function') {
|
|
111
|
+
yield this.config.modifyAppConfig(appConfig);
|
|
112
|
+
}
|
|
113
|
+
appConfig.pages.forEach((page) => {
|
|
114
|
+
const pageJsPath = (0, helper_1.resolveMainFilePath)(node_path_1.default.join(appPath, sourceRoot, page));
|
|
115
|
+
entries.push(pageJsPath);
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
return entries;
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
setDeps(entries_1) {
|
|
122
|
+
return __awaiter(this, arguments, void 0, function* (entries, include = [], exclude = []) {
|
|
123
|
+
const SCAN_START = node_perf_hooks_1.performance.now();
|
|
118
124
|
yield (0, scanImports_1.scanImports)({
|
|
119
125
|
appPath: this.appPath,
|
|
120
126
|
chain: this.chain,
|
|
@@ -122,6 +128,7 @@ class BasePrebundle {
|
|
|
122
128
|
entries,
|
|
123
129
|
include,
|
|
124
130
|
exclude,
|
|
131
|
+
mainFields: this.mainFields,
|
|
125
132
|
}, this.deps);
|
|
126
133
|
this.deps.size &&
|
|
127
134
|
console.log(helper_1.chalk.cyan('Prebundle dependencies: \n', ...Array.from(this.deps.keys()).sort(utils_1.sortDeps).map(dep => ` ${dep}\n`)));
|
|
@@ -130,7 +137,7 @@ class BasePrebundle {
|
|
|
130
137
|
}
|
|
131
138
|
bundle() {
|
|
132
139
|
return __awaiter(this, void 0, void 0, function* () {
|
|
133
|
-
const PREBUNDLE_START =
|
|
140
|
+
const PREBUNDLE_START = node_perf_hooks_1.performance.now();
|
|
134
141
|
this.metadata.bundleHash = yield (0, utils_1.getBundleHash)(this.appPath, this.deps, this.chain, this.cacheDir);
|
|
135
142
|
if (this.preMetadata.bundleHash !== this.metadata.bundleHash) {
|
|
136
143
|
this.isUseCache = false;
|
|
@@ -142,6 +149,7 @@ class BasePrebundle {
|
|
|
142
149
|
prebundleOutputDir: this.prebundleCacheDir,
|
|
143
150
|
customEsbuildConfig: this.customEsbuildConfig,
|
|
144
151
|
customSwcConfig: this.customSwcConfig,
|
|
152
|
+
mainFields: this.mainFields,
|
|
145
153
|
});
|
|
146
154
|
}
|
|
147
155
|
catch (result) {
|
|
@@ -197,7 +205,7 @@ class BasePrebundle {
|
|
|
197
205
|
const skipPlugins = ['MiniSplitChunksPlugin', 'TaroMiniPlugin', 'TaroH5Plugin', 'ProvidePlugin', 'CopyPlugin', 'HtmlWebpackPlugin'];
|
|
198
206
|
delete inherit.devServer;
|
|
199
207
|
(_a = inherit.optimization) === null || _a === void 0 ? true : delete _a.splitChunks;
|
|
200
|
-
inherit.plugins = (_b = inherit.plugins) === null || _b === void 0 ? void 0 : _b.filter(p => { var _a; return !skipPlugins.includes((_a = p === null || p === void 0 ? void 0 : p.constructor) === null || _a === void 0 ? void 0 : _a.name); });
|
|
208
|
+
inherit.plugins = (_b = inherit.plugins) === null || _b === void 0 ? void 0 : _b.filter(p => { var _a; return !skipPlugins.includes(((_a = p === null || p === void 0 ? void 0 : p.constructor) === null || _a === void 0 ? void 0 : _a.name) || ''); });
|
|
201
209
|
if ((_c = inherit.module) === null || _c === void 0 ? void 0 : _c.rules) {
|
|
202
210
|
inherit.module.rules = inherit.module.rules.filter((rule) => { var _a; return ((_a = rule.test) === null || _a === void 0 ? void 0 : _a.toString()) !== helper_1.REG_SCRIPTS.toString(); });
|
|
203
211
|
}
|