@tarojs/service 3.7.0-canary.0 → 3.8.0-canary.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Config.js.map +1 -1
- package/dist/Kernel.js.map +1 -1
- package/dist/platform-plugin-base/mini.js +10 -6
- package/dist/platform-plugin-base/mini.js.map +1 -1
- package/dist/platform-plugin-base/platform.js +2 -2
- package/dist/platform-plugin-base/platform.js.map +1 -1
- package/dist/platform-plugin-base/web.js +8 -5
- package/dist/platform-plugin-base/web.js.map +1 -1
- package/dist/utils/index.js.map +1 -1
- package/package.json +4 -5
- package/src/Config.ts +3 -3
- package/src/Kernel.ts +5 -5
- package/src/platform-plugin-base/mini.ts +19 -11
- package/src/platform-plugin-base/platform.ts +3 -3
- package/src/platform-plugin-base/web.ts +8 -6
- package/src/utils/index.ts +3 -3
- package/src/utils/types.ts +2 -6
- package/types/platform-plugin-base/platform.d.ts +1 -1
- package/types/utils/types.d.ts +2 -9
package/dist/Config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../src/Config.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2CAWuB;AACvB,2BAA0B;AAC1B,6BAA4B;AAC5B,uCAAsC;AAEtC,iDAG0B;AAS1B,MAAqB,MAAM;IAQzB,YAAa,IAAoB;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC3B,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,mBAAmB,CAAA,CAAA;IACxD,CAAC;IAEK,IAAI,CAAE,SAGX;;YACC,IAAI,CAAC,aAAa,GAAG,EAAE,CAAA;YACvB,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAA;YAC7B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAA;YAC1B,IAAI,CAAC,UAAU,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,2BAAe,EAAE,+BAAmB,CAAC,CAAC,CAAA;YAClG,IAAI,CAAC,WAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;gBACnC,
|
|
1
|
+
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../src/Config.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2CAWuB;AACvB,2BAA0B;AAC1B,6BAA4B;AAC5B,uCAAsC;AAEtC,iDAG0B;AAS1B,MAAqB,MAAM;IAQzB,YAAa,IAAoB;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC3B,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,mBAAmB,CAAA,CAAA;IACxD,CAAC;IAEK,IAAI,CAAE,SAGX;;YACC,IAAI,CAAC,aAAa,GAAG,EAAE,CAAA;YACvB,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAA;YAC7B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAA;YAC1B,IAAI,CAAC,UAAU,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,2BAAe,EAAE,+BAAmB,CAAC,CAAC,CAAA;YAClG,IAAI,CAAC,WAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;gBACnC,IAAG,IAAI,CAAC,mBAAmB;oBAAE,OAAM;gBACnC,IAAI,CAAC,gBAAgB,EAAE,CAAA;aACxB;iBAAM;gBACL,IAAA,0BAAiB,EAAC;oBAChB,IAAI,EAAE;wBACJ,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,2BAAe,CAAC,CAAC,IAAI,CAAC;qBAC5E;iBACF,CAAC,CAAA;gBACF,IAAI;oBACF,MAAM,UAAU,GAAG,IAAA,+BAAsB,EAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAA;oBACnE,IAAI,CAAC,aAAa,GAAG,OAAO,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;oBACvG,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;iBAC1B;gBAAC,OAAO,GAAG,EAAE;oBACZ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;iBACjB;aACF;QACH,CAAC;KAAA;IAED,gBAAgB;QACd,MAAM,OAAO,GAAG,IAAA,uBAAc,GAAE,CAAA;QAChC,IAAG,CAAC,OAAO;YAAE,OAAQ,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;QACpD,MAAM,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAA,uBAAc,GAAE,EAAE,+BAAsB,EAAE,gCAAuB,CAAC,CAAA;QAC3G,MAAM,OAAO,GAAG,GAAG,CAAC,qBAAqB,sBAAsB,EAAE,CAAC,CAAC,KAAK,EAAE,CAAA;QAC1E,IAAI,CAAC,WAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC;YAAE,OAAO,OAAO,CAAC,IAAI,CAAC,8BAA8B,sBAAsB,EAAE,CAAC,CAAA;QACvH,IAAI;YACF,IAAI,CAAC,mBAAmB,GAAG,WAAE,CAAC,YAAY,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAA;YACxE,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;SAClC;QAAA,OAAM,CAAC,EAAC;YACP,OAAO,CAAC,IAAI,EAAE,CAAA;YACd,OAAO,CAAC,IAAI,CAAC,+BAA+B,sBAAsB,GAAG,CAAC,CAAA;SACvE;IACH,CAAC;IAED,kBAAkB,CAAE,QAAQ,EAAE,UAAU;QACtC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAA;QACxC,MAAM,aAAa,GAAG,aAAa,CAAC,UAAU,IAAI,mBAAU,CAAA;QAC5D,MAAM,aAAa,GAAG,aAAa,CAAC,UAAU,IAAI,mBAAU,CAAA;QAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;QACxD,MAAM,SAAS,GAAG,cAAK,CAAA;QACvB,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAA;QAExE,MAAM,KAAK,GAAG;YACZ,CAAC,SAAS,CAAC,EAAE,CAAC,aAAa,CAAC;SAC7B,CAAA;QAED,uBACE,KAAK,EACL,KAAK,EAAE,aAAa,CAAC,KAAK,IAAI,EAAE,EAChC,IAAI,EAAE,aAAa,CAAC,IAAI,EACxB,UAAU,EAAE,aAAa,EACzB,UAAU,EAAE,aAAa,EACzB,QAAQ,EACR,SAAS,EAAE,aAAa,CAAC,SAAS,EAClC,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAChC,KAAK,EAAE,aAAa,CAAC,KAAK,EAC1B,MAAM,EAAE,aAAa,CAAC,MAAM,EAC5B,SAAS,EAAE,aAAa,CAAC,SAAS,EAClC,IAAI,EAAE,aAAa,CAAC,IAAI,EACxB,IAAI,EAAE,aAAa,CAAC,IAAI,EACxB,MAAM,EAAE,aAAa,CAAC,MAAM,EAC5B,OAAO,EAAE,aAAa,CAAC,OAAO,EAC9B,WAAW,EAAE,aAAa,CAAC,WAAW,EACtC,GAAG,EAAE,aAAa,CAAC,GAAG,EACtB,eAAe,EAAE,aAAa,CAAC,eAAe,EAC9C,WAAW,EAAE,aAAa,CAAC,WAAW,EACtC,WAAW,EAAE,aAAa,CAAC,WAAW,EACtC,iBAAiB,EAAE,aAAa,CAAC,iBAAiB,EAClD,WAAW,EAAE,aAAa,CAAC,WAAW,EACtC,YAAY,EAAE,aAAa,CAAC,YAAY,EACxC,MAAM,EAAE,aAAa,CAAC,MAAM,EAC5B,OAAO,EAAE,aAAa,CAAC,OAAO,IAC3B,aAAa,CAAC,UAAU,CAAC,EAC7B;IACH,CAAC;CACF;AAhGD,yBAgGC"}
|
package/dist/Kernel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Kernel.js","sourceRoot":"","sources":["../src/Kernel.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Kernel.js","sourceRoot":"","sources":["../src/Kernel.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,10 +33,17 @@ class TaroPlatformBase extends platform_1.default {
|
|
|
33
33
|
}
|
|
34
34
|
setupImpl() {
|
|
35
35
|
var _a;
|
|
36
|
-
const {
|
|
37
|
-
|
|
36
|
+
const { output } = this.config;
|
|
37
|
+
// webpack5 原生支持 output.clean 选项，但是 webpack4 不支持， 为统一行为，这里做一下兼容
|
|
38
|
+
// （在 packages/taro-mini-runner/src/webpack/chain.ts 和 packages/taro-webpack-runner/src/utils/chain.ts 的 makeConfig 中对 clean 选项做了过滤）
|
|
39
|
+
// 仅 output.clean 为 false 时不清空输出目录
|
|
40
|
+
// eslint-disable-next-line eqeqeq
|
|
41
|
+
if (output == undefined || output.clean == undefined || output.clean === true) {
|
|
38
42
|
this.emptyOutputDir();
|
|
39
43
|
}
|
|
44
|
+
else if ((0, shared_1.isObject)(output.clean)) {
|
|
45
|
+
this.emptyOutputDir(output.clean.keep || []);
|
|
46
|
+
}
|
|
40
47
|
this.printDevelopmentTip(this.platform);
|
|
41
48
|
if (this.projectConfigJson) {
|
|
42
49
|
this.generateProjectConfig(this.projectConfigJson);
|
|
@@ -81,9 +88,6 @@ ${exampleCommand}`));
|
|
|
81
88
|
case 'webpack5':
|
|
82
89
|
runnerPkg = '@tarojs/webpack5-runner';
|
|
83
90
|
break;
|
|
84
|
-
case 'vite':
|
|
85
|
-
runnerPkg = '@tarojs/vite-runner';
|
|
86
|
-
break;
|
|
87
91
|
default:
|
|
88
92
|
runnerPkg = '@tarojs/mini-runner';
|
|
89
93
|
}
|
|
@@ -147,7 +151,7 @@ ${exampleCommand}`));
|
|
|
147
151
|
* 递归替换对象的 key 值
|
|
148
152
|
*/
|
|
149
153
|
recursiveReplaceObjectKeys(obj, keyMap) {
|
|
150
|
-
Object.keys(obj).forEach(key => {
|
|
154
|
+
Object.keys(obj).forEach((key) => {
|
|
151
155
|
if (keyMap[key]) {
|
|
152
156
|
obj[keyMap[key]] = obj[key];
|
|
153
157
|
if (typeof obj[key] === 'object') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mini.js","sourceRoot":"","sources":["../../src/platform-plugin-base/mini.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"mini.js","sourceRoot":"","sources":["../../src/platform-plugin-base/mini.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,9 +45,9 @@ class TaroPlatform {
|
|
|
45
45
|
const _compiler = config.compiler;
|
|
46
46
|
this.compiler = typeof _compiler === 'object' ? _compiler.type : _compiler;
|
|
47
47
|
}
|
|
48
|
-
emptyOutputDir() {
|
|
48
|
+
emptyOutputDir(excludes = []) {
|
|
49
49
|
const { outputPath } = this.ctx.paths;
|
|
50
|
-
this.helper.emptyDirectory(outputPath);
|
|
50
|
+
this.helper.emptyDirectory(outputPath, { excludes });
|
|
51
51
|
}
|
|
52
52
|
/**
|
|
53
53
|
* 如果分端编译详情 webpack 配置了 output 则需更新 outputPath 位置
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../../src/platform-plugin-base/platform.ts"],"names":[],"mappings":";;;;;;;;;;;;AASA,MAAa,WAAW;IAAxB;QACE,aAAQ,GAAe,EAAE,CAAA;IAqB3B,CAAC;IAnBO,OAAO,CAAE,EAAQ,EAAE,KAAQ,EAAE,GAAG,IAAW;;YAC/C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YACnB,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAA;YAC7B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QACtB,CAAC;KAAA;IAED,OAAO,CAAE,KAAQ;QACf,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC9B,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,WAAC,OAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,IAAI,CAAC,KAAK,CAAC,CAAA,EAAA,CAAC,CAAA;IACxD,CAAC;IAED,QAAQ,CAAE,KAAQ;QAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC9B,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,WAAC,OAAA,MAAA,OAAO,CAAC,KAAK,0CAAE,IAAI,CAAC,KAAK,CAAC,CAAA,EAAA,CAAC,CAAA;IACzD,CAAC;IAED,UAAU,CAAE,OAAiB;QAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC7B,CAAC;CACF;AAtBD,kCAsBC;AAED,MAA8B,YAAY;IAaxC,YAAa,GAAmB,EAAE,MAAS;QAHjC,qBAAgB,GAAG,IAAI,WAAW,EAAQ,CAAA;QAC1C,qBAAgB,GAAG,IAAI,WAAW,EAAQ,CAAA;QAGlD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QAC7B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAA;QACjC,IAAI,CAAC,QAAQ,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5E,CAAC;IAES,cAAc;
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../../src/platform-plugin-base/platform.ts"],"names":[],"mappings":";;;;;;;;;;;;AASA,MAAa,WAAW;IAAxB;QACE,aAAQ,GAAe,EAAE,CAAA;IAqB3B,CAAC;IAnBO,OAAO,CAAE,EAAQ,EAAE,KAAQ,EAAE,GAAG,IAAW;;YAC/C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;YACnB,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAA;YAC7B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QACtB,CAAC;KAAA;IAED,OAAO,CAAE,KAAQ;QACf,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC9B,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,WAAC,OAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,IAAI,CAAC,KAAK,CAAC,CAAA,EAAA,CAAC,CAAA;IACxD,CAAC;IAED,QAAQ,CAAE,KAAQ;QAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC9B,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,WAAC,OAAA,MAAA,OAAO,CAAC,KAAK,0CAAE,IAAI,CAAC,KAAK,CAAC,CAAA,EAAA,CAAC,CAAA;IACzD,CAAC;IAED,UAAU,CAAE,OAAiB;QAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC7B,CAAC;CACF;AAtBD,kCAsBC;AAED,MAA8B,YAAY;IAaxC,YAAa,GAAmB,EAAE,MAAS;QAHjC,qBAAgB,GAAG,IAAI,WAAW,EAAQ,CAAA;QAC1C,qBAAgB,GAAG,IAAI,WAAW,EAAQ,CAAA;QAGlD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QAC7B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAA;QACjC,IAAI,CAAC,QAAQ,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;IAC5E,CAAC;IAES,cAAc,CAAE,WAAmC,EAAE;QAC7D,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAA;QACrC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;IACtD,CAAC;IAED;;OAEG;IACK,gBAAgB,CAAE,MAAe;;QACvC,MAAM,YAAY,GAAG,MAAA,MAAM,CAAC,MAAM,0CAAE,IAAI,CAAA;QACxC,IAAG,YAAY,EAAE;YACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,GAAG,YAAY,CAAA;SACzC;IACH,CAAC;CAMF;AAzCD,+BAyCC"}
|
|
@@ -32,10 +32,16 @@ class TaroPlatformWeb extends platform_1.default {
|
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
34
|
setupWebApp() {
|
|
35
|
-
const {
|
|
36
|
-
|
|
35
|
+
const { output } = this.config;
|
|
36
|
+
// webpack5 原生支持 output.clean 选项，但是 webpack4 不支持， 为统一行为，这里做一下兼容
|
|
37
|
+
// （在 packages/taro-mini-runner/src/webpack/chain.ts 和 packages/taro-webpack-runner/src/utils/chain.ts 的 makeConfig 中对 clean 选项做了过滤）
|
|
38
|
+
// eslint-disable-next-line eqeqeq
|
|
39
|
+
if (output == undefined || output.clean == undefined || output.clean === true) {
|
|
37
40
|
this.emptyOutputDir();
|
|
38
41
|
}
|
|
42
|
+
else if ((0, shared_1.isObject)(output.clean)) {
|
|
43
|
+
this.emptyOutputDir(output.clean.keep || []);
|
|
44
|
+
}
|
|
39
45
|
this.printDevelopmentTip();
|
|
40
46
|
}
|
|
41
47
|
printDevelopmentTip() {
|
|
@@ -64,9 +70,6 @@ class TaroPlatformWeb extends platform_1.default {
|
|
|
64
70
|
case 'webpack5':
|
|
65
71
|
runnerPkg = '@tarojs/webpack5-runner';
|
|
66
72
|
break;
|
|
67
|
-
case 'vite':
|
|
68
|
-
runnerPkg = '@tarojs/vite-runner';
|
|
69
|
-
break;
|
|
70
73
|
default:
|
|
71
74
|
runnerPkg = '@tarojs/webpack-runner';
|
|
72
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/platform-plugin-base/web.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/platform-plugin-base/web.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;AAAA,2CAA8D;AAC9D,mCAA8B;AAC9B,6BAA4B;AAC5B,mCAAkC;AAO3B,MAAM,QAAQ,GAA8B,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;AAAtE,QAAA,QAAQ,YAA8D;AAEnF,SAAgB,aAAa,CAAE,UAAkB;IAC/C,IAAI,IAAA,gBAAQ,EAAC,UAAU,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,OAAO,UAAU,CAAA;IAC1E,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;AAClD,CAAC;AAHD,sCAGC;AAED,SAAgB,sBAAsB,CAAE,KAAmB;IACzD,OAAO,GAAG,EAAE;QACV,MAAM,GAAG,GAAmB,EAAE,CAAA;QAC9B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACnB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;oBAC5B,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;oBAChC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;iBACjB;qBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBAC9B,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;oBACnC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;iBACpB;YACH,CAAC,CAAC,CAAA;SACH;QACD,OAAO,GAAG,CAAA;IACZ,CAAC,CAAA;AACH,CAAC;AAhBD,wDAgBC;AAED,SAAgB,YAAY,CAAE,IAAkB,EAAE,GAAiB;IACjE,OAAO,GAAG,EAAE;QACV,MAAM,MAAM,GAAG,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAA;QAC5C,MAAM,OAAO,GAAG,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAA;QAC9C,OAAO,IAAA,cAAK,EAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC/B,CAAC,CAAA;AACH,CAAC;AAND,oCAMC;AAED,yBAAyB;AACzB,SAAgB,uBAAuB,CAAE,IAAY,EAAE,IAAoB,EAAE,IAAgB,EAAE,SAAmB;;IAChH,8DAA8D;IAC9D,MAAM,wBAAwB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/service",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.8.0-canary.0",
|
|
4
4
|
"description": "Taro Service",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"types": "types/index.d.ts",
|
|
@@ -30,12 +30,11 @@
|
|
|
30
30
|
"tapable": "^1.1.3",
|
|
31
31
|
"webpack-merge": "^4.2.2",
|
|
32
32
|
"ora": "^5.0.0",
|
|
33
|
-
"@tarojs/helper": "3.
|
|
34
|
-
"@tarojs/shared": "3.
|
|
35
|
-
"@tarojs/taro": "3.
|
|
33
|
+
"@tarojs/helper": "3.8.0-canary.0",
|
|
34
|
+
"@tarojs/shared": "3.8.0-canary.0",
|
|
35
|
+
"@tarojs/taro": "3.8.0-canary.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"vite": "^4.2.0",
|
|
39
38
|
"webpack": "5.78.0"
|
|
40
39
|
},
|
|
41
40
|
"scripts": {
|
package/src/Config.ts
CHANGED
|
@@ -48,7 +48,7 @@ export default class Config {
|
|
|
48
48
|
this.isInitSuccess = false
|
|
49
49
|
this.configPath = resolveScriptPath(path.join(this.appPath, CONFIG_DIR_NAME, DEFAULT_CONFIG_FILE))
|
|
50
50
|
if (!fs.existsSync(this.configPath)) {
|
|
51
|
-
if
|
|
51
|
+
if(this.disableGlobalConfig) return
|
|
52
52
|
this.initGlobalConfig()
|
|
53
53
|
} else {
|
|
54
54
|
createSwcRegister({
|
|
@@ -68,14 +68,14 @@ export default class Config {
|
|
|
68
68
|
|
|
69
69
|
initGlobalConfig () {
|
|
70
70
|
const homedir = getUserHomeDir()
|
|
71
|
-
if
|
|
71
|
+
if(!homedir) return console.error('获取不到用户 home 路径')
|
|
72
72
|
const globalPluginConfigPath = path.join(getUserHomeDir(), TARO_GLOBAL_CONFIG_DIR, TARO_GLOBAL_CONFIG_FILE)
|
|
73
73
|
const spinner = ora(`开始获取 taro 全局配置文件： ${globalPluginConfigPath}`).start()
|
|
74
74
|
if (!fs.existsSync(globalPluginConfigPath)) return spinner.warn(`获取 taro 全局配置文件失败，不存在全局配置文件：${globalPluginConfigPath}`)
|
|
75
75
|
try {
|
|
76
76
|
this.initialGlobalConfig = fs.readJSONSync(globalPluginConfigPath) || {}
|
|
77
77
|
spinner.succeed('获取 taro 全局配置成功')
|
|
78
|
-
}
|
|
78
|
+
}catch(e){
|
|
79
79
|
spinner.stop()
|
|
80
80
|
console.warn(`获取全局配置失败，如果需要启用全局插件请查看配置文件: ${globalPluginConfigPath} `)
|
|
81
81
|
}
|
package/src/Kernel.ts
CHANGED
|
@@ -131,7 +131,7 @@ export default class Kernel extends EventEmitter {
|
|
|
131
131
|
}
|
|
132
132
|
|
|
133
133
|
const globalConfigRootPath = path.join(helper.getUserHomeDir(), helper.TARO_GLOBAL_CONFIG_DIR)
|
|
134
|
-
const resolvedGlobalPresets = resolvePresetsOrPlugins(globalConfigRootPath, globalPresets, PluginType.Plugin, true)
|
|
134
|
+
const resolvedGlobalPresets = resolvePresetsOrPlugins(globalConfigRootPath , globalPresets, PluginType.Plugin, true)
|
|
135
135
|
while (resolvedGlobalPresets.length) {
|
|
136
136
|
this.initPreset(resolvedGlobalPresets.shift()!, true)
|
|
137
137
|
}
|
|
@@ -143,7 +143,7 @@ export default class Kernel extends EventEmitter {
|
|
|
143
143
|
|
|
144
144
|
globalPlugins = merge(this.globalExtraPlugins, globalPlugins)
|
|
145
145
|
const globalConfigRootPath = path.join(helper.getUserHomeDir(), helper.TARO_GLOBAL_CONFIG_DIR)
|
|
146
|
-
const resolvedGlobalPlugins = resolvePresetsOrPlugins(globalConfigRootPath, globalPlugins, PluginType.Plugin, true)
|
|
146
|
+
const resolvedGlobalPlugins = resolvePresetsOrPlugins(globalConfigRootPath , globalPlugins, PluginType.Plugin, true)
|
|
147
147
|
|
|
148
148
|
const resolvedPlugins = resolvedCliAndProjectPlugins.concat(resolvedGlobalPlugins)
|
|
149
149
|
|
|
@@ -185,14 +185,14 @@ export default class Kernel extends EventEmitter {
|
|
|
185
185
|
|
|
186
186
|
applyCliCommandPlugin (commandNames: string[] = []) {
|
|
187
187
|
const existsCliCommand: string[] = []
|
|
188
|
-
for
|
|
188
|
+
for( let i = 0; i < commandNames.length; i++ ) {
|
|
189
189
|
const commandName = commandNames[i]
|
|
190
190
|
const commandFilePath = path.resolve(this.cliCommandsPath, `${commandName}.js`)
|
|
191
|
-
if
|
|
191
|
+
if(this.cliCommands.includes(commandName)) existsCliCommand.push(commandFilePath)
|
|
192
192
|
}
|
|
193
193
|
const commandPlugins = convertPluginsToObject(existsCliCommand || [])()
|
|
194
194
|
helper.createSwcRegister({ only: [ ...Object.keys(commandPlugins) ] })
|
|
195
|
-
const resolvedCommandPlugins = resolvePresetsOrPlugins(this.appPath, commandPlugins, PluginType.Plugin)
|
|
195
|
+
const resolvedCommandPlugins = resolvePresetsOrPlugins(this.appPath , commandPlugins, PluginType.Plugin)
|
|
196
196
|
while (resolvedCommandPlugins.length) {
|
|
197
197
|
this.initPlugin(resolvedCommandPlugins.shift()!)
|
|
198
198
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { recursiveMerge } from '@tarojs/helper'
|
|
2
|
-
import { PLATFORM_TYPE } from '@tarojs/shared'
|
|
2
|
+
import { isObject, PLATFORM_TYPE } from '@tarojs/shared'
|
|
3
3
|
|
|
4
4
|
import { getPkgVersion } from '../utils/package'
|
|
5
5
|
import TaroPlatform from './platform'
|
|
@@ -35,9 +35,15 @@ export abstract class TaroPlatformBase<T extends TConfig = TConfig> extends Taro
|
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
private setupImpl () {
|
|
38
|
-
const {
|
|
39
|
-
|
|
38
|
+
const { output } = this.config
|
|
39
|
+
// webpack5 原生支持 output.clean 选项，但是 webpack4 不支持， 为统一行为，这里做一下兼容
|
|
40
|
+
// （在 packages/taro-mini-runner/src/webpack/chain.ts 和 packages/taro-webpack-runner/src/utils/chain.ts 的 makeConfig 中对 clean 选项做了过滤）
|
|
41
|
+
// 仅 output.clean 为 false 时不清空输出目录
|
|
42
|
+
// eslint-disable-next-line eqeqeq
|
|
43
|
+
if (output == undefined || output.clean == undefined || output.clean === true) {
|
|
40
44
|
this.emptyOutputDir()
|
|
45
|
+
} else if (isObject(output.clean)) {
|
|
46
|
+
this.emptyOutputDir(output.clean.keep || [])
|
|
41
47
|
}
|
|
42
48
|
this.printDevelopmentTip(this.platform)
|
|
43
49
|
if (this.projectConfigJson) {
|
|
@@ -88,9 +94,6 @@ ${exampleCommand}`))
|
|
|
88
94
|
case 'webpack5':
|
|
89
95
|
runnerPkg = '@tarojs/webpack5-runner'
|
|
90
96
|
break
|
|
91
|
-
case 'vite':
|
|
92
|
-
runnerPkg = '@tarojs/vite-runner'
|
|
93
|
-
break
|
|
94
97
|
default:
|
|
95
98
|
runnerPkg = '@tarojs/mini-runner'
|
|
96
99
|
}
|
|
@@ -139,10 +142,15 @@ ${exampleCommand}`))
|
|
|
139
142
|
|
|
140
143
|
private async buildImpl (extraOptions = {}) {
|
|
141
144
|
const runner = await this.getRunner()
|
|
142
|
-
const options = this.getOptions(
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
145
|
+
const options = this.getOptions(
|
|
146
|
+
Object.assign(
|
|
147
|
+
{
|
|
148
|
+
runtimePath: this.runtimePath,
|
|
149
|
+
taroComponentsPath: this.taroComponentsPath
|
|
150
|
+
},
|
|
151
|
+
extraOptions
|
|
152
|
+
)
|
|
153
|
+
)
|
|
146
154
|
await runner(options)
|
|
147
155
|
}
|
|
148
156
|
|
|
@@ -163,7 +171,7 @@ ${exampleCommand}`))
|
|
|
163
171
|
* 递归替换对象的 key 值
|
|
164
172
|
*/
|
|
165
173
|
protected recursiveReplaceObjectKeys (obj, keyMap) {
|
|
166
|
-
Object.keys(obj).forEach(key => {
|
|
174
|
+
Object.keys(obj).forEach((key) => {
|
|
167
175
|
if (keyMap[key]) {
|
|
168
176
|
obj[keyMap[key]] = obj[key]
|
|
169
177
|
if (typeof obj[key] === 'object') {
|
|
@@ -53,9 +53,9 @@ export default abstract class TaroPlatform<T extends TConfig = TConfig> {
|
|
|
53
53
|
this.compiler = typeof _compiler === 'object' ? _compiler.type : _compiler
|
|
54
54
|
}
|
|
55
55
|
|
|
56
|
-
protected emptyOutputDir () {
|
|
56
|
+
protected emptyOutputDir (excludes: Array<string | RegExp> = []) {
|
|
57
57
|
const { outputPath } = this.ctx.paths
|
|
58
|
-
this.helper.emptyDirectory(outputPath)
|
|
58
|
+
this.helper.emptyDirectory(outputPath, { excludes })
|
|
59
59
|
}
|
|
60
60
|
|
|
61
61
|
/**
|
|
@@ -63,7 +63,7 @@ export default abstract class TaroPlatform<T extends TConfig = TConfig> {
|
|
|
63
63
|
*/
|
|
64
64
|
private updateOutputPath (config: TConfig) {
|
|
65
65
|
const platformPath = config.output?.path
|
|
66
|
-
if
|
|
66
|
+
if(platformPath) {
|
|
67
67
|
this.ctx.paths.outputPath = platformPath
|
|
68
68
|
}
|
|
69
69
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PLATFORM_TYPE } from '@tarojs/shared'
|
|
1
|
+
import { isObject, PLATFORM_TYPE } from '@tarojs/shared'
|
|
2
2
|
import { get, merge } from 'lodash'
|
|
3
3
|
import * as path from 'path'
|
|
4
4
|
|
|
@@ -20,9 +20,14 @@ export abstract class TaroPlatformWeb<T extends TConfig = TConfig> extends TaroP
|
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
private setupWebApp () {
|
|
23
|
-
const {
|
|
24
|
-
|
|
23
|
+
const { output } = this.config
|
|
24
|
+
// webpack5 原生支持 output.clean 选项，但是 webpack4 不支持， 为统一行为，这里做一下兼容
|
|
25
|
+
// （在 packages/taro-mini-runner/src/webpack/chain.ts 和 packages/taro-webpack-runner/src/utils/chain.ts 的 makeConfig 中对 clean 选项做了过滤）
|
|
26
|
+
// eslint-disable-next-line eqeqeq
|
|
27
|
+
if (output == undefined || output.clean == undefined || output.clean === true) {
|
|
25
28
|
this.emptyOutputDir()
|
|
29
|
+
} else if (isObject(output.clean)) {
|
|
30
|
+
this.emptyOutputDir(output.clean.keep || [])
|
|
26
31
|
}
|
|
27
32
|
this.printDevelopmentTip()
|
|
28
33
|
}
|
|
@@ -55,9 +60,6 @@ export abstract class TaroPlatformWeb<T extends TConfig = TConfig> extends TaroP
|
|
|
55
60
|
case 'webpack5':
|
|
56
61
|
runnerPkg = '@tarojs/webpack5-runner'
|
|
57
62
|
break
|
|
58
|
-
case 'vite':
|
|
59
|
-
runnerPkg = '@tarojs/vite-runner'
|
|
60
|
-
break
|
|
61
63
|
default:
|
|
62
64
|
runnerPkg = '@tarojs/webpack-runner'
|
|
63
65
|
}
|
package/src/utils/index.ts
CHANGED
|
@@ -44,9 +44,9 @@ export function mergePlugins (dist: PluginItem[], src: PluginItem[]) {
|
|
|
44
44
|
// getModuleDefaultExport
|
|
45
45
|
export function resolvePresetsOrPlugins (root: string, args: IPluginsObject, type: PluginType, skipError?: boolean): IPlugin[] {
|
|
46
46
|
// 全局的插件引入报错，不抛出 Error 影响主流程，而是通过 log 提醒然后把插件 filter 掉，保证主流程不变
|
|
47
|
-
const resolvedPresetsOrPlugins: IPlugin[] =
|
|
47
|
+
const resolvedPresetsOrPlugins: IPlugin[] = []
|
|
48
48
|
const presetsOrPluginsNames = Object.keys(args) || []
|
|
49
|
-
for
|
|
49
|
+
for( let i = 0; i < presetsOrPluginsNames.length; i++ ) {
|
|
50
50
|
const item = presetsOrPluginsNames[i]
|
|
51
51
|
let fPath
|
|
52
52
|
try {
|
|
@@ -78,7 +78,7 @@ export function resolvePresetsOrPlugins (root: string, args: IPluginsObject, typ
|
|
|
78
78
|
} catch (error) {
|
|
79
79
|
console.error(error)
|
|
80
80
|
// 全局的插件运行报错，不抛出 Error 影响主流程，而是通过 log 提醒然后把插件 filter 掉，保证主流程不变
|
|
81
|
-
if
|
|
81
|
+
if(skipError) {
|
|
82
82
|
console.error(`插件依赖 "${item}" 加载失败，请检查插件配置`)
|
|
83
83
|
} else {
|
|
84
84
|
throw new Error(`插件依赖 "${item}" 加载失败，请检查插件配置`)
|
package/src/utils/types.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type helper from '@tarojs/helper'
|
|
2
2
|
import type { IProjectConfig } from '@tarojs/taro/types/compile'
|
|
3
|
-
import type {
|
|
3
|
+
import type { IModifyChainData } from '@tarojs/taro/types/compile/hooks'
|
|
4
4
|
import type joi from 'joi'
|
|
5
5
|
import type Webpack from 'webpack'
|
|
6
6
|
import type Chain from 'webpack-chain'
|
|
@@ -138,11 +138,7 @@ export declare interface IPluginContext {
|
|
|
138
138
|
/**
|
|
139
139
|
* 编译中修改 webpack 配置，在这个钩子中，你可以对 webpackChain 作出想要的调整，等同于配置 [`webpackChain`](./config-detail.md#miniwebpackchain)
|
|
140
140
|
*/
|
|
141
|
-
modifyWebpackChain: (fn: (args: { chain: Chain, webpack: typeof Webpack, data?:
|
|
142
|
-
/**
|
|
143
|
-
* 编译中修改 vite 配置
|
|
144
|
-
*/
|
|
145
|
-
modifyViteConfig: (fn: (args: { viteConfig: any, componentConfig?: IModifyWebpackChain['componentConfig'] }) => void) => void
|
|
141
|
+
modifyWebpackChain: (fn: (args: { chain: Chain, webpack: typeof Webpack, data?: IModifyChainData }) => void) => void
|
|
146
142
|
/**
|
|
147
143
|
* 修改编译后的结果
|
|
148
144
|
*/
|
|
@@ -22,7 +22,7 @@ export default abstract class TaroPlatform<T extends TConfig = TConfig> {
|
|
|
22
22
|
protected setupTransaction: Transaction<this>;
|
|
23
23
|
protected buildTransaction: Transaction<this>;
|
|
24
24
|
constructor(ctx: IPluginContext, config: T);
|
|
25
|
-
protected emptyOutputDir(): void;
|
|
25
|
+
protected emptyOutputDir(excludes?: Array<string | RegExp>): void;
|
|
26
26
|
/**
|
|
27
27
|
* 如果分端编译详情 webpack 配置了 output 则需更新 outputPath 位置
|
|
28
28
|
*/
|
package/types/utils/types.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type helper from '@tarojs/helper';
|
|
2
2
|
import type { IProjectConfig } from '@tarojs/taro/types/compile';
|
|
3
|
-
import type {
|
|
3
|
+
import type { IModifyChainData } from '@tarojs/taro/types/compile/hooks';
|
|
4
4
|
import type joi from 'joi';
|
|
5
5
|
import type Webpack from 'webpack';
|
|
6
6
|
import type Chain from 'webpack-chain';
|
|
@@ -142,14 +142,7 @@ export declare interface IPluginContext {
|
|
|
142
142
|
modifyWebpackChain: (fn: (args: {
|
|
143
143
|
chain: Chain;
|
|
144
144
|
webpack: typeof Webpack;
|
|
145
|
-
data?:
|
|
146
|
-
}) => void) => void;
|
|
147
|
-
/**
|
|
148
|
-
* 编译中修改 vite 配置
|
|
149
|
-
*/
|
|
150
|
-
modifyViteConfig: (fn: (args: {
|
|
151
|
-
viteConfig: any;
|
|
152
|
-
componentConfig?: IModifyWebpackChain['componentConfig'];
|
|
145
|
+
data?: IModifyChainData;
|
|
153
146
|
}) => void) => void;
|
|
154
147
|
/**
|
|
155
148
|
* 修改编译后的结果
|