@tarojs/webpack5-runner 3.7.0-alpha.2 → 3.7.0-alpha.22
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/dist/index.h5.js +5 -2
- package/dist/index.h5.js.map +1 -1
- package/dist/index.mini.js.map +1 -1
- package/dist/loaders/miniTemplateLoader.js +1 -1
- package/dist/loaders/miniTemplateLoader.js.map +1 -1
- package/dist/loaders/miniXScriptLoader.js.map +1 -1
- package/dist/plugins/BuildNativePlugin.js +32 -0
- package/dist/plugins/BuildNativePlugin.js.map +1 -1
- package/dist/plugins/H5Plugin.js +2 -7
- package/dist/plugins/H5Plugin.js.map +1 -1
- package/dist/plugins/MiniPlugin.js +348 -92
- package/dist/plugins/MiniPlugin.js.map +1 -1
- package/dist/plugins/MiniSplitChunksPlugin.js +96 -76
- package/dist/plugins/MiniSplitChunksPlugin.js.map +1 -1
- package/dist/plugins/TaroComponentsExportsPlugin.js +30 -11
- package/dist/plugins/TaroComponentsExportsPlugin.js.map +1 -1
- package/dist/plugins/TaroLoadChunksPlugin.js +2 -2
- package/dist/plugins/TaroLoadChunksPlugin.js.map +1 -1
- package/dist/plugins/TaroNormalModule.js +79 -1
- package/dist/plugins/TaroNormalModule.js.map +1 -1
- package/dist/plugins/TaroNormalModulesPlugin.js +73 -18
- package/dist/plugins/TaroNormalModulesPlugin.js.map +1 -1
- package/dist/plugins/TaroSingleEntryPlugin.js +6 -5
- package/dist/plugins/TaroSingleEntryPlugin.js.map +1 -1
- package/dist/postcss/postcss-alias.js +32 -0
- package/dist/postcss/postcss-alias.js.map +1 -0
- package/dist/postcss/postcss.h5.js +2 -1
- package/dist/postcss/postcss.h5.js.map +1 -1
- package/dist/postcss/postcss.mini.js +4 -4
- package/dist/postcss/postcss.mini.js.map +1 -1
- package/dist/prerender/prerender.js +4 -7
- package/dist/prerender/prerender.js.map +1 -1
- package/dist/utils/component.js +4 -1
- package/dist/utils/component.js.map +1 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/webpack/BuildNativePlugin.js +3 -4
- package/dist/webpack/BuildNativePlugin.js.map +1 -1
- package/dist/webpack/Combination.js +10 -7
- package/dist/webpack/Combination.js.map +1 -1
- package/dist/webpack/H5BaseConfig.js +16 -7
- package/dist/webpack/H5BaseConfig.js.map +1 -1
- package/dist/webpack/H5Combination.js +13 -3
- package/dist/webpack/H5Combination.js.map +1 -1
- package/dist/webpack/H5WebpackModule.js +2 -1
- package/dist/webpack/H5WebpackModule.js.map +1 -1
- package/dist/webpack/H5WebpackPlugin.js.map +1 -1
- package/dist/webpack/MiniBaseConfig.js +18 -12
- package/dist/webpack/MiniBaseConfig.js.map +1 -1
- package/dist/webpack/MiniCombination.js +0 -1
- package/dist/webpack/MiniCombination.js.map +1 -1
- package/dist/webpack/MiniWebpackModule.js +17 -31
- package/dist/webpack/MiniWebpackModule.js.map +1 -1
- package/dist/webpack/MiniWebpackPlugin.js +3 -1
- package/dist/webpack/MiniWebpackPlugin.js.map +1 -1
- package/dist/webpack/WebpackModule.js +19 -9
- package/dist/webpack/WebpackModule.js.map +1 -1
- package/package.json +22 -22
package/dist/index.h5.js
CHANGED
|
@@ -41,8 +41,9 @@ function build(appPath, rawConfig) {
|
|
|
41
41
|
const combination = new H5Combination_1.H5Combination(appPath, rawConfig);
|
|
42
42
|
yield combination.make();
|
|
43
43
|
const { chunkDirectory = 'chunk', devServer, enableSourceMap, entryFileName = 'app', entry = {}, publicPath } = combination.config;
|
|
44
|
+
let prebundle = null;
|
|
44
45
|
if (!combination.isBuildNativeComp) {
|
|
45
|
-
|
|
46
|
+
prebundle = new webpack5_prebundle_1.default({
|
|
46
47
|
appPath,
|
|
47
48
|
sourceRoot: combination.sourceRoot,
|
|
48
49
|
chain: combination.chain,
|
|
@@ -68,6 +69,7 @@ function build(appPath, rawConfig) {
|
|
|
68
69
|
try {
|
|
69
70
|
if (!isWatch) {
|
|
70
71
|
const compiler = (0, webpack_1.default)(webpackConfig);
|
|
72
|
+
prebundle === null || prebundle === void 0 ? void 0 : prebundle.postCompilerStart(compiler);
|
|
71
73
|
compiler.hooks.emit.tapAsync('taroBuildDone', (compilation, callback) => __awaiter(this, void 0, void 0, function* () {
|
|
72
74
|
if ((0, shared_1.isFunction)(config.modifyBuildAssets)) {
|
|
73
75
|
yield config.modifyBuildAssets(compilation.assets);
|
|
@@ -86,7 +88,7 @@ function build(appPath, rawConfig) {
|
|
|
86
88
|
isWatch: false
|
|
87
89
|
});
|
|
88
90
|
}
|
|
89
|
-
err ? reject(err) : resolve();
|
|
91
|
+
err ? reject(err) : resolve(stats);
|
|
90
92
|
});
|
|
91
93
|
});
|
|
92
94
|
});
|
|
@@ -109,6 +111,7 @@ function build(appPath, rawConfig) {
|
|
|
109
111
|
}
|
|
110
112
|
const compiler = (0, webpack_1.default)(webpackConfig);
|
|
111
113
|
const server = new webpack_dev_server_1.default(webpackConfig.devServer, compiler);
|
|
114
|
+
prebundle === null || prebundle === void 0 ? void 0 : prebundle.postCompilerStart(compiler);
|
|
112
115
|
(0, logHelper_1.bindDevLogger)(compiler, devUrl);
|
|
113
116
|
compiler.hooks.emit.tapAsync('taroBuildDone', (compilation, callback) => __awaiter(this, void 0, void 0, function* () {
|
|
114
117
|
if ((0, shared_1.isFunction)(config.modifyBuildAssets)) {
|
package/dist/index.h5.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.h5.js","sourceRoot":"","sources":["../src/index.h5.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAkE;AAClE,2CAA2C;AAC3C,oFAAkD;AAClD,8DAAoC;AACpC,gDAAuB;AACvB,6BAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"index.h5.js","sourceRoot":"","sources":["../src/index.h5.ts"],"names":[],"mappings":"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"}
|
package/dist/index.mini.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mini.js","sourceRoot":"","sources":["../src/index.mini.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAAsC;AACtC,oFAAkD;AAClD,mCAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"index.mini.js","sourceRoot":"","sources":["../src/index.mini.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAAsC;AACtC,oFAAkD;AAClD,mCAAgC;AAChC,sDAA6B;AAE7B,qDAAiD;AACjD,+DAA2D;AAK3D,SAA8B,KAAK,CAAE,OAAe,EAAE,SAA0B;;QAC9E,MAAM,WAAW,GAAG,IAAI,iCAAe,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QAC3D,MAAM,WAAW,CAAC,IAAI,EAAE,CAAA;QAExB,MAAM,EAAE,eAAe,EAAE,KAAK,GAAG,EAAE,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC,MAAM,CAAA;QACvE,MAAM,SAAS,GAAG,IAAI,4BAAS,CAAC;YAC9B,OAAO;YACP,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,eAAe;YACf,KAAK;YACL,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,OAAO;YACnC,WAAW;YACX,aAAa,EAAE,WAAW,CAAC,aAAa;SACzC,CAAC,CAAA;QACF,IAAI;YACF,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC,CAAA;SACvD;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACpB,OAAO,CAAC,IAAI,CAAC,cAAK,CAAC,MAAM,CAAC,oCAAoC,CAAC,CAAC,CAAA;SACjE;QAED,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA;QAClD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAA;QAEjC,OAAO,IAAI,OAAO,CAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAA,iBAAO,EAAC,aAAa,CAAC,CAAA;YACvC,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAA;YAC1C,IAAI,SAAoB,CAAA;YAExB,MAAM,QAAQ,GAAG,UAAU,KAAmB,EAAE,KAAmB;gBACjE,IAAI,OAAO,aAAa,KAAK,UAAU;oBAAE,OAAM;gBAE/C,aAAa,CAAC;oBACZ,KAAK;oBACL,KAAK;oBACL,OAAO,EAAE,MAAM,CAAC,OAAO;iBACxB,CAAC,CAAA;YACJ,CAAC,CAAA;YAED,MAAM,QAAQ,GAAG,CAAO,GAAU,EAAE,KAAY,EAAE,EAAE;gBAClD,IAAI,GAAG,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE;oBAC5B,MAAM,KAAK,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,CAAA;oBAC1C,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;oBACrB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;iBACrB;gBAED,IAAI,CAAC,IAAA,gBAAO,EAAC,MAAM,CAAC,SAAS,CAAC,EAAE;oBAC9B,SAAS,GAAG,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,IAAI,qBAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA;oBACrF,MAAM,SAAS,CAAC,MAAM,EAAE,CAAA;iBACzB;gBAED,+BAA+B;gBAC/B,uBAAuB;gBACvB,KAAK;gBACL,4BAA4B;gBAE5B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;gBACrB,OAAO,CAAC,KAAK,CAAC,CAAA;YAChB,CAAC,CAAA,CAAA;YAED,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,QAAQ,CAAC,KAAK,CAAC;oBACb,gBAAgB,EAAE,GAAG;oBACrB,IAAI,EAAE,SAAS;iBAChB,EAAE,QAAQ,CAAC,CAAA;aACb;iBAAM;gBACL,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAU,EAAE,KAAY,EAAE,EAAE;oBACxC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,IAAI,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;gBACtD,CAAC,CAAC,CAAA;aACH;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA;AAxED,wBAwEC"}
|
|
@@ -31,7 +31,7 @@ function miniTemplateLoader(source) {
|
|
|
31
31
|
const callback = this.async();
|
|
32
32
|
const loadModule = request => this.importModule(request);
|
|
33
33
|
parser.onattribute = ({ name, value }) => {
|
|
34
|
-
if (value && name === 'src' && (0, loader_utils_1.isUrlRequest)(value)) {
|
|
34
|
+
if (value && (name === 'src' || name === 'from') && (0, loader_utils_1.isUrlRequest)(value)) {
|
|
35
35
|
const request = (0, loader_utils_1.urlToRequest)(value);
|
|
36
36
|
requests.add(request);
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniTemplateLoader.js","sourceRoot":"","sources":["../../src/loaders/miniTemplateLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+CAAyD;AACzD,8CAAqB;AAErB,SAAwB,kBAAkB,CAAE,MAAM;IAChD,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE,CAAA;IAClC;;;;;;;;QAQI;IACJ,MAAM,cAAc,GAAG,SAAS,MAAM,SAAS,CAAA;IAC/C,MAAM,MAAM,GAAG,aAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACrD,MAAM,QAAQ,GAAgB,IAAI,GAAG,EAAE,CAAA;IACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAA;IAC7B,MAAM,UAAU,GAAG,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;IAExD,MAAM,CAAC,WAAW,GAAG,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QACvC,IAAI,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,IAAA,2BAAY,EAAC,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"miniTemplateLoader.js","sourceRoot":"","sources":["../../src/loaders/miniTemplateLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+CAAyD;AACzD,8CAAqB;AAErB,SAAwB,kBAAkB,CAAE,MAAM;IAChD,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE,CAAA;IAClC;;;;;;;;QAQI;IACJ,MAAM,cAAc,GAAG,SAAS,MAAM,SAAS,CAAA;IAC/C,MAAM,MAAM,GAAG,aAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACrD,MAAM,QAAQ,GAAgB,IAAI,GAAG,EAAE,CAAA;IACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAA;IAC7B,MAAM,UAAU,GAAG,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;IAExD,MAAM,CAAC,WAAW,GAAG,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QACvC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,MAAM,CAAC,IAAI,IAAA,2BAAY,EAAC,KAAK,CAAC,EAAE;YACvE,MAAM,OAAO,GAAG,IAAA,2BAAY,EAAC,KAAK,CAAC,CAAA;YACnC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;SACtB;IACH,CAAC,CAAA;IACD,MAAM,CAAC,KAAK,GAAG,GAAS,EAAE;QACxB,IAAI;YACF,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAC1C,IAAI,aAAa,CAAC,MAAM,EAAE;gBACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC7C,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;iBACnC;aACF;YACD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;SACvB;QAAC,OAAO,KAAK,EAAE;YACd,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;SACxB;IACH,CAAC,CAAA,CAAA;IACD,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,KAAK,EAAE,CAAA;AACtC,CAAC;AArCD,qCAqCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniXScriptLoader.js","sourceRoot":"","sources":["../../src/loaders/miniXScriptLoader.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+CAAyD;AAEzD,
|
|
1
|
+
{"version":3,"file":"miniXScriptLoader.js","sourceRoot":"","sources":["../../src/loaders/miniXScriptLoader.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+CAAyD;AAEzD,mBAA+B,MAAM;;QACnC,MAAM,WAAW,GAAG,+BAA+B,CAAA;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAA;QAC7B,MAAM,UAAU,GAAU,EAAE,CAAA;QAC5B,IAAI,GAAG,CAAA;QAEP,IAAI;YACF,OAAO,CAAC,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,EAAE;gBAChD,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;gBAClB,IAAI,IAAA,2BAAY,EAAC,GAAG,CAAC,EAAE;oBACrB,MAAM,OAAO,GAAG,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAA;oBACjC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAA;iBAC5C;aACF;YACD,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;SACvB;QAAC,OAAO,KAAK,EAAE;YACd,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;SACxB;IACH,CAAC;CAAA;AAnBD,4BAmBC"}
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const helper_1 = require("@tarojs/helper");
|
|
7
|
+
const loader_utils_1 = require("loader-utils");
|
|
7
8
|
const path_1 = __importDefault(require("path"));
|
|
8
9
|
const webpack_1 = require("../utils/webpack");
|
|
9
10
|
const MiniPlugin_1 = __importDefault(require("./MiniPlugin"));
|
|
@@ -120,6 +121,37 @@ class BuildNativePlugin extends MiniPlugin_1.default {
|
|
|
120
121
|
});
|
|
121
122
|
});
|
|
122
123
|
}
|
|
124
|
+
/**
|
|
125
|
+
* 各组件的样式文件中引入 common chunks 中的公共样式文件
|
|
126
|
+
*/
|
|
127
|
+
injectCommonStyles({ assets }, { webpack }) {
|
|
128
|
+
const { ConcatSource } = webpack.sources;
|
|
129
|
+
const styleExt = this.options.fileType.style;
|
|
130
|
+
const REG_STYLE_EXT = new RegExp(`\\.(${styleExt.replace('.', '')})(\\?.*)?$`);
|
|
131
|
+
const commons = [];
|
|
132
|
+
Object.keys(assets).forEach(assetName => {
|
|
133
|
+
const fileName = path_1.default.basename(assetName, path_1.default.extname(assetName));
|
|
134
|
+
if ((helper_1.REG_STYLE.test(assetName) || REG_STYLE_EXT.test(assetName)) && this.options.commonChunks.includes(fileName)) {
|
|
135
|
+
commons.push(assetName);
|
|
136
|
+
}
|
|
137
|
+
});
|
|
138
|
+
if (commons.length > 0) {
|
|
139
|
+
this.pages.forEach(page => {
|
|
140
|
+
if (page.isNative)
|
|
141
|
+
return;
|
|
142
|
+
const pageStyle = `${page.name}${styleExt}`;
|
|
143
|
+
if (pageStyle in assets) {
|
|
144
|
+
const source = new ConcatSource('');
|
|
145
|
+
const originSource = assets[pageStyle];
|
|
146
|
+
commons.forEach(item => {
|
|
147
|
+
source.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)(path_1.default.posix.relative(path_1.default.dirname(pageStyle), item)))};\n`);
|
|
148
|
+
});
|
|
149
|
+
source.add(originSource);
|
|
150
|
+
assets[pageStyle] = source;
|
|
151
|
+
}
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
}
|
|
123
155
|
}
|
|
124
156
|
exports.default = BuildNativePlugin;
|
|
125
157
|
//# sourceMappingURL=BuildNativePlugin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuildNativePlugin.js","sourceRoot":"","sources":["../../src/plugins/BuildNativePlugin.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"BuildNativePlugin.js","sourceRoot":"","sources":["../../src/plugins/BuildNativePlugin.ts"],"names":[],"mappings":"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"}
|
package/dist/plugins/H5Plugin.js
CHANGED
|
@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const helper_1 = require("@tarojs/helper");
|
|
16
|
-
const web_1 = require("@tarojs/webpack5-prebundle/dist/web");
|
|
17
16
|
const lodash_1 = require("lodash");
|
|
18
17
|
const path_1 = __importDefault(require("path"));
|
|
19
18
|
const app_1 = __importDefault(require("../utils/app"));
|
|
@@ -66,7 +65,7 @@ class TaroH5Plugin {
|
|
|
66
65
|
})));
|
|
67
66
|
compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
|
|
68
67
|
compiler.webpack.NormalModule.getCompilationHooks(compilation).loader.tap(PLUGIN_NAME, (_loaderContext, module) => {
|
|
69
|
-
const { entryFileName,
|
|
68
|
+
const { entryFileName, sourceDir, prebundle, routerConfig, isBuildNativeComp } = this.options;
|
|
70
69
|
const { dir, name } = path_1.default.parse(module.resource);
|
|
71
70
|
const suffixRgx = /\.(boot|config)/;
|
|
72
71
|
if (!suffixRgx.test(name))
|
|
@@ -79,11 +78,7 @@ class TaroH5Plugin {
|
|
|
79
78
|
const bootstrap = prebundle && !/\.boot$/.test(name);
|
|
80
79
|
if (isBuildNativeComp
|
|
81
80
|
? this.appHelper.compsConfigList.has(pageName)
|
|
82
|
-
: (isApp || this.appHelper.pagesConfigList.has(pageName))) {
|
|
83
|
-
if (bootstrap) {
|
|
84
|
-
const bootPath = path_1.default.relative(appPath, path_1.default.join(sourceDir, `${isMultiRouterMode ? pageName : entryFileName}.boot.js`));
|
|
85
|
-
web_1.VirtualModule.writeModule(bootPath, '/** bootstrap application code */');
|
|
86
|
-
}
|
|
81
|
+
: (isApp || this.appHelper.pagesConfigList.has(pageName.split(path_1.default.sep).join('/')))) {
|
|
87
82
|
// 把 Map 转换为数组后传递，避免 thread-loader 传递 Map 时变为空对象的问题，fix #13430
|
|
88
83
|
const pagesConfigList = [];
|
|
89
84
|
for (const item of this.appHelper.pagesConfigList.entries()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"H5Plugin.js","sourceRoot":"","sources":["../../src/plugins/H5Plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"H5Plugin.js","sourceRoot":"","sources":["../../src/plugins/H5Plugin.ts"],"names":[],"mappings":"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"}
|