@tarojs/webpack5-runner 3.8.0-canary.0 → 3.8.0-canary.1
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 +14 -0
- package/dist/index.h5.js +34 -22
- package/dist/index.h5.js.map +1 -1
- package/dist/index.mini.js +12 -2
- package/dist/index.mini.js.map +1 -1
- package/dist/loaders/miniCompilerLoader.js +60 -48
- package/dist/loaders/miniCompilerLoader.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 +18 -7
- package/dist/plugins/BuildNativePlugin.js.map +1 -1
- package/dist/plugins/H5Plugin.js +9 -2
- package/dist/plugins/H5Plugin.js.map +1 -1
- package/dist/plugins/MiniCompileModePlugin.js +317 -0
- package/dist/plugins/MiniCompileModePlugin.js.map +1 -0
- package/dist/plugins/MiniPlugin.js +150 -128
- package/dist/plugins/MiniPlugin.js.map +1 -1
- package/dist/plugins/MiniSplitChunksPlugin.js +10 -3
- package/dist/plugins/MiniSplitChunksPlugin.js.map +1 -1
- package/dist/plugins/TaroComponentsExportsPlugin.js +2 -2
- package/dist/plugins/TaroComponentsExportsPlugin.js.map +1 -1
- package/dist/plugins/TaroNormalModulesPlugin.js +13 -5
- package/dist/plugins/TaroNormalModulesPlugin.js.map +1 -1
- package/dist/utils/app.js +4 -2
- package/dist/utils/app.js.map +1 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/webpack.js +7 -1
- package/dist/utils/webpack.js.map +1 -1
- package/dist/webpack/BaseConfig.js +2 -1
- package/dist/webpack/BaseConfig.js.map +1 -1
- package/dist/webpack/BuildNativePlugin.js +3 -11
- package/dist/webpack/BuildNativePlugin.js.map +1 -1
- package/dist/webpack/Combination.js +2 -2
- package/dist/webpack/Combination.js.map +1 -1
- package/dist/webpack/H5BaseConfig.js +31 -5
- package/dist/webpack/H5BaseConfig.js.map +1 -1
- package/dist/webpack/H5Combination.js +31 -3
- package/dist/webpack/H5Combination.js.map +1 -1
- package/dist/webpack/H5WebpackModule.js +9 -22
- package/dist/webpack/H5WebpackModule.js.map +1 -1
- package/dist/webpack/H5WebpackPlugin.js +8 -1
- package/dist/webpack/H5WebpackPlugin.js.map +1 -1
- package/dist/webpack/MiniCombination.js +11 -5
- package/dist/webpack/MiniCombination.js.map +1 -1
- package/dist/webpack/MiniWebpackModule.js +17 -19
- package/dist/webpack/MiniWebpackModule.js.map +1 -1
- package/dist/webpack/MiniWebpackPlugin.js +16 -42
- package/dist/webpack/MiniWebpackPlugin.js.map +1 -1
- package/index.js +1 -1
- package/package.json +26 -22
package/LICENSE
CHANGED
|
@@ -158,3 +158,17 @@ MIT (stencil-vue2-output-target):
|
|
|
158
158
|
The following files embed [stencil-vue2-output-target](https://github.com/diondree/stencil-vue2-output-target) MIT:
|
|
159
159
|
`/packages/taro-components-library-vue2/src/vue-component-lib/utils.ts`
|
|
160
160
|
See `/LICENSE` for details of the license.
|
|
161
|
+
|
|
162
|
+
==================
|
|
163
|
+
|
|
164
|
+
MIT (weui):
|
|
165
|
+
The following files embed [stencil-vue2-output-target](https://github.com/Tencent/weui) MIT:
|
|
166
|
+
`/packages/taro-components/src/components/*.scss`
|
|
167
|
+
See `/LICENSE.txt` for details of the license.
|
|
168
|
+
|
|
169
|
+
==================
|
|
170
|
+
|
|
171
|
+
Apache-2.0 (intersection-observer):
|
|
172
|
+
The following files embed [intersection-observer](https://github.com/GoogleChromeLabs/intersection-observer) Apache-2.0:
|
|
173
|
+
`/packages/taro-api/src/polyfill/intersection-observer.ts`
|
|
174
|
+
See `/LICENSE.txt` for details of the license.
|
package/dist/index.h5.js
CHANGED
|
@@ -34,9 +34,10 @@ const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
|
|
|
34
34
|
const utils_1 = require("./utils");
|
|
35
35
|
const app_1 = __importDefault(require("./utils/app"));
|
|
36
36
|
const logHelper_1 = require("./utils/logHelper");
|
|
37
|
+
const webpack_2 = require("./utils/webpack");
|
|
37
38
|
const H5Combination_1 = require("./webpack/H5Combination");
|
|
38
39
|
function build(appPath, rawConfig) {
|
|
39
|
-
var _a, _b, _c;
|
|
40
|
+
var _a, _b, _c, _d;
|
|
40
41
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
42
|
const combination = new H5Combination_1.H5Combination(appPath, rawConfig);
|
|
42
43
|
yield combination.make();
|
|
@@ -53,7 +54,10 @@ function build(appPath, rawConfig) {
|
|
|
53
54
|
entryFileName,
|
|
54
55
|
entry,
|
|
55
56
|
isWatch: combination.config.isWatch,
|
|
56
|
-
publicPath
|
|
57
|
+
publicPath,
|
|
58
|
+
alias: combination.config.alias,
|
|
59
|
+
defineConstants: combination.config.defineConstants,
|
|
60
|
+
modifyAppConfig: combination.config.modifyAppConfig
|
|
57
61
|
});
|
|
58
62
|
try {
|
|
59
63
|
yield prebundle.run(combination.getPrebundleOptions());
|
|
@@ -65,9 +69,11 @@ function build(appPath, rawConfig) {
|
|
|
65
69
|
}
|
|
66
70
|
const webpackConfig = combination.chain.toConfig();
|
|
67
71
|
const config = combination.config;
|
|
68
|
-
const
|
|
72
|
+
const errorLevel = typeof config.compiler !== 'string' && ((_a = config.compiler) === null || _a === void 0 ? void 0 : _a.errorLevel) || 0;
|
|
69
73
|
try {
|
|
70
|
-
if (!isWatch) {
|
|
74
|
+
if (!config.isWatch) {
|
|
75
|
+
if (config.withoutBuild)
|
|
76
|
+
return;
|
|
71
77
|
const compiler = (0, webpack_1.default)(webpackConfig);
|
|
72
78
|
prebundle === null || prebundle === void 0 ? void 0 : prebundle.postCompilerStart(compiler);
|
|
73
79
|
compiler.hooks.emit.tapAsync('taroBuildDone', (compilation, callback) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -89,6 +95,7 @@ function build(appPath, rawConfig) {
|
|
|
89
95
|
});
|
|
90
96
|
}
|
|
91
97
|
err ? reject(err) : resolve(stats);
|
|
98
|
+
(0, webpack_2.errorHandling)(errorLevel, stats);
|
|
92
99
|
});
|
|
93
100
|
});
|
|
94
101
|
});
|
|
@@ -101,14 +108,16 @@ function build(appPath, rawConfig) {
|
|
|
101
108
|
const routerBasename = routerConfig.basename || '/';
|
|
102
109
|
webpackConfig.devServer = yield getDevServerOptions(appPath, config);
|
|
103
110
|
const devUrl = (0, url_1.format)({
|
|
104
|
-
protocol: ((
|
|
105
|
-
hostname: (0, utils_1.formatOpenHost)((
|
|
106
|
-
port: (
|
|
111
|
+
protocol: ((_b = webpackConfig.devServer) === null || _b === void 0 ? void 0 : _b.https) ? 'https' : 'http',
|
|
112
|
+
hostname: (0, utils_1.formatOpenHost)((_c = webpackConfig.devServer) === null || _c === void 0 ? void 0 : _c.host),
|
|
113
|
+
port: (_d = webpackConfig.devServer) === null || _d === void 0 ? void 0 : _d.port,
|
|
107
114
|
pathname: routerMode === 'browser' ? routerBasename : '/'
|
|
108
115
|
});
|
|
109
|
-
if (typeof webpackConfig.devServer.open === 'undefined') {
|
|
116
|
+
if (typeof webpackConfig.devServer.open === 'undefined' || webpackConfig.devServer.open === true) {
|
|
110
117
|
webpackConfig.devServer.open = devUrl;
|
|
111
118
|
}
|
|
119
|
+
if (config.withoutBuild)
|
|
120
|
+
return;
|
|
112
121
|
const compiler = (0, webpack_1.default)(webpackConfig);
|
|
113
122
|
const server = new webpack_dev_server_1.default(webpackConfig.devServer, compiler);
|
|
114
123
|
prebundle === null || prebundle === void 0 ? void 0 : prebundle.postCompilerStart(compiler);
|
|
@@ -127,6 +136,7 @@ function build(appPath, rawConfig) {
|
|
|
127
136
|
isWatch: true
|
|
128
137
|
});
|
|
129
138
|
}
|
|
139
|
+
(0, webpack_2.errorHandling)(errorLevel, stats);
|
|
130
140
|
});
|
|
131
141
|
compiler.hooks.failed.tap('taroBuildDone', error => {
|
|
132
142
|
if ((0, shared_1.isFunction)(config.onBuildFinish)) {
|
|
@@ -136,6 +146,7 @@ function build(appPath, rawConfig) {
|
|
|
136
146
|
isWatch: true
|
|
137
147
|
});
|
|
138
148
|
}
|
|
149
|
+
process.exit(1);
|
|
139
150
|
});
|
|
140
151
|
return new Promise((resolve, reject) => {
|
|
141
152
|
server.startCallback(err => {
|
|
@@ -151,7 +162,7 @@ function build(appPath, rawConfig) {
|
|
|
151
162
|
}
|
|
152
163
|
catch (err) {
|
|
153
164
|
console.error(err);
|
|
154
|
-
!isWatch && process.exit(1);
|
|
165
|
+
!config.isWatch && process.exit(1);
|
|
155
166
|
}
|
|
156
167
|
});
|
|
157
168
|
}
|
|
@@ -159,13 +170,6 @@ exports.default = build;
|
|
|
159
170
|
function getDevServerOptions(appPath, config) {
|
|
160
171
|
var _a, _b;
|
|
161
172
|
return __awaiter(this, void 0, void 0, function* () {
|
|
162
|
-
if (config.isBuildNativeComp) {
|
|
163
|
-
return {
|
|
164
|
-
devMiddleware: {
|
|
165
|
-
writeToDisk: true
|
|
166
|
-
}
|
|
167
|
-
};
|
|
168
|
-
}
|
|
169
173
|
const publicPath = (0, utils_1.parsePublicPath)(config.publicPath);
|
|
170
174
|
const outputPath = path_1.default.join(appPath, config.outputRoot || 'dist');
|
|
171
175
|
const _c = config.devServer || {}, { proxy: customProxy = [] } = _c, customDevServerOption = __rest(_c, ["proxy"]);
|
|
@@ -177,7 +181,9 @@ function getDevServerOptions(appPath, config) {
|
|
|
177
181
|
const app = new app_1.default(config.entry, {
|
|
178
182
|
sourceDir: path_1.default.join(appPath, config.sourceRoot || helper_1.SOURCE_DIR),
|
|
179
183
|
frameworkExts: config.frameworkExts,
|
|
180
|
-
entryFileName: config.entryFileName
|
|
184
|
+
entryFileName: config.entryFileName,
|
|
185
|
+
alias: config.alias,
|
|
186
|
+
defineConstants: config.defineConstants,
|
|
181
187
|
});
|
|
182
188
|
const appConfig = app.appConfig;
|
|
183
189
|
const customRoutes = routerConfig.customRoutes || {};
|
|
@@ -236,11 +242,16 @@ function getDevServerOptions(appPath, config) {
|
|
|
236
242
|
return item;
|
|
237
243
|
}));
|
|
238
244
|
}
|
|
245
|
+
else {
|
|
246
|
+
proxy.push(...customProxy);
|
|
247
|
+
}
|
|
239
248
|
const chunkFilename = (_b = (_a = config.output) === null || _a === void 0 ? void 0 : _a.chunkFilename) !== null && _b !== void 0 ? _b : `${config.chunkDirectory || 'chunk'}/[name].js`;
|
|
240
249
|
const devServerOptions = (0, helper_1.recursiveMerge)({
|
|
250
|
+
open: !config.isBuildNativeComp,
|
|
251
|
+
allowedHosts: 'all',
|
|
241
252
|
devMiddleware: {
|
|
242
253
|
publicPath,
|
|
243
|
-
writeToDisk:
|
|
254
|
+
writeToDisk: config.isBuildNativeComp
|
|
244
255
|
},
|
|
245
256
|
static: [{
|
|
246
257
|
directory: outputPath,
|
|
@@ -267,13 +278,14 @@ function getDevServerOptions(appPath, config) {
|
|
|
267
278
|
const pathname = chunkFilename.replace('[name]', path_1.default.basename(context.parsedUrl.pathname).replace(/\.[^.]*.hot-update\.(js|json)/, ''));
|
|
268
279
|
return (['', 'auto'].includes(publicPath) ? '' : publicPath) + pathname;
|
|
269
280
|
}
|
|
270
|
-
}, {
|
|
271
|
-
from: /./,
|
|
272
|
-
to: publicPath
|
|
273
281
|
}]
|
|
274
282
|
},
|
|
275
283
|
proxy
|
|
276
|
-
}, customDevServerOption
|
|
284
|
+
}, customDevServerOption, {
|
|
285
|
+
historyApiFallback: {
|
|
286
|
+
rewrites: [{ from: /./, to: publicPath }]
|
|
287
|
+
}
|
|
288
|
+
});
|
|
277
289
|
const originalPort = Number(devServerOptions.port);
|
|
278
290
|
const availablePort = yield (0, detect_port_1.default)(originalPort);
|
|
279
291
|
if (availablePort !== originalPort) {
|
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,sDAA6B;AAC7B,4EAAiD;AAEjD,mCAA4H;AAC5H,sDAAmC;AACnC,iDAAkF;AAClF,2DAAuD;AAKvD,SAA8B,KAAK,CAAE,OAAe,EAAE,SAAwB;;;QAC5E,MAAM,WAAW,GAAG,IAAI,6BAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QACzD,MAAM,WAAW,CAAC,IAAI,EAAE,CAAA;QAExB,MAAM,EAAE,cAAc,GAAG,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,aAAa,GAAG,KAAK,EAAE,KAAK,GAAG,EAAE,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC,MAAM,CAAA;QAClI,IAAI,SAAS,GAAqB,IAAI,CAAA;QACtC,IAAI,CAAC,WAAW,CAAC,iBAAiB,EAAE;YAClC,SAAS,GAAG,IAAI,4BAAS,CAAC;gBACxB,OAAO;gBACP,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,cAAc;gBACd,SAAS;gBACT,eAAe;gBACf,aAAa;gBACb,KAAK;gBACL,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,OAAO;gBACnC,UAAU;
|
|
1
|
+
{"version":3,"file":"index.h5.js","sourceRoot":"","sources":["../src/index.h5.ts"],"names":[],"mappings":"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"}
|
package/dist/index.mini.js
CHANGED
|
@@ -17,6 +17,7 @@ const webpack5_prebundle_1 = __importDefault(require("@tarojs/webpack5-prebundle
|
|
|
17
17
|
const lodash_1 = require("lodash");
|
|
18
18
|
const webpack_1 = __importDefault(require("webpack"));
|
|
19
19
|
const prerender_1 = require("./prerender/prerender");
|
|
20
|
+
const webpack_2 = require("./utils/webpack");
|
|
20
21
|
const MiniCombination_1 = require("./webpack/MiniCombination");
|
|
21
22
|
function build(appPath, rawConfig) {
|
|
22
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -31,7 +32,10 @@ function build(appPath, rawConfig) {
|
|
|
31
32
|
entry,
|
|
32
33
|
isWatch: combination.config.isWatch,
|
|
33
34
|
runtimePath,
|
|
34
|
-
isBuildPlugin: combination.isBuildPlugin
|
|
35
|
+
isBuildPlugin: combination.isBuildPlugin,
|
|
36
|
+
alias: combination.config.alias,
|
|
37
|
+
defineConstants: combination.config.defineConstants,
|
|
38
|
+
modifyAppConfig: combination.config.modifyAppConfig
|
|
35
39
|
});
|
|
36
40
|
try {
|
|
37
41
|
yield prebundle.run(combination.getPrebundleOptions());
|
|
@@ -43,6 +47,8 @@ function build(appPath, rawConfig) {
|
|
|
43
47
|
const webpackConfig = combination.chain.toConfig();
|
|
44
48
|
const config = combination.config;
|
|
45
49
|
return new Promise((resolve, reject) => {
|
|
50
|
+
if (config.withoutBuild)
|
|
51
|
+
return;
|
|
46
52
|
const compiler = (0, webpack_1.default)(webpackConfig);
|
|
47
53
|
const onBuildFinish = config.onBuildFinish;
|
|
48
54
|
let prerender;
|
|
@@ -56,10 +62,14 @@ function build(appPath, rawConfig) {
|
|
|
56
62
|
});
|
|
57
63
|
};
|
|
58
64
|
const callback = (err, stats) => __awaiter(this, void 0, void 0, function* () {
|
|
65
|
+
var _a;
|
|
66
|
+
const errorLevel = typeof config.compiler !== 'string' && ((_a = config.compiler) === null || _a === void 0 ? void 0 : _a.errorLevel) || 0;
|
|
59
67
|
if (err || stats.hasErrors()) {
|
|
60
68
|
const error = err !== null && err !== void 0 ? err : stats.toJson().errors;
|
|
61
69
|
onFinish(error, null);
|
|
62
|
-
|
|
70
|
+
reject(error);
|
|
71
|
+
(0, webpack_2.errorHandling)(errorLevel, stats);
|
|
72
|
+
return;
|
|
63
73
|
}
|
|
64
74
|
if (!(0, lodash_1.isEmpty)(config.prerender)) {
|
|
65
75
|
prerender = prerender !== null && prerender !== void 0 ? prerender : new prerender_1.Prerender(config, webpackConfig, stats, config.template);
|
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,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;
|
|
1
|
+
{"version":3,"file":"index.mini.js","sourceRoot":"","sources":["../src/index.mini.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -35,11 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
35
12
|
const helper_1 = require("@tarojs/helper");
|
|
36
13
|
const shared_1 = require("@tarojs/shared");
|
|
37
14
|
const loader_utils_1 = require("loader-utils");
|
|
38
|
-
const
|
|
39
|
-
let FILE_COUNTER = 0;
|
|
40
|
-
const FILE_COUNTER_MAP = new Map();
|
|
15
|
+
const MiniCompileModePlugin_1 = require("../plugins/MiniCompileModePlugin");
|
|
41
16
|
const COMPILE_MODE = 'compileMode';
|
|
42
17
|
function default_1(source) {
|
|
18
|
+
var _a;
|
|
43
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
44
20
|
const callback = this.async();
|
|
45
21
|
const options = (0, loader_utils_1.getOptions)(this);
|
|
@@ -48,13 +24,15 @@ function default_1(source) {
|
|
|
48
24
|
if (!((/\.[tj]sx$/.test(resourcePath)) && source.includes(COMPILE_MODE))) {
|
|
49
25
|
return callback(null, source);
|
|
50
26
|
}
|
|
51
|
-
const {
|
|
27
|
+
const { platform, template, FILE_COUNTER_MAP } = options;
|
|
52
28
|
template.componentsAlias = (0, shared_1.getComponentsAlias)(template.internalComponents);
|
|
53
29
|
const components = template.createMiniComponents(template.internalComponents);
|
|
54
30
|
if (!FILE_COUNTER_MAP.has(resourcePath)) {
|
|
55
|
-
FILE_COUNTER_MAP.set(resourcePath,
|
|
31
|
+
FILE_COUNTER_MAP.set(resourcePath, FILE_COUNTER_MAP.size + 1);
|
|
56
32
|
}
|
|
33
|
+
const fileCount = FILE_COUNTER_MAP.get(resourcePath);
|
|
57
34
|
try {
|
|
35
|
+
const identifier = `f${fileCount}`;
|
|
58
36
|
const { code } = yield helper_1.swc
|
|
59
37
|
.transform(source, {
|
|
60
38
|
filename: resourcePath,
|
|
@@ -66,14 +44,18 @@ function default_1(source) {
|
|
|
66
44
|
decorators: true
|
|
67
45
|
},
|
|
68
46
|
transform: {
|
|
69
|
-
legacyDecorator: true
|
|
47
|
+
legacyDecorator: true,
|
|
48
|
+
react: {
|
|
49
|
+
runtime: 'automatic'
|
|
50
|
+
}
|
|
70
51
|
},
|
|
71
52
|
experimental: {
|
|
72
53
|
plugins: [
|
|
73
54
|
[
|
|
74
|
-
|
|
55
|
+
'@tarojs/helper/swc/swc_plugin_compile_mode.wasm',
|
|
75
56
|
{
|
|
76
|
-
|
|
57
|
+
platform,
|
|
58
|
+
tmpl_prefix: identifier,
|
|
77
59
|
components,
|
|
78
60
|
adapter: template.Adapter,
|
|
79
61
|
}
|
|
@@ -82,26 +64,46 @@ function default_1(source) {
|
|
|
82
64
|
}
|
|
83
65
|
}
|
|
84
66
|
});
|
|
85
|
-
const
|
|
67
|
+
const templatesList = [];
|
|
68
|
+
const RE_TEMPLATES = /var\s+TARO_TEMPLATES_(\w+)\s*=\s*'(.+)';/g;
|
|
69
|
+
// 抓取模板内容
|
|
86
70
|
let res;
|
|
87
|
-
while ((res =
|
|
88
|
-
const [,
|
|
89
|
-
const outputPath = path.join(outputDir, 'taro_xmls', `${$0}${fileType.templ}`);
|
|
71
|
+
while ((res = RE_TEMPLATES.exec(code)) !== null) {
|
|
72
|
+
const [, , raw] = res;
|
|
90
73
|
// 小程序 xml 不支持 unescape，在此处对被 SWC 转义后的字符作还原
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
74
|
+
const content = unescape(raw);
|
|
75
|
+
templatesList.push(content);
|
|
76
|
+
}
|
|
77
|
+
// 输出模板内容到单独的文件或 base.xml
|
|
78
|
+
const templatesString = templatesList.join('\n');
|
|
79
|
+
if (template.isXMLSupportRecursiveReference) {
|
|
80
|
+
(_a = this._module) === null || _a === void 0 ? void 0 : _a.addDependency(new MiniCompileModePlugin_1.XMLDependency({
|
|
81
|
+
identifier,
|
|
82
|
+
context: this.rootContext,
|
|
83
|
+
content: templatesString,
|
|
84
|
+
resourcePath,
|
|
85
|
+
fileCount,
|
|
86
|
+
}));
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
MiniCompileModePlugin_1.templatesCache.push(templatesString);
|
|
90
|
+
}
|
|
91
|
+
// 引用 wxs 文件
|
|
92
|
+
const importings = [];
|
|
93
|
+
const RE_XML_SOURCES = /var\s+TARO_XML_SOURCES\s*=\s*(\[[\s\S]*?\])/;
|
|
94
|
+
if ((res = RE_XML_SOURCES.exec(code)) !== null) {
|
|
95
|
+
const listStr = res[1];
|
|
96
|
+
const reg = /["'](.*?)["']/g;
|
|
97
|
+
while ((res = reg.exec(listStr)) !== null) {
|
|
98
|
+
const [, dep] = res;
|
|
99
|
+
if ((0, loader_utils_1.isUrlRequest)(dep)) {
|
|
100
|
+
const request = (0, loader_utils_1.urlToRequest)(dep);
|
|
101
|
+
importings.push(this.importModule(request));
|
|
102
|
+
}
|
|
103
|
+
}
|
|
103
104
|
}
|
|
104
|
-
|
|
105
|
+
yield Promise.all(importings);
|
|
106
|
+
callback(null, code.replace(RE_TEMPLATES, ''));
|
|
105
107
|
}
|
|
106
108
|
catch (err) {
|
|
107
109
|
callback(err);
|
|
@@ -109,4 +111,14 @@ function default_1(source) {
|
|
|
109
111
|
});
|
|
110
112
|
}
|
|
111
113
|
exports.default = default_1;
|
|
114
|
+
function unescape(raw) {
|
|
115
|
+
let temp = raw.replace(/\\([xu])([a-fA-F0-9]{2,4})/g, (_, $1, $2) => {
|
|
116
|
+
const isUnicode = $1 === 'u';
|
|
117
|
+
const num = isUnicode ? $2 : $2.substring(0, 2);
|
|
118
|
+
const charCode = parseInt(num, 16);
|
|
119
|
+
return String.fromCharCode(charCode) + (!isUnicode ? $2.substring(2) : '');
|
|
120
|
+
});
|
|
121
|
+
temp = temp.replace(/\\'/g, "'");
|
|
122
|
+
return temp;
|
|
123
|
+
}
|
|
112
124
|
//# sourceMappingURL=miniCompilerLoader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniCompilerLoader.js","sourceRoot":"","sources":["../../src/loaders/miniCompilerLoader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"miniCompilerLoader.js","sourceRoot":"","sources":["../../src/loaders/miniCompilerLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -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"}
|
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
13
|
};
|
|
@@ -19,12 +28,14 @@ class BuildNativePlugin extends MiniPlugin_1.default {
|
|
|
19
28
|
this.addLoadChunksPlugin(compiler);
|
|
20
29
|
}
|
|
21
30
|
run(compiler) {
|
|
22
|
-
this
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
31
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
32
|
+
this.appConfig = yield this.getAppConfig();
|
|
33
|
+
this.getPages();
|
|
34
|
+
this.getPagesConfig();
|
|
35
|
+
this.getConfigFiles(compiler);
|
|
36
|
+
this.addEntries();
|
|
37
|
+
this.addLoader(compiler);
|
|
38
|
+
});
|
|
28
39
|
}
|
|
29
40
|
getPages() {
|
|
30
41
|
if ((0, helper_1.isEmptyObject)(this.appConfig)) {
|
|
@@ -144,7 +155,7 @@ class BuildNativePlugin extends MiniPlugin_1.default {
|
|
|
144
155
|
const source = new ConcatSource('');
|
|
145
156
|
const originSource = assets[pageStyle];
|
|
146
157
|
commons.forEach(item => {
|
|
147
|
-
source.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)(path_1.default.relative(path_1.default.dirname(pageStyle), item)))};\n`);
|
|
158
|
+
source.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)(path_1.default.posix.relative(path_1.default.dirname(pageStyle), item)))};\n`);
|
|
148
159
|
});
|
|
149
160
|
source.add(originSource);
|
|
150
161
|
assets[pageStyle] = source;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuildNativePlugin.js","sourceRoot":"","sources":["../../src/plugins/BuildNativePlugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BuildNativePlugin.js","sourceRoot":"","sources":["../../src/plugins/BuildNativePlugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAMuB;AACvB,+CAA2C;AAC3C,gDAAuB;AAEvB,8CAA4F;AAC5F,8DAAqC;AAMrC,MAAM,WAAW,GAAG,mBAAmB,CAAA;AAEvC,MAAqB,iBAAkB,SAAQ,oBAAU;IAAzD;;QACE,mBAAc,GAAG,0CAA0C,CAAA;IA0J7D,CAAC;IAxJC,KAAK,CAAE,QAAkB;QACvB,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACrB,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAA;IACpC,CAAC;IAEK,GAAG,CAAE,QAAkB;;YAC3B,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;YAC1C,IAAI,CAAC,QAAQ,EAAE,CAAA;YACf,IAAI,CAAC,cAAc,EAAE,CAAA;YACrB,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;YAC7B,IAAI,CAAC,UAAU,EAAE,CAAA;YACjB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAC1B,CAAC;KAAA;IAED,QAAQ;QACN,IAAI,IAAA,sBAAa,EAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACjC,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;SACpC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAA;QAC1C,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACjC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;SAC7C;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAA,iBAAQ,2CAA0B,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;SAC3E;QAED,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;QACtC,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAE,CAAA;QAE/B,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,CAAC;YACnB,GAAG,QAAQ,CAAC,GAAG,CAAa,IAAI,CAAC,EAAE;gBACjC,MAAM,QAAQ,GAAG,IAAA,4BAAmB,EAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,aAAa,CAAC,CAAA;gBAE5F,OAAO;oBACL,IAAI,EAAE,IAAI;oBACV,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,KAAK;iBAChB,CAAA;YACH,CAAC,CAAC;SACH,CAAC,CAAA;IACJ,CAAC;IAED,kBAAkB;IAClB,UAAU;QACR,KAAK,CAAC,UAAU,EAAE,CAAA;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAA;QAC9B,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;YACvC,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,EAAE;gBAC5B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;gBAChB,MAAK;aACN;SACF;IACH,CAAC;IAED,mBAAmB,CAAE,QAAkB;QACrC,MAAM,UAAU,GAAG,IAAI,GAAG,EAA8B,CAAA;QAExD,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE;YAC5D,WAAW,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE;gBAC9D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;oBAC1B,MAAM,EAAE,GAAG,IAAA,0BAAgB,EAAC,KAAK,CAAC,CAAA;oBAClC,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAAE,OAAM;oBAElD,MAAM,IAAI,GAAuB,EAAE,CAAA;oBAEnC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,cAAc,EAAE;wBACxC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;4BAC3B,MAAM,cAAc,GAAG,IAAA,0BAAgB,EAAC,KAAK,CAAC,CAAA;4BAC9C,IAAI,EAAE,KAAK,cAAc;gCAAE,OAAM;4BACjC,IAAI,CAAC,IAAI,CAAC;gCACR,IAAI,EAAE,cAAc;6BACrB,CAAC,CAAA;wBACJ,CAAC,CAAC,CAAA;qBACH;oBAED,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;iBACzB;YACH,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;gBAClI,IAAI,CAAC,IAAA,6BAAmB,EAAC,WAAW,EAAE,KAAK,CAAC;oBAAE,OAAO,OAAO,CAAA;gBAE5D,gBAAgB;gBAChB,IAAI,UAAU,CAAC,IAAI,EAAE;oBACnB,IAAI,MAAM,CAAA;oBACV,MAAM,EAAE,GAAG,IAAA,0BAAgB,EAAC,KAAK,CAAC,CAAA;oBAClC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;wBAC1B,IAAI,CAAC,KAAK,EAAE,EAAE;4BACZ,MAAM,GAAG,IAAA,4BAAkB,EAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;yBAC5C;oBACH,CAAC,CAAC,CAAA;oBACF,OAAO,MAAM,CAAA;iBACd;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,eAAe;IACf,kBAAkB,CAAE,WAAwB,EAAE,QAAkB,EAAE,QAAgB,EAAE,MAAwC;QAC1H,IAAI,QAAQ,KAAK,IAAI,CAAC,QAAQ;YAAE,OAAM;QACtC,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;IACnE,CAAC;IAED,uCAAuC;IACvC,SAAS,CAAE,QAAkB;QAC3B,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE;YACxD,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,cAAc,EAAE,MAAW,EAAE,EAAE;gBACrH,IAAI,MAAM,CAAC,UAAU,KAAK,iBAAiB,EAAE;oBAC3C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;wBACrB,MAAM,EAAE,sCAAsC;wBAC9C,OAAO,EAAE;4BACP,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;yBACtC;qBACF,CAAC,CAAA;iBACH;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAE,EAAE,MAAM,EAAe,EAAE,EAAE,OAAO,EAAY;QAChE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,OAAO,CAAA;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAA;QAC5C,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,CAAA;QAE9E,MAAM,OAAO,GAAa,EAAE,CAAA;QAE5B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YACtC,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;YAClE,IAAI,CAAC,kBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAChH,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;aACxB;QACH,CAAC,CAAC,CAAA;QAEF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACxB,IAAI,IAAI,CAAC,QAAQ;oBAAE,OAAM;gBACzB,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,IAAI,GAAG,QAAQ,EAAE,CAAA;gBAC3C,IAAI,SAAS,IAAI,MAAM,EAAE;oBACvB,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,EAAE,CAAC,CAAA;oBACnC,MAAM,YAAY,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;oBACtC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;wBACrB,MAAM,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,IAAA,2BAAY,EAAC,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;oBAC9G,CAAC,CAAC,CAAA;oBACF,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;oBACxB,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAA;iBAC3B;YACH,CAAC,CAAC,CAAA;SACH;IACH,CAAC;CACF;AA3JD,oCA2JC"}
|
package/dist/plugins/H5Plugin.js
CHANGED
|
@@ -16,6 +16,7 @@ const helper_1 = require("@tarojs/helper");
|
|
|
16
16
|
const lodash_1 = require("lodash");
|
|
17
17
|
const path_1 = __importDefault(require("path"));
|
|
18
18
|
const app_1 = __importDefault(require("../utils/app"));
|
|
19
|
+
const component_1 = require("../utils/component");
|
|
19
20
|
const TaroComponentsExportsPlugin_1 = __importDefault(require("./TaroComponentsExportsPlugin"));
|
|
20
21
|
const PLUGIN_NAME = 'TaroH5Plugin';
|
|
21
22
|
class TaroH5Plugin {
|
|
@@ -36,7 +37,9 @@ class TaroH5Plugin {
|
|
|
36
37
|
unitPrecision: 5,
|
|
37
38
|
targetUnit: 'rem'
|
|
38
39
|
},
|
|
39
|
-
prebundle: false
|
|
40
|
+
prebundle: false,
|
|
41
|
+
alias: {},
|
|
42
|
+
defineConstants: {},
|
|
40
43
|
});
|
|
41
44
|
}
|
|
42
45
|
tryAsync(fn) {
|
|
@@ -98,6 +101,8 @@ class TaroH5Plugin {
|
|
|
98
101
|
loaderMeta: this.options.loaderMeta,
|
|
99
102
|
pages: pagesConfigList,
|
|
100
103
|
pxTransformConfig: this.options.pxTransformConfig,
|
|
104
|
+
alias: this.options.alias,
|
|
105
|
+
defineConstants: this.options.defineConstants,
|
|
101
106
|
/** building mode */
|
|
102
107
|
bootstrap,
|
|
103
108
|
isBuildNativeComp
|
|
@@ -108,7 +113,9 @@ class TaroH5Plugin {
|
|
|
108
113
|
}
|
|
109
114
|
});
|
|
110
115
|
});
|
|
111
|
-
|
|
116
|
+
if (!component_1.componentConfig.includeAll) {
|
|
117
|
+
new TaroComponentsExportsPlugin_1.default(this.options).apply(compiler);
|
|
118
|
+
}
|
|
112
119
|
}
|
|
113
120
|
run() {
|
|
114
121
|
this.appHelper.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"H5Plugin.js","sourceRoot":"","sources":["../../src/plugins/H5Plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAA0D;AAC1D,mCAAiC;AACjC,gDAAuB;AAEvB,uDAAoC;AACpC,gGAAuE;AAKvE,MAAM,WAAW,GAAG,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"H5Plugin.js","sourceRoot":"","sources":["../../src/plugins/H5Plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAA0D;AAC1D,mCAAiC;AACjC,gDAAuB;AAEvB,uDAAoC;AACpC,kDAAoD;AACpD,gGAAuE;AAKvE,MAAM,WAAW,GAAG,cAAc,CAAA;AA6BlC,MAAqB,YAAY;IAI/B,YAAa,OAAO,GAAG,EAAE;QACvB,IAAI,CAAC,OAAO,GAAG,IAAA,iBAAQ,EAAC,OAAO,IAAI,EAAE,EAAE;YACrC,OAAO,EAAE,EAAE;YACX,SAAS,EAAE,EAAE;YACb,YAAY,EAAE,EAAE;YAChB,aAAa,EAAE,KAAK;YACpB,SAAS,EAAE,sBAAa,CAAC,IAAI;YAC7B,aAAa,EAAE,mBAAU;YACzB,WAAW,EAAE,EAAE;YACf,iBAAiB,EAAE;gBACjB,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,EAAE;gBACf,WAAW,EAAE,GAAG;gBAChB,WAAW,EAAE,EAAE;gBACf,aAAa,EAAE,CAAC;gBAChB,UAAU,EAAE,KAAK;aAClB;YACD,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,EAAE;YACT,eAAe,EAAE,EAAE;SACpB,CAAC,CAAA;IACJ,CAAC;IAED,QAAQ,CAA2C,EAAwC;QACzF,OAAO,CAAO,GAAM,EAAE,QAAa,EAAE,EAAE;YACrC,IAAI;gBACF,MAAM,EAAE,CAAC,GAAG,CAAC,CAAA;gBACb,OAAO,QAAQ,KAAK,UAAU,IAAI,QAAQ,EAAE,CAAA;aAC7C;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,QAAQ,KAAK,UAAU,IAAI,QAAQ,EAAE,CAAA;aAC7C;QACH,CAAC,CAAA,CAAA;IACH,CAAC;IAED,KAAK,CAAE,QAAkB;QACvB,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAA;QAClC,IAAI,CAAC,SAAS,GAAG,IAAI,aAAS,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QACnD,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CACzB,WAAW,EACX,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;YACjB,IAAI,CAAC,GAAG,EAAE,CAAA;QACZ,CAAC,CAAC,CACH,CAAA;QACD,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAC9B,WAAW,EACX,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;YACjB,IAAI,CAAC,GAAG,EAAE,CAAA;QACZ,CAAC,CAAC,CACH,CAAA;QAED,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAc,CAAM,WAAW,EAAC,EAAE;;YACvF,MAAM,CAAA,MAAA,MAAA,IAAI,CAAC,OAAO,EAAC,cAAc,mDAAG,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA,CAAA;QAClE,CAAC,CAAA,CAAC,CAAC,CAAA;QAEH,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE;YACxD,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,cAAkC,EAAE,MAAoB,EAAE,EAAE;gBAClJ,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;gBAC7F,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,cAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;gBACjD,MAAM,SAAS,GAAG,iBAAiB,CAAA;gBACnC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;oBAAE,OAAM;gBAEjC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;gBACrC,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;gBACrH,MAAM,UAAU,GAAG,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,KAAI,MAAM,CAAA;gBAC/C,MAAM,iBAAiB,GAAG,UAAU,KAAK,OAAO,CAAA;gBAChD,MAAM,KAAK,GAAG,CAAC,iBAAiB,IAAI,QAAQ,KAAK,aAAa,CAAA;gBAC9D,MAAM,SAAS,GAAG,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACpD,IACE,iBAAiB;oBACf,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAC9C,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EACrF;oBACA,8DAA8D;oBAC9D,MAAM,eAAe,GAAuB,EAAE,CAAA;oBAC9C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE;wBAC3D,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;qBAC3B;oBAED,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;wBAClB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,4BAA4B,CAAC;wBACrD,OAAO,EAAE;4BACP,YAAY;4BACZ,aAAa;4BACb,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;4BACrC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;4BACrC,SAAS;4BACT,uBAAuB;4BACvB,MAAM,kBACJ,MAAM,EAAE,YAAY,IACjB,IAAI,CAAC,SAAS,CAAC,SAAS,CAC5B;4BACD,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;4BACjC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;4BACnC,KAAK,EAAE,eAAe;4BACtB,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;4BACjD,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;4BACzB,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe;4BAC7C,oBAAoB;4BACpB,SAAS;4BACT,iBAAiB;yBAClB;wBACD,KAAK,EAAE,IAAI;wBACX,IAAI,EAAE,IAAI;qBACX,CAAC,CAAA;iBACH;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,2BAAe,CAAC,UAAU,EAAE;YAC/B,IAAI,qCAA2B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;SAC9D;IACH,CAAC;IAED,GAAG;QACD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;IACxB,CAAC;CACF;AAxHD,+BAwHC"}
|