@tarojs/webpack5-runner 3.6.2 → 3.6.4
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/index.h5.js +47 -42
- package/dist/index.h5.js.map +1 -1
- package/dist/index.mini.js +2 -1
- package/dist/index.mini.js.map +1 -1
- package/dist/plugins/BuildNativePlugin.js +2 -2
- package/dist/plugins/BuildNativePlugin.js.map +1 -1
- package/dist/plugins/H5Plugin.js +46 -29
- package/dist/plugins/H5Plugin.js.map +1 -1
- package/dist/plugins/MiniPlugin.js +41 -34
- package/dist/plugins/MiniPlugin.js.map +1 -1
- package/dist/plugins/MiniSplitChunksPlugin.js +2 -3
- package/dist/plugins/MiniSplitChunksPlugin.js.map +1 -1
- package/dist/plugins/TaroComponentsExportsPlugin.js +116 -0
- package/dist/plugins/TaroComponentsExportsPlugin.js.map +1 -0
- package/dist/plugins/TaroLoadChunksPlugin.js +2 -9
- package/dist/plugins/TaroLoadChunksPlugin.js.map +1 -1
- package/dist/plugins/TaroNormalModulesPlugin.js +1 -1
- package/dist/plugins/TaroNormalModulesPlugin.js.map +1 -1
- package/dist/utils/{H5AppInstance.js → app.js} +64 -18
- package/dist/utils/app.js.map +1 -0
- package/dist/utils/component.js.map +1 -0
- package/dist/utils/webpack.js +9 -1
- package/dist/utils/webpack.js.map +1 -1
- package/dist/webpack/BaseConfig.js +2 -2
- package/dist/webpack/BaseConfig.js.map +1 -1
- package/dist/webpack/Combination.js +14 -4
- package/dist/webpack/Combination.js.map +1 -1
- package/dist/webpack/H5Combination.js +16 -19
- package/dist/webpack/H5Combination.js.map +1 -1
- package/dist/webpack/H5WebpackPlugin.js +36 -20
- package/dist/webpack/H5WebpackPlugin.js.map +1 -1
- package/dist/webpack/MiniCombination.js +3 -6
- package/dist/webpack/MiniCombination.js.map +1 -1
- package/dist/webpack/MiniWebpackPlugin.js +7 -4
- package/dist/webpack/MiniWebpackPlugin.js.map +1 -1
- package/index.js +1 -1
- package/package.json +31 -23
- package/dist/template/component.js.map +0 -1
- package/dist/utils/H5AppInstance.js.map +0 -1
- /package/dist/{template → utils}/component.js +0 -0
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
3
|
+
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
4
|
+
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
5
|
+
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
6
|
+
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
7
|
+
};
|
|
8
|
+
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
9
|
+
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
10
|
+
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
|
+
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
|
+
};
|
|
13
|
+
var _TaroComponentsExportsPlugin_componentsExports;
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const helper_1 = require("@tarojs/helper");
|
|
16
|
+
const shared_1 = require("@tarojs/shared");
|
|
17
|
+
const component_1 = require("../utils/component");
|
|
18
|
+
const walk = require('acorn-walk');
|
|
19
|
+
const NullDependency = require('webpack/lib/dependencies/NullDependency');
|
|
20
|
+
const PLUGIN_NAME = 'TaroComponentsExportsPlugin';
|
|
21
|
+
class TaroComponentsExportsPlugin {
|
|
22
|
+
constructor(options) {
|
|
23
|
+
this.options = options;
|
|
24
|
+
_TaroComponentsExportsPlugin_componentsExports.set(this, void 0);
|
|
25
|
+
__classPrivateFieldSet(this, _TaroComponentsExportsPlugin_componentsExports, new Set(), "f");
|
|
26
|
+
this.onParseCreateElement = options === null || options === void 0 ? void 0 : options.onParseCreateElement;
|
|
27
|
+
}
|
|
28
|
+
apply(compiler) {
|
|
29
|
+
compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation, { normalModuleFactory }) => {
|
|
30
|
+
// react 的第三方组件支持
|
|
31
|
+
normalModuleFactory.hooks.parser.for('javascript/auto').tap(PLUGIN_NAME, (parser) => {
|
|
32
|
+
parser.hooks.program.tap(PLUGIN_NAME, (program) => {
|
|
33
|
+
walk.simple(program, {
|
|
34
|
+
CallExpression: node => {
|
|
35
|
+
var _a;
|
|
36
|
+
const callee = node.callee;
|
|
37
|
+
if (callee.type === 'MemberExpression') {
|
|
38
|
+
if (callee.property.name !== 'createElement') {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
const nameOfCallee = callee.name;
|
|
44
|
+
if (
|
|
45
|
+
// 兼容 react17 new jsx transtrom
|
|
46
|
+
nameOfCallee !== '_jsx' && nameOfCallee !== '_jsxs' &&
|
|
47
|
+
// 兼容 Vue 3.0 渲染函数及 JSX
|
|
48
|
+
!(nameOfCallee && nameOfCallee.includes('createVNode')) &&
|
|
49
|
+
!(nameOfCallee && nameOfCallee.includes('createBlock')) &&
|
|
50
|
+
!(nameOfCallee && nameOfCallee.includes('createElementVNode')) &&
|
|
51
|
+
!(nameOfCallee && nameOfCallee.includes('createElementBlock')) &&
|
|
52
|
+
!(nameOfCallee && nameOfCallee.includes('resolveComponent')) // 收集使用解析函数的组件名称
|
|
53
|
+
// TODO: 兼容 vue 2.0 渲染函数及 JSX，函数名 h 与 _c 在压缩后太常见，需要做更多限制后才能兼容
|
|
54
|
+
// nameOfCallee !== 'h' && nameOfCallee !== '_c'
|
|
55
|
+
) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
const type = node.arguments[0];
|
|
60
|
+
if (type.value) {
|
|
61
|
+
(_a = this.onParseCreateElement) === null || _a === void 0 ? void 0 : _a.call(this, type.value, component_1.componentConfig);
|
|
62
|
+
__classPrivateFieldGet(this, _TaroComponentsExportsPlugin_componentsExports, "f").add(type.value);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}, Object.assign(Object.assign({}, walk.base), { Import: walk.base.Import || (() => { }) }));
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
compilation.hooks.finishModules.tap(PLUGIN_NAME, (modules) => {
|
|
69
|
+
const module = Array.from(modules).find((e) => e.rawRequest === helper_1.taroJsComponents);
|
|
70
|
+
if (!module)
|
|
71
|
+
return;
|
|
72
|
+
// Note: 仅在生产环境使用
|
|
73
|
+
if (compiler.options.mode === 'production') {
|
|
74
|
+
if (__classPrivateFieldGet(this, _TaroComponentsExportsPlugin_componentsExports, "f").size > 0) {
|
|
75
|
+
compilation.dependencyTemplates.set(NullDependency, new NullDependency.Template());
|
|
76
|
+
module.dependencies = module.dependencies.map((dependency) => {
|
|
77
|
+
var _a;
|
|
78
|
+
if (!(dependency === null || dependency === void 0 ? void 0 : dependency.name))
|
|
79
|
+
return dependency;
|
|
80
|
+
const name = (0, shared_1.toDashed)(dependency.name);
|
|
81
|
+
const taroName = `taro-${name}`;
|
|
82
|
+
// Note: Vue2 目前无法解析，需要考虑借助 componentConfig.includes 优化
|
|
83
|
+
if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.framework) === helper_1.FRAMEWORK_MAP.VUE ? !component_1.componentConfig.includes.has(name) : !__classPrivateFieldGet(this, _TaroComponentsExportsPlugin_componentsExports, "f").has(taroName)) {
|
|
84
|
+
/** Note: 使用 Null 依赖替换不需要的依赖
|
|
85
|
+
* - 果使用 `compilation.moduleGraph.removeConnection` 移除会导致引用问题；
|
|
86
|
+
* - 使用 compilation.moduleGraph.getConnection(dependency)?.setActive 会残留依赖名称，轻微影包胞体大小
|
|
87
|
+
*/
|
|
88
|
+
return new NullDependency();
|
|
89
|
+
}
|
|
90
|
+
return dependency;
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
normalModuleFactory.hooks.afterResolve.tap(PLUGIN_NAME, (resolveData) => {
|
|
96
|
+
if (resolveData.request === helper_1.taroJsComponents) {
|
|
97
|
+
resolveData.dependencies.forEach((dependency) => {
|
|
98
|
+
var _a;
|
|
99
|
+
if (dependency.usedByExports && ((_a = dependency.ids) === null || _a === void 0 ? void 0 : _a.length) > 0) {
|
|
100
|
+
dependency.ids.forEach(item => {
|
|
101
|
+
component_1.componentConfig.includes.add((0, shared_1.toDashed)(item));
|
|
102
|
+
__classPrivateFieldGet(this, _TaroComponentsExportsPlugin_componentsExports, "f").add(`taro-${(0, shared_1.toDashed)(item)}`);
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
else if (dependency.type === 'harmony import specifier') {
|
|
106
|
+
component_1.componentConfig.includeAll = true;
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
exports.default = TaroComponentsExportsPlugin;
|
|
115
|
+
_TaroComponentsExportsPlugin_componentsExports = new WeakMap();
|
|
116
|
+
//# sourceMappingURL=TaroComponentsExportsPlugin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TaroComponentsExportsPlugin.js","sourceRoot":"","sources":["../../src/plugins/TaroComponentsExportsPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const helper_1 = require("@tarojs/helper");
|
|
4
4
|
const shared_1 = require("@tarojs/shared");
|
|
5
5
|
const webpack_1 = require("webpack");
|
|
6
|
-
const component_1 = require("../
|
|
6
|
+
const component_1 = require("../utils/component");
|
|
7
7
|
const webpack_2 = require("../utils/webpack");
|
|
8
8
|
const PLUGIN_NAME = 'TaroLoadChunksPlugin';
|
|
9
9
|
const { ConcatSource } = webpack_1.sources;
|
|
@@ -28,7 +28,7 @@ class TaroLoadChunksPlugin {
|
|
|
28
28
|
/**
|
|
29
29
|
* 收集 common chunks 中使用到 @tarojs/components 中的组件
|
|
30
30
|
*/
|
|
31
|
-
commonChunks = chunksArray.filter(chunk => this.commonChunks.includes(chunk.name) && chunkHasJs(chunk, compilation.chunkGraph)).reverse();
|
|
31
|
+
commonChunks = chunksArray.filter(chunk => this.commonChunks.includes(chunk.name) && (0, webpack_2.chunkHasJs)(chunk, compilation.chunkGraph)).reverse();
|
|
32
32
|
this.isCompDepsFound = false;
|
|
33
33
|
for (const chunk of commonChunks) {
|
|
34
34
|
this.collectComponents(compiler, compilation, chunk);
|
|
@@ -145,11 +145,4 @@ class TaroLoadChunksPlugin {
|
|
|
145
145
|
}
|
|
146
146
|
}
|
|
147
147
|
exports.default = TaroLoadChunksPlugin;
|
|
148
|
-
function chunkHasJs(chunk, chunkGraph) {
|
|
149
|
-
if (chunk.name === chunk.runtime)
|
|
150
|
-
return true;
|
|
151
|
-
if (chunkGraph.getNumberOfEntryModules(chunk) > 0)
|
|
152
|
-
return true;
|
|
153
|
-
return Boolean(chunkGraph.getChunkModulesIterableBySourceType(chunk, 'javascript'));
|
|
154
|
-
}
|
|
155
148
|
//# sourceMappingURL=TaroLoadChunksPlugin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaroLoadChunksPlugin.js","sourceRoot":"","sources":["../../src/plugins/TaroLoadChunksPlugin.ts"],"names":[],"mappings":";;AAAA,2CAGuB;AACvB,2CAAyC;AACzC,qCAAiC;AAEjC,
|
|
1
|
+
{"version":3,"file":"TaroLoadChunksPlugin.js","sourceRoot":"","sources":["../../src/plugins/TaroLoadChunksPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const TaroSingleEntryDependency_1 = __importDefault(require("../dependencies/TaroSingleEntryDependency"));
|
|
7
|
-
const component_1 = require("../
|
|
7
|
+
const component_1 = require("../utils/component");
|
|
8
8
|
const TaroNormalModule_1 = __importDefault(require("./TaroNormalModule"));
|
|
9
9
|
const walk = require('acorn-walk');
|
|
10
10
|
const PLUGIN_NAME = 'TaroNormalModulesPlugin';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaroNormalModulesPlugin.js","sourceRoot":"","sources":["../../src/plugins/TaroNormalModulesPlugin.ts"],"names":[],"mappings":";;;;;AAAA,0GAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"TaroNormalModulesPlugin.js","sourceRoot":"","sources":["../../src/plugins/TaroNormalModulesPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
3
|
+
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
4
|
+
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
5
|
+
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
6
|
+
};
|
|
7
|
+
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
8
|
+
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
9
|
+
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
10
|
+
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
11
|
+
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
12
|
+
};
|
|
2
13
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
15
|
};
|
|
16
|
+
var _AppHelper_appConfig, _AppHelper_pages, _AppHelper_pagesConfigList, _AppHelper_comps, _AppHelper_compsConfigList;
|
|
5
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
18
|
const helper_1 = require("@tarojs/helper");
|
|
7
19
|
const lodash_1 = require("lodash");
|
|
8
20
|
const path_1 = __importDefault(require("path"));
|
|
9
|
-
class
|
|
21
|
+
class AppHelper {
|
|
10
22
|
constructor(entry = {}, options = {}) {
|
|
23
|
+
_AppHelper_appConfig.set(this, void 0);
|
|
24
|
+
_AppHelper_pages.set(this, void 0);
|
|
25
|
+
_AppHelper_pagesConfigList.set(this, void 0);
|
|
26
|
+
_AppHelper_comps.set(this, void 0);
|
|
27
|
+
_AppHelper_compsConfigList.set(this, void 0);
|
|
11
28
|
this.options = (0, lodash_1.defaults)(options || {}, {
|
|
12
29
|
sourceDir: '',
|
|
13
30
|
entryFileName: 'app',
|
|
@@ -16,6 +33,7 @@ class H5AppInstance {
|
|
|
16
33
|
this.entry = entry;
|
|
17
34
|
}
|
|
18
35
|
get appEntry() {
|
|
36
|
+
// Note: 不考虑 `() => Promise` 情况
|
|
19
37
|
const { entryFileName, sourceDir } = this.options;
|
|
20
38
|
const appEntry = this.entry[entryFileName];
|
|
21
39
|
if (!appEntry)
|
|
@@ -29,32 +47,48 @@ class H5AppInstance {
|
|
|
29
47
|
return appEntry;
|
|
30
48
|
}
|
|
31
49
|
get appConfig() {
|
|
32
|
-
if (!this
|
|
50
|
+
if (!__classPrivateFieldGet(this, _AppHelper_appConfig, "f")) {
|
|
33
51
|
const appConfigPath = this.getConfigFilePath(this.appEntry);
|
|
34
52
|
const appConfig = (0, helper_1.readConfig)(appConfigPath);
|
|
35
53
|
if ((0, helper_1.isEmptyObject)(appConfig)) {
|
|
36
54
|
throw new Error('缺少 app 全局配置，请检查！');
|
|
37
55
|
}
|
|
38
|
-
this
|
|
56
|
+
__classPrivateFieldSet(this, _AppHelper_appConfig, appConfig, "f");
|
|
39
57
|
}
|
|
40
|
-
return this
|
|
58
|
+
return __classPrivateFieldGet(this, _AppHelper_appConfig, "f");
|
|
41
59
|
}
|
|
42
60
|
get pages() {
|
|
43
|
-
if (!this
|
|
61
|
+
if (!__classPrivateFieldGet(this, _AppHelper_pages, "f")) {
|
|
44
62
|
const appPages = this.appConfig.pages;
|
|
45
63
|
if (!appPages || !appPages.length) {
|
|
46
64
|
throw new Error('全局配置缺少 pages 字段，请检查！');
|
|
47
65
|
}
|
|
48
66
|
const { frameworkExts, sourceDir } = this.options;
|
|
49
|
-
this
|
|
67
|
+
__classPrivateFieldSet(this, _AppHelper_pages, new Set([
|
|
50
68
|
...appPages.map(item => ({
|
|
51
69
|
name: item,
|
|
52
70
|
path: (0, helper_1.resolveMainFilePath)(path_1.default.join(sourceDir, item), frameworkExts)
|
|
53
71
|
}))
|
|
54
|
-
]);
|
|
72
|
+
]), "f");
|
|
55
73
|
this.getSubPackages();
|
|
56
74
|
}
|
|
57
|
-
return this
|
|
75
|
+
return __classPrivateFieldGet(this, _AppHelper_pages, "f");
|
|
76
|
+
}
|
|
77
|
+
get comps() {
|
|
78
|
+
if (!__classPrivateFieldGet(this, _AppHelper_comps, "f")) {
|
|
79
|
+
const appPages = this.appConfig.components;
|
|
80
|
+
if (!appPages || !appPages.length) {
|
|
81
|
+
throw new Error('全局配置缺少 components 字段，请检查！');
|
|
82
|
+
}
|
|
83
|
+
const { frameworkExts, sourceDir } = this.options;
|
|
84
|
+
__classPrivateFieldSet(this, _AppHelper_comps, new Set([
|
|
85
|
+
...appPages.map(item => ({
|
|
86
|
+
name: item,
|
|
87
|
+
path: (0, helper_1.resolveMainFilePath)(path_1.default.join(sourceDir, item), frameworkExts)
|
|
88
|
+
}))
|
|
89
|
+
]), "f");
|
|
90
|
+
}
|
|
91
|
+
return __classPrivateFieldGet(this, _AppHelper_comps, "f");
|
|
58
92
|
}
|
|
59
93
|
getSubPackages() {
|
|
60
94
|
const subPackages = this.appConfig.subPackages || this.appConfig.subpackages;
|
|
@@ -87,27 +121,39 @@ class H5AppInstance {
|
|
|
87
121
|
}
|
|
88
122
|
}
|
|
89
123
|
get pagesConfigList() {
|
|
90
|
-
if (!this
|
|
124
|
+
if (!__classPrivateFieldGet(this, _AppHelper_pagesConfigList, "f")) {
|
|
91
125
|
const list = new Map();
|
|
92
126
|
const pages = this.pages;
|
|
93
127
|
pages.forEach(({ name, path }) => {
|
|
94
128
|
const pageConfigPath = this.getConfigFilePath(path);
|
|
95
129
|
list.set(name, pageConfigPath);
|
|
96
130
|
});
|
|
97
|
-
this
|
|
131
|
+
__classPrivateFieldSet(this, _AppHelper_pagesConfigList, list, "f");
|
|
132
|
+
}
|
|
133
|
+
return __classPrivateFieldGet(this, _AppHelper_pagesConfigList, "f");
|
|
134
|
+
}
|
|
135
|
+
get compsConfigList() {
|
|
136
|
+
if (!__classPrivateFieldGet(this, _AppHelper_compsConfigList, "f")) {
|
|
137
|
+
const list = new Map();
|
|
138
|
+
const comps = this.comps;
|
|
139
|
+
comps.forEach(({ name, path }) => {
|
|
140
|
+
const pageConfigPath = this.getConfigFilePath(path);
|
|
141
|
+
list.set(name, pageConfigPath);
|
|
142
|
+
});
|
|
143
|
+
__classPrivateFieldSet(this, _AppHelper_compsConfigList, list, "f");
|
|
98
144
|
}
|
|
99
|
-
return this
|
|
145
|
+
return __classPrivateFieldGet(this, _AppHelper_compsConfigList, "f");
|
|
100
146
|
}
|
|
101
147
|
getConfigFilePath(filePath = '') {
|
|
102
148
|
// console.log('filePath: ', filePath)
|
|
103
149
|
return (0, helper_1.resolveMainFilePath)(`${filePath.replace(path_1.default.extname(filePath), '')}.config`);
|
|
104
150
|
}
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
return filePath + targetExtname;
|
|
151
|
+
clear() {
|
|
152
|
+
__classPrivateFieldSet(this, _AppHelper_appConfig, undefined, "f");
|
|
153
|
+
__classPrivateFieldSet(this, _AppHelper_pages, undefined, "f");
|
|
154
|
+
__classPrivateFieldSet(this, _AppHelper_pagesConfigList, undefined, "f");
|
|
110
155
|
}
|
|
111
156
|
}
|
|
112
|
-
exports.default =
|
|
113
|
-
|
|
157
|
+
exports.default = AppHelper;
|
|
158
|
+
_AppHelper_appConfig = new WeakMap(), _AppHelper_pages = new WeakMap(), _AppHelper_pagesConfigList = new WeakMap(), _AppHelper_comps = new WeakMap(), _AppHelper_compsConfigList = new WeakMap();
|
|
159
|
+
//# sourceMappingURL=app.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/utils/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../src/utils/component.ts"],"names":[],"mappings":";;;AAEa,QAAA,eAAe,GAAqB;IAC/C,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IACpI,OAAO,EAAE,IAAI,GAAG,EAAE;IAClB,oBAAoB,EAAE,IAAI,GAAG,EAAE;IAC/B,UAAU,EAAE,KAAK;CAClB,CAAA"}
|
package/dist/utils/webpack.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getChunkIdOrName = exports.getChunkEntryModule = exports.addRequireToSource = void 0;
|
|
6
|
+
exports.chunkHasJs = exports.getChunkIdOrName = exports.getChunkEntryModule = exports.addRequireToSource = void 0;
|
|
7
7
|
const helper_1 = require("@tarojs/helper");
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const webpack_1 = require("webpack");
|
|
@@ -37,4 +37,12 @@ function getChunkIdOrName(chunk) {
|
|
|
37
37
|
return chunk.name;
|
|
38
38
|
}
|
|
39
39
|
exports.getChunkIdOrName = getChunkIdOrName;
|
|
40
|
+
function chunkHasJs(chunk, chunkGraph) {
|
|
41
|
+
if (chunk.name === chunk.runtime)
|
|
42
|
+
return true;
|
|
43
|
+
if (chunkGraph.getNumberOfEntryModules(chunk) > 0)
|
|
44
|
+
return true;
|
|
45
|
+
return Boolean(chunkGraph.getChunkModulesIterableBySourceType(chunk, 'javascript'));
|
|
46
|
+
}
|
|
47
|
+
exports.chunkHasJs = chunkHasJs;
|
|
40
48
|
//# sourceMappingURL=webpack.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../src/utils/webpack.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAoD;AACpD,gDAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../src/utils/webpack.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAoD;AACpD,gDAAuB;AACvB,qCAAiC;AAIjC,MAAM,EAAE,YAAY,EAAE,GAAG,iBAAO,CAAA;AAEhC;;GAEG;AACH,SAAgB,kBAAkB,CAAE,EAAU,EAAE,OAAuB,EAAE,YAA0C;IACjH,MAAM,MAAM,GAAG,IAAI,YAAY,EAAE,CAAA;IACjC,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/B,MAAM,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,IAAA,4BAAmB,EAAC,cAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IACrG,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAChB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACnB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACf,OAAO,MAAM,CAAA;AACf,CAAC;AATD,gDASC;AAED,SAAgB,mBAAmB,CAAE,WAAwB,EAAE,KAAY;IACzE,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;AAED,SAAgB,gBAAgB,CAAE,KAAY;IAC5C,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ,EAAE;QAChC,OAAO,KAAK,CAAC,EAAE,CAAA;KAChB;IACD,OAAO,KAAK,CAAC,IAAI,CAAA;AACnB,CAAC;AALD,4CAKC;AAED,SAAgB,UAAU,CAAE,KAAY,EAAE,UAAsB;IAC9D,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO;QAAE,OAAO,IAAI,CAAA;IAC7C,IAAI,UAAU,CAAC,uBAAuB,CAAC,KAAK,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAA;IAE9D,OAAO,OAAO,CAAC,UAAU,CAAC,mCAAmC,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAA;AACrF,CAAC;AALD,gCAKC"}
|
|
@@ -66,8 +66,8 @@ class BaseConfig {
|
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
],
|
|
69
|
-
basic: ((_a = config.logger) === null || _a === void 0 ? void 0 : _a.quiet) ===
|
|
70
|
-
fancy: ((_b = config.logger) === null || _b === void 0 ? void 0 : _b.quiet) !==
|
|
69
|
+
basic: ((_a = config.logger) === null || _a === void 0 ? void 0 : _a.quiet) === true,
|
|
70
|
+
fancy: ((_b = config.logger) === null || _b === void 0 ? void 0 : _b.quiet) !== true,
|
|
71
71
|
})
|
|
72
72
|
},
|
|
73
73
|
watchOptions: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseConfig.js","sourceRoot":"","sources":["../../src/webpack/BaseConfig.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAyE;AACzE,uDAA0D;AAC1D,gDAAuB;AAEvB,kEAAiC;AACjC,sFAAoD;AAEpD,oEAA2C;AAM3C,MAAa,UAAU;IAGrB,YAAa,OAAe,EAAE,MAAc;;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,uBAAK,EAAE,CAAA;QACvC,KAAK,CAAC,KAAK,CAAC;YACV,MAAM,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;YACtB,OAAO,EAAE;gBACP,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;gBAC1D,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE;oBACN,mBAAmB,EAAE;wBACnB,MAAM,EAAE,kCAAmB;wBAC3B,IAAI,EAAE,CAAC,mBAAmB,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC;qBAClD;iBACF;aACF;YACD,aAAa,EAAE;gBACb,OAAO,EAAE,CAAC,cAAc,CAAC;aAC1B;YACD,MAAM,EAAE;gBACN,kBAAkB,EAAE,cAAc;aACnC;YACD,MAAM,EAAE;gBACN,UAAU,EAAE,uBAAa,CAAC,mBAAmB,CAAC;oBAC5C,SAAS,EAAE;wBACT,OAAO;wBACP,OAAO;wBACP;4BACE,IAAI,CAAE,QAAQ,EAAE,EAAE,KAAK,EAAoB;;gCACzC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAA,iCAAc,EAAC,KAAK,CAAC,CAAA;gCAElD,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;oCACvB,OAAO,CAAC,GAAG,CAAC,cAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAA;oCACzD,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;iCAC7C;gCAED,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE;oCACrB,OAAO,CAAC,GAAG,CAAC,cAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAA;oCACxC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;oCAC1C,CAAC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;iCACnC;gCAED,IAAI,MAAM,CAAC,OAAO,EAAE;oCAClB,OAAO,CAAC,GAAG,CAAC,cAAK,CAAC,IAAI,CAAC,kBAAkB,IAAI,IAAI,EAAE,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,CAAA;iCAC5E;gCAED,IAAI,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,KAAK,MAAK,IAAI,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE;oCACjE,OAAO,CAAC,GAAG,CAAC,cAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAA;oCACxC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC;wCACzB,MAAM,EAAE,IAAI;wCACZ,OAAO,EAAE,KAAK;wCACd,QAAQ,EAAE,KAAK;wCACf,MAAM,EAAE,KAAK;wCACb,YAAY,EAAE,KAAK;qCACpB,CAAC,CAAC,CAAA;iCACJ;4BACH,CAAC;yBACF;qBACF;oBACD,KAAK,EAAE,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,KAAK,MAAK,
|
|
1
|
+
{"version":3,"file":"BaseConfig.js","sourceRoot":"","sources":["../../src/webpack/BaseConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,10 +18,13 @@ const runner_utils_1 = require("@tarojs/runner-utils");
|
|
|
18
18
|
const shared_1 = require("@tarojs/shared");
|
|
19
19
|
const path_1 = __importDefault(require("path"));
|
|
20
20
|
const webpack_1 = __importDefault(require("webpack"));
|
|
21
|
-
const component_1 = require("../
|
|
21
|
+
const component_1 = require("../utils/component");
|
|
22
22
|
class Combination {
|
|
23
23
|
constructor(appPath, config) {
|
|
24
24
|
var _a, _b;
|
|
25
|
+
this.isWeb = (0, shared_1.isWebPlatform)();
|
|
26
|
+
/** special mode */
|
|
27
|
+
this.isBuildNativeComp = false;
|
|
25
28
|
this.appPath = appPath;
|
|
26
29
|
this.rawConfig = config;
|
|
27
30
|
this.sourceRoot = config.sourceRoot || 'src';
|
|
@@ -33,11 +36,16 @@ class Combination {
|
|
|
33
36
|
make() {
|
|
34
37
|
return __awaiter(this, void 0, void 0, function* () {
|
|
35
38
|
yield this.pre(this.rawConfig);
|
|
36
|
-
this.process(this.config
|
|
39
|
+
this.process(this.config);
|
|
37
40
|
yield this.post(this.config, this.chain);
|
|
38
41
|
});
|
|
39
42
|
}
|
|
40
|
-
process(
|
|
43
|
+
process(config) {
|
|
44
|
+
const { isBuildNativeComp = false } = config;
|
|
45
|
+
if (isBuildNativeComp) {
|
|
46
|
+
this.isBuildNativeComp = true;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
41
49
|
pre(rawConfig) {
|
|
42
50
|
return __awaiter(this, void 0, void 0, function* () {
|
|
43
51
|
const preMode = rawConfig.mode || process.env.NODE_ENV;
|
|
@@ -68,11 +76,13 @@ class Combination {
|
|
|
68
76
|
return this.enableSourceMap && sourceMapType;
|
|
69
77
|
}
|
|
70
78
|
getPrebundleOptions() {
|
|
79
|
+
if (this.isBuildNativeComp)
|
|
80
|
+
return { enable: false };
|
|
71
81
|
if (this.prebundleOptions)
|
|
72
82
|
return this.prebundleOptions;
|
|
73
83
|
const include = ['@tarojs/taro', '@tarojs/runtime'];
|
|
74
84
|
const exclude = [];
|
|
75
|
-
if (
|
|
85
|
+
if (this.isWeb) {
|
|
76
86
|
include.push('@tarojs/router');
|
|
77
87
|
}
|
|
78
88
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Combination.js","sourceRoot":"","sources":["../../src/webpack/Combination.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAsE;AACtE,uDAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"Combination.js","sourceRoot":"","sources":["../../src/webpack/Combination.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.H5Combination = void 0;
|
|
7
|
-
const helper_1 = require("@tarojs/helper");
|
|
8
|
-
const path_1 = __importDefault(require("path"));
|
|
9
7
|
const utils_1 = require("../utils");
|
|
10
|
-
const
|
|
8
|
+
const app_1 = __importDefault(require("../utils/app"));
|
|
11
9
|
const Combination_1 = require("./Combination");
|
|
12
10
|
const H5BaseConfig_1 = require("./H5BaseConfig");
|
|
13
11
|
const H5WebpackModule_1 = require("./H5WebpackModule");
|
|
@@ -17,24 +15,34 @@ class H5Combination extends Combination_1.Combination {
|
|
|
17
15
|
super(...arguments);
|
|
18
16
|
this.webpackPlugin = new H5WebpackPlugin_1.H5WebpackPlugin(this);
|
|
19
17
|
this.webpackModule = new H5WebpackModule_1.H5WebpackModule(this);
|
|
18
|
+
this.isMultiRouterMode = false;
|
|
20
19
|
}
|
|
21
20
|
process(config) {
|
|
22
|
-
var _a;
|
|
21
|
+
var _a, _b;
|
|
22
|
+
super.process(config);
|
|
23
23
|
const baseConfig = new H5BaseConfig_1.H5BaseConfig(this.appPath, config);
|
|
24
24
|
const chain = this.chain = baseConfig.chain;
|
|
25
25
|
const { entry = {}, output = {}, entryFileName = 'app', mode = 'production', sourceMapType = 'eval-cheap-module-source-map', publicPath = '/', chunkDirectory = 'chunk', alias = {}, router, frameworkExts } = config;
|
|
26
26
|
const routerMode = (router === null || router === void 0 ? void 0 : router.mode) || 'hash';
|
|
27
|
-
|
|
28
|
-
this.
|
|
27
|
+
this.isMultiRouterMode = routerMode === 'multi';
|
|
28
|
+
this.appHelper = new app_1.default(entry, {
|
|
29
29
|
sourceDir: this.sourceDir,
|
|
30
30
|
frameworkExts,
|
|
31
31
|
entryFileName
|
|
32
32
|
});
|
|
33
|
-
if (
|
|
33
|
+
if (this.isBuildNativeComp) {
|
|
34
34
|
delete entry[entryFileName];
|
|
35
|
-
this.
|
|
35
|
+
this.appHelper.compsConfigList.forEach((comp, index) => {
|
|
36
|
+
entry[index] = [comp];
|
|
37
|
+
});
|
|
38
|
+
this.webpackPlugin.pages = (_a = this.appHelper.appConfig) === null || _a === void 0 ? void 0 : _a.components;
|
|
39
|
+
}
|
|
40
|
+
else if (this.isMultiRouterMode) {
|
|
41
|
+
delete entry[entryFileName];
|
|
42
|
+
this.appHelper.pagesConfigList.forEach((page, index) => {
|
|
36
43
|
entry[index] = [page];
|
|
37
44
|
});
|
|
45
|
+
this.webpackPlugin.pages = (_b = this.appHelper.appConfig) === null || _b === void 0 ? void 0 : _b.pages;
|
|
38
46
|
}
|
|
39
47
|
const webpackOutput = this.getOutput({
|
|
40
48
|
publicPath,
|
|
@@ -44,9 +52,6 @@ class H5Combination extends Combination_1.Combination {
|
|
|
44
52
|
});
|
|
45
53
|
const module = this.webpackModule.getModules();
|
|
46
54
|
const [, pxtransformOption] = this.webpackModule.__postcssOption.find(([name]) => name === 'postcss-pxtransform') || [];
|
|
47
|
-
if (isMultiRouterMode) {
|
|
48
|
-
this.webpackPlugin.pages = (_a = this.inst.appConfig) === null || _a === void 0 ? void 0 : _a.pages;
|
|
49
|
-
}
|
|
50
55
|
this.webpackPlugin.pxtransformOption = pxtransformOption;
|
|
51
56
|
const plugin = this.webpackPlugin.getPlugins();
|
|
52
57
|
chain.merge({
|
|
@@ -103,14 +108,6 @@ class H5Combination extends Combination_1.Combination {
|
|
|
103
108
|
}
|
|
104
109
|
return optimization;
|
|
105
110
|
}
|
|
106
|
-
getConfigFilePath(filePath = '') {
|
|
107
|
-
return (0, helper_1.resolveMainFilePath)(`${filePath.replace(path_1.default.extname(filePath), '')}.config`);
|
|
108
|
-
}
|
|
109
|
-
getPagesConfigList(pages = []) {
|
|
110
|
-
const pageMap = new Map();
|
|
111
|
-
pages.forEach((page) => pageMap.set(page, this.getConfigFilePath(path_1.default.join(this.sourceDir, page))));
|
|
112
|
-
return pageMap;
|
|
113
|
-
}
|
|
114
111
|
}
|
|
115
112
|
exports.H5Combination = H5Combination;
|
|
116
113
|
//# sourceMappingURL=H5Combination.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"H5Combination.js","sourceRoot":"","sources":["../../src/webpack/H5Combination.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"H5Combination.js","sourceRoot":"","sources":["../../src/webpack/H5Combination.ts"],"names":[],"mappings":"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"}
|