@tarojs/webpack5-runner 3.5.0-alpha.0 → 3.5.0-alpha.11
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 +21 -0
- package/dist/dependencies/TaroSingleEntryDependency.js +5 -2
- package/dist/dependencies/TaroSingleEntryDependency.js.map +1 -1
- package/dist/index.h5.js +32 -28
- package/dist/index.h5.js.map +1 -1
- package/dist/index.mini.js +7 -4
- package/dist/index.mini.js.map +1 -1
- package/dist/loaders/miniTemplateLoader.js +7 -4
- package/dist/loaders/miniTemplateLoader.js.map +1 -1
- package/dist/plugins/BuildNativePlugin.js +17 -14
- package/dist/plugins/BuildNativePlugin.js.map +1 -1
- package/dist/plugins/H5Plugin.js +10 -7
- package/dist/plugins/H5Plugin.js.map +1 -1
- package/dist/plugins/MiniPlugin.js +75 -72
- package/dist/plugins/MiniPlugin.js.map +1 -1
- package/dist/plugins/MiniSplitChunksPlugin.js +28 -25
- package/dist/plugins/MiniSplitChunksPlugin.js.map +1 -1
- package/dist/plugins/TaroLoadChunksPlugin.js +15 -12
- package/dist/plugins/TaroLoadChunksPlugin.js.map +1 -1
- package/dist/plugins/TaroNormalModule.js +6 -3
- package/dist/plugins/TaroNormalModule.js.map +1 -1
- package/dist/plugins/TaroNormalModulesPlugin.js +5 -2
- package/dist/plugins/TaroNormalModulesPlugin.js.map +1 -1
- package/dist/plugins/TaroSingleEntryPlugin.js +4 -1
- package/dist/plugins/TaroSingleEntryPlugin.js.map +1 -1
- package/dist/postcss/postcss.h5.js +23 -8
- package/dist/postcss/postcss.h5.js.map +1 -1
- package/dist/postcss/postcss.mini.js +20 -10
- package/dist/postcss/postcss.mini.js.map +1 -1
- package/dist/prebundle/bundle.js +20 -17
- package/dist/prebundle/bundle.js.map +1 -1
- package/dist/prebundle/index.js +38 -35
- package/dist/prebundle/index.js.map +1 -1
- package/dist/prebundle/scanImports.js +23 -16
- package/dist/prebundle/scanImports.js.map +1 -1
- package/dist/prebundle/utils.js +14 -11
- package/dist/prebundle/utils.js.map +1 -1
- package/dist/prebundle/webpack/TaroContainerEntryModule.js +5 -2
- package/dist/prebundle/webpack/TaroContainerEntryModule.js.map +1 -1
- package/dist/prebundle/webpack/TaroContainerPlugin.js +4 -1
- package/dist/prebundle/webpack/TaroContainerPlugin.js.map +1 -1
- package/dist/prebundle/webpack/TaroContainerReferencePlugin.js +11 -8
- package/dist/prebundle/webpack/TaroContainerReferencePlugin.js.map +1 -1
- package/dist/prerender/prerender.js +16 -13
- package/dist/prerender/prerender.js.map +1 -1
- package/dist/template/custom-wrapper.js +1 -1
- package/dist/template/custom-wrapper.js.map +1 -1
- package/dist/utils/H5AppInstance.js +14 -11
- package/dist/utils/H5AppInstance.js.map +1 -1
- package/dist/utils/index.js +8 -5
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/logHelper.js +11 -8
- package/dist/utils/logHelper.js.map +1 -1
- package/dist/utils/webpack.js.map +1 -1
- package/dist/webpack/BaseConfig.js +13 -11
- package/dist/webpack/BaseConfig.js.map +1 -1
- package/dist/webpack/BuildNativePlugin.js +17 -14
- package/dist/webpack/BuildNativePlugin.js.map +1 -1
- package/dist/webpack/Combination.js +13 -10
- package/dist/webpack/Combination.js.map +1 -1
- package/dist/webpack/H5BaseConfig.js +6 -1
- package/dist/webpack/H5BaseConfig.js.map +1 -1
- package/dist/webpack/H5Combination.js +9 -6
- package/dist/webpack/H5Combination.js.map +1 -1
- package/dist/webpack/H5WebpackModule.js +5 -5
- package/dist/webpack/H5WebpackModule.js.map +1 -1
- package/dist/webpack/H5WebpackPlugin.js +8 -5
- package/dist/webpack/H5WebpackPlugin.js.map +1 -1
- package/dist/webpack/MiniCombination.js.map +1 -1
- package/dist/webpack/MiniWebpackModule.js +11 -8
- package/dist/webpack/MiniWebpackModule.js.map +1 -1
- package/dist/webpack/MiniWebpackPlugin.js +8 -5
- package/dist/webpack/MiniWebpackPlugin.js.map +1 -1
- package/dist/webpack/WebpackModule.js +16 -13
- package/dist/webpack/WebpackModule.js.map +1 -1
- package/dist/webpack/WebpackPlugin.js +8 -5
- package/dist/webpack/WebpackPlugin.js.map +1 -1
- package/package.json +18 -18
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaroContainerEntryModule.js","sourceRoot":"","sources":["../../../src/prebundle/webpack/TaroContainerEntryModule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TaroContainerEntryModule.js","sourceRoot":"","sources":["../../../src/prebundle/webpack/TaroContainerEntryModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,13 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
/**
|
|
13
16
|
* Modify from https://github.com/webpack/webpack/blob/main/lib/container/ContainerPlugin.js
|
|
14
17
|
* MIT License http://www.opensource.org/licenses/mit-license.php
|
|
15
18
|
* Author Tobias Koppers @sokra, Zackary Jackson @ScriptedAlchemy, Marais Rossouw @maraisr
|
|
16
19
|
*/
|
|
17
|
-
const TaroContainerEntryModule_1 = require("./TaroContainerEntryModule");
|
|
20
|
+
const TaroContainerEntryModule_1 = __importDefault(require("./TaroContainerEntryModule"));
|
|
18
21
|
const ContainerEntryDependency = require('webpack/lib/container/ContainerEntryDependency');
|
|
19
22
|
const ContainerEntryModuleFactory = require('webpack/lib/container/ContainerEntryModuleFactory');
|
|
20
23
|
const PLUGIN_NAME = 'TaroContainerPlugin';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaroContainerPlugin.js","sourceRoot":"","sources":["../../../src/prebundle/webpack/TaroContainerPlugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TaroContainerPlugin.js","sourceRoot":"","sources":["../../../src/prebundle/webpack/TaroContainerPlugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA;;;;GAIG;AACH,0FAAiE;AAEjE,MAAM,wBAAwB,GAAG,OAAO,CAAC,gDAAgD,CAAC,CAAA;AAC1F,MAAM,2BAA2B,GAAG,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAEhG,MAAM,WAAW,GAAG,qBAAqB,CAAA;AAEzC,MAAM,+BAAgC,SAAQ,2BAA2B;IACvE,MAAM,CAAE,EAAE,YAAY,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,QAAQ;QAC9C,MAAM,GAAG,GAAG,UAAU,CAAA;QACtB,QAAQ,CAAC,IAAI,EAAE;YACb,MAAM,EAAE,IAAI,kCAAwB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC;SAC5E,CAAC,CAAA;IACJ,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,mBAAmB;IAGvB,YAAa,mBAAmB;QAC9B,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;IAChD,CAAC;IAED,KAAK,CAAE,QAAQ;QACb,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAChC;YACE,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,GAAG;SACX,EACD,WAAW,CAAC,EAAE;YACZ,WAAW,CAAC,mBAAmB,CAAC,GAAG,CACjC,wBAAwB,EACxB,IAAI,+BAA+B,EAAE,CACtC,CAAA;YAED;;;;eAIG;YACH,WAAW,CAAC,KAAK,CAAC,wBAAwB,CAAC,GAAG,CAC5C,WAAW,EACX,GAAG,EAAE;gBACH,MAAM,iBAAiB,GAAI,WAAmB,CAAC,qBAAqB,EAAE,CAAA;gBACtE,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE;oBACrC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;wBAC5B,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAA;wBACzC,MAAM,GAAG,GAAI,UAAkB,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;wBAC1D,MAAM,mBAAmB,GAAG,GAAG,CAAC,yBAAyB,CAAA;wBACzD,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;qBACxE;iBACF;YACH,CAAC,CACF,CAAA;YAED;;;;eAIG;YACH,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CACtC,WAAW,EACX,CAAO,MAAM,EAAE,QAAa,EAAE,EAAE;gBAC9B,OAAO,MAAM,CAAC,SAAS,CAAC,CAAA;gBACxB,OAAO,MAAM,CAAC,YAAY,CAAC,CAAA;gBAC3B,QAAQ,EAAE,CAAA;YACZ,CAAC,CAAA,CACF,CAAA;QACH,CAAC,CACF,CAAA;IACH,CAAC;CACF;AAED,kBAAe,mBAAmB,CAAA"}
|
|
@@ -1,18 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
/**
|
|
4
7
|
* Modify from https://github.com/webpack/webpack/blob/main/lib/container/ContainerReferencePlugin.js
|
|
5
8
|
* MIT License http://www.opensource.org/licenses/mit-license.php
|
|
6
9
|
* Author Tobias Koppers @sokra and Zackary Jackson @ScriptedAlchemy
|
|
7
10
|
*/
|
|
8
|
-
const webpack_1 = require("webpack");
|
|
9
11
|
const helper_1 = require("@tarojs/helper");
|
|
12
|
+
const webpack_1 = __importDefault(require("webpack"));
|
|
10
13
|
const webpack_sources_1 = require("webpack-sources");
|
|
11
14
|
const TaroLoadChunksPlugin_1 = require("../../plugins/TaroLoadChunksPlugin");
|
|
12
15
|
const webpack_2 = require("../../utils/webpack");
|
|
13
16
|
const RemoteModule = require('webpack/lib/container/RemoteModule');
|
|
14
17
|
const PLUGIN_NAME = 'TaroContainerReferencePlugin';
|
|
15
|
-
class TaroRemoteRuntimeModule extends webpack_1.RuntimeModule {
|
|
18
|
+
class TaroRemoteRuntimeModule extends webpack_1.default.RuntimeModule {
|
|
16
19
|
constructor() {
|
|
17
20
|
super('remotes loading');
|
|
18
21
|
}
|
|
@@ -38,12 +41,12 @@ class TaroRemoteRuntimeModule extends webpack_1.RuntimeModule {
|
|
|
38
41
|
idToExternalAndNameMapping[id] = [shareScope, name, externalModuleId];
|
|
39
42
|
}
|
|
40
43
|
}
|
|
41
|
-
return webpack_1.Template.asString([
|
|
44
|
+
return webpack_1.default.Template.asString([
|
|
42
45
|
`var chunkMapping = ${JSON.stringify(chunkToRemotesMapping, null, '\t')};`,
|
|
43
46
|
`var idToExternalAndNameMapping = ${JSON.stringify(idToExternalAndNameMapping, null, '\t')};`,
|
|
44
|
-
`${webpack_1.RuntimeGlobals.require}.taro = ${runtimeTemplate.basicFunction('get', [
|
|
47
|
+
`${webpack_1.default.RuntimeGlobals.require}.taro = ${runtimeTemplate.basicFunction('get', [
|
|
45
48
|
'for (var id in idToExternalAndNameMapping) {',
|
|
46
|
-
webpack_1.Template.indent([
|
|
49
|
+
webpack_1.default.Template.indent([
|
|
47
50
|
'var mappedName = idToExternalAndNameMapping[id][1];',
|
|
48
51
|
'var factory = get(mappedName);',
|
|
49
52
|
`__webpack_modules__[id] = (${runtimeTemplate.basicFunction('factory', [`return ${runtimeTemplate.basicFunction('module', ['module.exports = factory();'])}`])})(factory);`
|
|
@@ -92,14 +95,14 @@ class TaroContainerReferencePlugin {
|
|
|
92
95
|
* 在 dist/app.js 头部注入 require，
|
|
93
96
|
* 依赖所有的预编译 chunk 和 remoteEntry
|
|
94
97
|
*/
|
|
95
|
-
const hooks = webpack_1.javascript.JavascriptModulesPlugin.getCompilationHooks(compilation);
|
|
98
|
+
const hooks = webpack_1.default.javascript.JavascriptModulesPlugin.getCompilationHooks(compilation);
|
|
96
99
|
hooks.render.tap(PLUGIN_NAME, (modules, { chunk }) => {
|
|
97
100
|
var _a;
|
|
98
|
-
const chunkEntryModule = webpack_2.getChunkEntryModule(compilation, chunk);
|
|
101
|
+
const chunkEntryModule = (0, webpack_2.getChunkEntryModule)(compilation, chunk);
|
|
99
102
|
if (chunkEntryModule) {
|
|
100
103
|
const entryModule = (_a = chunkEntryModule.rootModule) !== null && _a !== void 0 ? _a : chunkEntryModule;
|
|
101
104
|
if (entryModule.miniType === helper_1.META_TYPE.ENTRY) {
|
|
102
|
-
return TaroLoadChunksPlugin_1.addRequireToSource(TaroLoadChunksPlugin_1.getIdOrName(chunk), modules, this.remoteAssets);
|
|
105
|
+
return (0, TaroLoadChunksPlugin_1.addRequireToSource)((0, TaroLoadChunksPlugin_1.getIdOrName)(chunk), modules, this.remoteAssets);
|
|
103
106
|
}
|
|
104
107
|
return modules;
|
|
105
108
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaroContainerReferencePlugin.js","sourceRoot":"","sources":["../../../src/prebundle/webpack/TaroContainerReferencePlugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TaroContainerReferencePlugin.js","sourceRoot":"","sources":["../../../src/prebundle/webpack/TaroContainerReferencePlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.Prerender = exports.validatePrerenderPages = void 0;
|
|
13
|
-
const
|
|
16
|
+
const fs_1 = __importDefault(require("fs"));
|
|
14
17
|
const path_1 = require("path");
|
|
15
18
|
const shared_1 = require("@tarojs/shared");
|
|
16
19
|
const logHelper_1 = require("../utils/logHelper");
|
|
@@ -31,7 +34,7 @@ function getAttrValue(value) {
|
|
|
31
34
|
}
|
|
32
35
|
catch (error) { }
|
|
33
36
|
}
|
|
34
|
-
if (value === 'true' || value === 'false' || !shared_1.isString(value)) {
|
|
37
|
+
if (value === 'true' || value === 'false' || !(0, shared_1.isString)(value)) {
|
|
35
38
|
return `"{{${value}}}"`;
|
|
36
39
|
}
|
|
37
40
|
return `"${unquote(value)}"`;
|
|
@@ -50,13 +53,13 @@ function validatePrerenderPages(pages, config) {
|
|
|
50
53
|
}
|
|
51
54
|
for (const page of pages) {
|
|
52
55
|
for (const i of include) {
|
|
53
|
-
if (shared_1.isString(i) && i === page) {
|
|
56
|
+
if ((0, shared_1.isString)(i) && i === page) {
|
|
54
57
|
pageConfigs.push({
|
|
55
58
|
path: page,
|
|
56
59
|
params: {}
|
|
57
60
|
});
|
|
58
61
|
}
|
|
59
|
-
if (shared_1.isObject(i) && i.path === page) {
|
|
62
|
+
if ((0, shared_1.isObject)(i) && i.path === page) {
|
|
60
63
|
pageConfigs.push(Object.assign({
|
|
61
64
|
params: {}
|
|
62
65
|
}, i));
|
|
@@ -138,7 +141,7 @@ class Prerender {
|
|
|
138
141
|
`, this.outputPath);
|
|
139
142
|
}
|
|
140
143
|
catch (error) {
|
|
141
|
-
logHelper_1.printPrerenderFail('app');
|
|
144
|
+
(0, logHelper_1.printPrerenderFail)('app');
|
|
142
145
|
console.error(error);
|
|
143
146
|
}
|
|
144
147
|
this.appLoaded = true;
|
|
@@ -148,17 +151,17 @@ class Prerender {
|
|
|
148
151
|
for (const page of pages) {
|
|
149
152
|
try {
|
|
150
153
|
yield this.writeXML(page);
|
|
151
|
-
logHelper_1.printPrerenderSuccess(page.path);
|
|
154
|
+
(0, logHelper_1.printPrerenderSuccess)(page.path);
|
|
152
155
|
}
|
|
153
156
|
catch (error) {
|
|
154
|
-
logHelper_1.printPrerenderFail(page.path);
|
|
157
|
+
(0, logHelper_1.printPrerenderFail)(page.path);
|
|
155
158
|
console.error(error);
|
|
156
159
|
}
|
|
157
160
|
}
|
|
158
161
|
});
|
|
159
162
|
}
|
|
160
163
|
getRealPath(path, ext = '.js') {
|
|
161
|
-
return path_1.join(this.outputPath, path + ext).replace(/\\/g, '\\\\');
|
|
164
|
+
return (0, path_1.join)(this.outputPath, path + ext).replace(/\\/g, '\\\\');
|
|
162
165
|
}
|
|
163
166
|
buildSandbox() {
|
|
164
167
|
const { JSDOM } = require('jsdom');
|
|
@@ -174,15 +177,15 @@ class Prerender {
|
|
|
174
177
|
return __awaiter(this, void 0, void 0, function* () {
|
|
175
178
|
const { path } = config;
|
|
176
179
|
let data = yield this.renderToData(config);
|
|
177
|
-
if (shared_1.isFunction(this.prerenderConfig.transformData)) {
|
|
180
|
+
if ((0, shared_1.isFunction)(this.prerenderConfig.transformData)) {
|
|
178
181
|
data = this.prerenderConfig.transformData(data, config);
|
|
179
182
|
}
|
|
180
183
|
let xml = this.renderToXML(data);
|
|
181
|
-
if (shared_1.isFunction(this.prerenderConfig.transformXML)) {
|
|
184
|
+
if ((0, shared_1.isFunction)(this.prerenderConfig.transformXML)) {
|
|
182
185
|
xml = this.prerenderConfig.transformXML(data, config, xml);
|
|
183
186
|
}
|
|
184
187
|
const templatePath = this.getRealPath(path, this.buildConfig.fileType.templ);
|
|
185
|
-
const [importTemplate, template] =
|
|
188
|
+
const [importTemplate, template] = fs_1.default.readFileSync(templatePath, 'utf-8').split('\n');
|
|
186
189
|
let str = `${importTemplate}\n`;
|
|
187
190
|
str += `<block ${this.adapter.if}="{{root.uid}}">\n`;
|
|
188
191
|
str += ` ${template}\n`;
|
|
@@ -190,7 +193,7 @@ class Prerender {
|
|
|
190
193
|
str += `<block ${this.adapter.else}>\n`;
|
|
191
194
|
str += `${xml}\n`;
|
|
192
195
|
str += '</block>';
|
|
193
|
-
|
|
196
|
+
fs_1.default.writeFileSync(templatePath, str, 'utf-8');
|
|
194
197
|
});
|
|
195
198
|
}
|
|
196
199
|
writeScript(path) {
|
|
@@ -200,7 +203,7 @@ class Prerender {
|
|
|
200
203
|
if (typeof PRERENDER !== 'undefined') {
|
|
201
204
|
module.exports = ${this.globalObject}._prerender
|
|
202
205
|
}`;
|
|
203
|
-
|
|
206
|
+
fs_1.default.appendFile(path, s, 'utf8', () => {
|
|
204
207
|
resolve();
|
|
205
208
|
});
|
|
206
209
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prerender.js","sourceRoot":"","sources":["../../src/prerender/prerender.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prerender.js","sourceRoot":"","sources":["../../src/prerender/prerender.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
/* eslint-disable no-undef */
|
|
4
4
|
const runtime_1 = require("@tarojs/runtime");
|
|
5
5
|
// @ts-ignore
|
|
6
|
-
Component(runtime_1.createRecursiveComponentConfig('custom-wrapper'));
|
|
6
|
+
Component((0, runtime_1.createRecursiveComponentConfig)('custom-wrapper'));
|
|
7
7
|
//# sourceMappingURL=custom-wrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-wrapper.js","sourceRoot":"","sources":["../../src/template/custom-wrapper.ts"],"names":[],"mappings":";;AAAA,6BAA6B;AAC7B,6CAAgE;AAChE,aAAa;AACb,SAAS,CAAC,wCAA8B,
|
|
1
|
+
{"version":3,"file":"custom-wrapper.js","sourceRoot":"","sources":["../../src/template/custom-wrapper.ts"],"names":[],"mappings":";;AAAA,6BAA6B;AAC7B,6CAAgE;AAChE,aAAa;AACb,SAAS,CAAC,IAAA,wCAA8B,EAAC,gBAAgB,CAAC,CAAC,CAAA"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
const helper_1 = require("@tarojs/helper");
|
|
4
7
|
const lodash_1 = require("lodash");
|
|
5
|
-
const
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
6
9
|
class H5AppInstance {
|
|
7
10
|
constructor(entry = {}, options = {}) {
|
|
8
|
-
this.options = lodash_1.defaults(options || {}, {
|
|
11
|
+
this.options = (0, lodash_1.defaults)(options || {}, {
|
|
9
12
|
sourceDir: '',
|
|
10
13
|
entryFileName: 'app',
|
|
11
14
|
framework: helper_1.FRAMEWORK_MAP.NERV
|
|
@@ -16,20 +19,20 @@ class H5AppInstance {
|
|
|
16
19
|
const { entryFileName, sourceDir } = this.options;
|
|
17
20
|
const appEntry = this.entry[entryFileName];
|
|
18
21
|
if (!appEntry)
|
|
19
|
-
return
|
|
22
|
+
return path_1.default.join(sourceDir, entryFileName);
|
|
20
23
|
if (Array.isArray(appEntry)) {
|
|
21
|
-
return appEntry.filter(item =>
|
|
24
|
+
return appEntry.filter(item => path_1.default.basename(item, path_1.default.extname(item)) === entryFileName)[0];
|
|
22
25
|
}
|
|
23
26
|
else if (Array.isArray(appEntry.import)) {
|
|
24
|
-
return appEntry.import.filter(item =>
|
|
27
|
+
return appEntry.import.filter(item => path_1.default.basename(item, path_1.default.extname(item)) === entryFileName)[0];
|
|
25
28
|
}
|
|
26
29
|
return appEntry;
|
|
27
30
|
}
|
|
28
31
|
get appConfig() {
|
|
29
32
|
if (!this.__appConfig) {
|
|
30
33
|
const appConfigPath = this.getConfigFilePath(this.appEntry);
|
|
31
|
-
const appConfig = helper_1.readConfig(appConfigPath);
|
|
32
|
-
if (helper_1.isEmptyObject(appConfig)) {
|
|
34
|
+
const appConfig = (0, helper_1.readConfig)(appConfigPath);
|
|
35
|
+
if ((0, helper_1.isEmptyObject)(appConfig)) {
|
|
33
36
|
throw new Error('缺少 app 全局配置，请检查！');
|
|
34
37
|
}
|
|
35
38
|
this.__appConfig = appConfig;
|
|
@@ -46,7 +49,7 @@ class H5AppInstance {
|
|
|
46
49
|
this.__pages = new Set([
|
|
47
50
|
...appPages.map(item => ({
|
|
48
51
|
name: item,
|
|
49
|
-
path: helper_1.resolveMainFilePath(
|
|
52
|
+
path: (0, helper_1.resolveMainFilePath)(path_1.default.join(sourceDir, item), helper_1.FRAMEWORK_EXT_MAP[framework])
|
|
50
53
|
}))
|
|
51
54
|
]);
|
|
52
55
|
this.getSubPackages();
|
|
@@ -71,7 +74,7 @@ class H5AppInstance {
|
|
|
71
74
|
}
|
|
72
75
|
});
|
|
73
76
|
if (!hasPageIn) {
|
|
74
|
-
const pagePath = helper_1.resolveMainFilePath(
|
|
77
|
+
const pagePath = (0, helper_1.resolveMainFilePath)(path_1.default.join(sourceDir, pageItem), helper_1.FRAMEWORK_EXT_MAP[framework]);
|
|
75
78
|
this.pages.add({
|
|
76
79
|
name: pageItem,
|
|
77
80
|
path: pagePath
|
|
@@ -97,10 +100,10 @@ class H5AppInstance {
|
|
|
97
100
|
}
|
|
98
101
|
getConfigFilePath(filePath = '') {
|
|
99
102
|
// console.log('filePath: ', filePath)
|
|
100
|
-
return helper_1.resolveMainFilePath(`${filePath.replace(
|
|
103
|
+
return (0, helper_1.resolveMainFilePath)(`${filePath.replace(path_1.default.extname(filePath), '')}.config`);
|
|
101
104
|
}
|
|
102
105
|
getTargetFilePath(filePath, targetExtname) {
|
|
103
|
-
const extname =
|
|
106
|
+
const extname = path_1.default.extname(filePath);
|
|
104
107
|
if (extname)
|
|
105
108
|
return filePath.replace(extname, targetExtname);
|
|
106
109
|
return filePath + targetExtname;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"H5AppInstance.js","sourceRoot":"","sources":["../../src/utils/H5AppInstance.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"H5AppInstance.js","sourceRoot":"","sources":["../../src/utils/H5AppInstance.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/index.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.formatOpenHost = exports.addHtmlSuffix = exports.stripTrailingSlash = exports.stripBasename = exports.hasBasename = exports.addTrailingSlash = exports.addLeadingSlash = exports.getRootPath = exports.emptyTogglableObj = exports.emptyObj = void 0;
|
|
4
|
-
const
|
|
7
|
+
const path_1 = __importDefault(require("path"));
|
|
5
8
|
const os_1 = require("os");
|
|
6
9
|
exports.emptyObj = {};
|
|
7
10
|
exports.emptyTogglableObj = {
|
|
@@ -9,7 +12,7 @@ exports.emptyTogglableObj = {
|
|
|
9
12
|
config: {}
|
|
10
13
|
};
|
|
11
14
|
const getRootPath = function () {
|
|
12
|
-
return
|
|
15
|
+
return path_1.default.resolve(__dirname, '../../');
|
|
13
16
|
};
|
|
14
17
|
exports.getRootPath = getRootPath;
|
|
15
18
|
const addLeadingSlash = (url = '') => (url.charAt(0) === '/' ? url : '/' + url);
|
|
@@ -18,7 +21,7 @@ const addTrailingSlash = (url = '') => (url.charAt(url.length - 1) === '/' ? url
|
|
|
18
21
|
exports.addTrailingSlash = addTrailingSlash;
|
|
19
22
|
const hasBasename = (path = '', prefix = '') => new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i').test(path) || path === prefix;
|
|
20
23
|
exports.hasBasename = hasBasename;
|
|
21
|
-
const stripBasename = (path = '', prefix = '') => exports.hasBasename(path, prefix) ? path.substr(prefix.length) : path;
|
|
24
|
+
const stripBasename = (path = '', prefix = '') => (0, exports.hasBasename)(path, prefix) ? path.substr(prefix.length) : path;
|
|
22
25
|
exports.stripBasename = stripBasename;
|
|
23
26
|
const stripTrailingSlash = (path = '') => (path.charAt(path.length - 1) === '/' ? path.substring(0, path.length - 1) : path);
|
|
24
27
|
exports.stripTrailingSlash = stripTrailingSlash;
|
|
@@ -28,10 +31,10 @@ const formatOpenHost = host => {
|
|
|
28
31
|
var _a;
|
|
29
32
|
let result = host;
|
|
30
33
|
// 配置host为0.0.0.0时,可以转换为ip打开, 其他以配置host默认打开
|
|
31
|
-
if (result === '0.0.0.0') {
|
|
34
|
+
if (!result || result === '0.0.0.0' || result.startsWith('local-ip')) {
|
|
32
35
|
// 设置localhost为初值, 防止没正确获取到host时以0.0.0.0打开
|
|
33
36
|
result = 'localhost';
|
|
34
|
-
const interfaces = os_1.networkInterfaces();
|
|
37
|
+
const interfaces = (0, os_1.networkInterfaces)();
|
|
35
38
|
for (const devName in interfaces) {
|
|
36
39
|
const isEnd = (_a = interfaces[devName]) === null || _a === void 0 ? void 0 : _a.some(item => {
|
|
37
40
|
// 取IPv4, 不为127.0.0.1的内网ip
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/logHelper.js
CHANGED
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.bindProdLogger = exports.bindDevLogger = exports.getServeSpinner = exports.printCompiling = exports.printBuildError = exports.printPrerenderFail = exports.printPrerenderSuccess = void 0;
|
|
4
|
-
const
|
|
7
|
+
const ora_1 = __importDefault(require("ora"));
|
|
5
8
|
const fp_1 = require("lodash/fp");
|
|
6
|
-
const
|
|
9
|
+
const webpack_format_messages_1 = __importDefault(require("webpack-format-messages"));
|
|
7
10
|
const helper_1 = require("@tarojs/helper");
|
|
8
11
|
const getServeSpinner = (() => {
|
|
9
12
|
let spinner;
|
|
10
13
|
return () => {
|
|
11
14
|
if (!spinner) {
|
|
12
|
-
spinner =
|
|
15
|
+
spinner = (0, ora_1.default)('即将开始启动编译，请稍等~');
|
|
13
16
|
spinner.start();
|
|
14
17
|
}
|
|
15
18
|
return spinner;
|
|
@@ -111,7 +114,7 @@ const printWhenFirstDone = (devUrl, compiler) => {
|
|
|
111
114
|
};
|
|
112
115
|
const _printWhenDone = ({ verbose = false }, compiler) => {
|
|
113
116
|
compiler.hooks.done.tap('taroDone', stats => {
|
|
114
|
-
const { errors, warnings } =
|
|
117
|
+
const { errors, warnings } = (0, webpack_format_messages_1.default)(stats);
|
|
115
118
|
if (!stats.hasErrors() && !stats.hasWarnings()) {
|
|
116
119
|
printSuccess();
|
|
117
120
|
}
|
|
@@ -136,17 +139,17 @@ const _printWhenDone = ({ verbose = false }, compiler) => {
|
|
|
136
139
|
});
|
|
137
140
|
return compiler;
|
|
138
141
|
};
|
|
139
|
-
const printWhenDone = fp_1.partial(_printWhenDone, [{ verbose: false }]);
|
|
140
|
-
const printWhenDoneVerbosely = fp_1.partial(_printWhenDone, [{ verbose: true }]);
|
|
142
|
+
const printWhenDone = (0, fp_1.partial)(_printWhenDone, [{ verbose: false }]);
|
|
143
|
+
const printWhenDoneVerbosely = (0, fp_1.partial)(_printWhenDone, [{ verbose: true }]);
|
|
141
144
|
const bindDevLogger = (compiler, devUrl = '') => {
|
|
142
145
|
console.log();
|
|
143
|
-
fp_1.pipe(printWhenBeforeCompile, printWhenDone, printWhenFailed, printWhenInvalid, fp_1.partial(printWhenFirstDone, [devUrl]))(compiler);
|
|
146
|
+
(0, fp_1.pipe)(printWhenBeforeCompile, printWhenDone, printWhenFailed, printWhenInvalid, (0, fp_1.partial)(printWhenFirstDone, [devUrl]))(compiler);
|
|
144
147
|
return compiler;
|
|
145
148
|
};
|
|
146
149
|
exports.bindDevLogger = bindDevLogger;
|
|
147
150
|
const bindProdLogger = compiler => {
|
|
148
151
|
console.log();
|
|
149
|
-
fp_1.pipe(printWhenBeforeCompile, printWhenDoneVerbosely, printWhenFailed)(compiler);
|
|
152
|
+
(0, fp_1.pipe)(printWhenBeforeCompile, printWhenDoneVerbosely, printWhenFailed)(compiler);
|
|
150
153
|
return compiler;
|
|
151
154
|
};
|
|
152
155
|
exports.bindProdLogger = bindProdLogger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logHelper.js","sourceRoot":"","sources":["../../src/utils/logHelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logHelper.js","sourceRoot":"","sources":["../../src/utils/logHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../src/utils/webpack.ts"],"names":[],"mappings":";;;AAEA,SAAgB,mBAAmB,CAAE,
|
|
1
|
+
{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../src/utils/webpack.ts"],"names":[],"mappings":";;;AAEA,SAAgB,mBAAmB,CAAE,WAAgC,EAAE,KAAoB;IACzF,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAA;IACzC,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAA;IAC/E,IAAI,YAAY,CAAC,MAAM,EAAE;QACvB,OAAO,YAAY,CAAC,CAAC,CAAC,CAAA;KACvB;AACH,CAAC;AAND,kDAMC"}
|
|
@@ -1,22 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.BaseConfig = void 0;
|
|
4
|
-
const path = require("path");
|
|
5
|
-
const Chain = require("webpack-chain");
|
|
6
|
-
const formatMessages = require("webpack-format-messages");
|
|
7
7
|
const helper_1 = require("@tarojs/helper");
|
|
8
8
|
const runner_utils_1 = require("@tarojs/runner-utils");
|
|
9
|
+
const path_1 = __importDefault(require("path"));
|
|
10
|
+
const webpack_chain_1 = __importDefault(require("webpack-chain"));
|
|
11
|
+
const webpack_format_messages_1 = __importDefault(require("webpack-format-messages"));
|
|
9
12
|
const WebpackPlugin_1 = require("./WebpackPlugin");
|
|
10
13
|
class BaseConfig {
|
|
11
14
|
constructor(appPath, config) {
|
|
12
15
|
var _a, _b, _c;
|
|
13
|
-
const chain = this._chain = new
|
|
16
|
+
const chain = this._chain = new webpack_chain_1.default();
|
|
14
17
|
chain.merge({
|
|
15
18
|
target: ['web', 'es5'],
|
|
16
19
|
resolve: {
|
|
17
20
|
extensions: ['.js', '.jsx', '.ts', '.tsx', '.mjs', '.vue'],
|
|
18
21
|
symlinks: true,
|
|
19
|
-
modules: [path.join(appPath, 'node_modules'), 'node_modules'],
|
|
20
22
|
plugin: {
|
|
21
23
|
MultiPlatformPlugin: {
|
|
22
24
|
plugin: runner_utils_1.MultiPlatformPlugin,
|
|
@@ -25,7 +27,7 @@ class BaseConfig {
|
|
|
25
27
|
}
|
|
26
28
|
},
|
|
27
29
|
resolveLoader: {
|
|
28
|
-
modules: [
|
|
30
|
+
modules: ['node_modules']
|
|
29
31
|
},
|
|
30
32
|
output: {
|
|
31
33
|
chunkLoadingGlobal: 'webpackJsonp'
|
|
@@ -38,7 +40,7 @@ class BaseConfig {
|
|
|
38
40
|
{
|
|
39
41
|
done(_context, { stats }) {
|
|
40
42
|
var _a;
|
|
41
|
-
const { warnings, errors } =
|
|
43
|
+
const { warnings, errors } = (0, webpack_format_messages_1.default)(stats);
|
|
42
44
|
if (stats.hasWarnings()) {
|
|
43
45
|
console.log(helper_1.chalk.bgKeyword('orange')('⚠️ Warinings: \n'));
|
|
44
46
|
warnings.forEach(w => console.log(w + '\n'));
|
|
@@ -79,12 +81,12 @@ class BaseConfig {
|
|
|
79
81
|
type: 'filesystem',
|
|
80
82
|
// 让缓存失效
|
|
81
83
|
buildDependencies: {
|
|
82
|
-
config: [
|
|
84
|
+
config: [path_1.default.join(appPath, 'config/index.js')]
|
|
83
85
|
},
|
|
84
86
|
name: `${process.env.NODE_ENV}-${process.env.TARO_ENV}`
|
|
85
87
|
};
|
|
86
88
|
chain.merge({
|
|
87
|
-
cache: helper_1.recursiveMerge({}, cacheDefault, config.cache)
|
|
89
|
+
cache: (0, helper_1.recursiveMerge)({}, cacheDefault, config.cache)
|
|
88
90
|
});
|
|
89
91
|
}
|
|
90
92
|
}
|
|
@@ -109,7 +111,7 @@ class BaseConfig {
|
|
|
109
111
|
const defaultESBuildOptions = {
|
|
110
112
|
target: 'es5'
|
|
111
113
|
};
|
|
112
|
-
const esbuildMinifyOptions = helper_1.recursiveMerge({}, defaultESBuildOptions, ((_b = esbuild === null || esbuild === void 0 ? void 0 : esbuild.minify) === null || _b === void 0 ? void 0 : _b.config) || {});
|
|
114
|
+
const esbuildMinifyOptions = (0, helper_1.recursiveMerge)({}, defaultESBuildOptions, ((_b = esbuild === null || esbuild === void 0 ? void 0 : esbuild.minify) === null || _b === void 0 ? void 0 : _b.config) || {});
|
|
113
115
|
minimizer.esBuildMinifyPlugin = WebpackPlugin_1.WebpackPlugin.getESBuildMinifyPlugin(esbuildMinifyOptions);
|
|
114
116
|
}
|
|
115
117
|
}
|
|
@@ -119,7 +121,7 @@ class BaseConfig {
|
|
|
119
121
|
minimize = false;
|
|
120
122
|
}
|
|
121
123
|
else {
|
|
122
|
-
const terserOptions = helper_1.recursiveMerge({}, defaultTerserOptions, (terser === null || terser === void 0 ? void 0 : terser.config) || {});
|
|
124
|
+
const terserOptions = (0, helper_1.recursiveMerge)({}, defaultTerserOptions, (terser === null || terser === void 0 ? void 0 : terser.config) || {});
|
|
123
125
|
minimizer.terserPlugin = WebpackPlugin_1.WebpackPlugin.getTerserPlugin(terserOptions);
|
|
124
126
|
}
|
|
125
127
|
}
|