@tarojs/webpack5-runner 3.5.0-alpha.0 → 3.5.0-alpha.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -0
- package/dist/dependencies/TaroSingleEntryDependency.js +5 -2
- package/dist/dependencies/TaroSingleEntryDependency.js.map +1 -1
- package/dist/index.h5.js +32 -28
- package/dist/index.h5.js.map +1 -1
- package/dist/index.mini.js +7 -4
- package/dist/index.mini.js.map +1 -1
- package/dist/loaders/miniTemplateLoader.js +7 -4
- package/dist/loaders/miniTemplateLoader.js.map +1 -1
- package/dist/plugins/BuildNativePlugin.js +17 -14
- package/dist/plugins/BuildNativePlugin.js.map +1 -1
- package/dist/plugins/H5Plugin.js +10 -7
- package/dist/plugins/H5Plugin.js.map +1 -1
- package/dist/plugins/MiniPlugin.js +75 -72
- package/dist/plugins/MiniPlugin.js.map +1 -1
- package/dist/plugins/MiniSplitChunksPlugin.js +28 -25
- package/dist/plugins/MiniSplitChunksPlugin.js.map +1 -1
- package/dist/plugins/TaroLoadChunksPlugin.js +15 -12
- package/dist/plugins/TaroLoadChunksPlugin.js.map +1 -1
- package/dist/plugins/TaroNormalModule.js +6 -3
- package/dist/plugins/TaroNormalModule.js.map +1 -1
- package/dist/plugins/TaroNormalModulesPlugin.js +5 -2
- package/dist/plugins/TaroNormalModulesPlugin.js.map +1 -1
- package/dist/plugins/TaroSingleEntryPlugin.js +4 -1
- package/dist/plugins/TaroSingleEntryPlugin.js.map +1 -1
- package/dist/postcss/postcss.h5.js +23 -8
- package/dist/postcss/postcss.h5.js.map +1 -1
- package/dist/postcss/postcss.mini.js +20 -10
- package/dist/postcss/postcss.mini.js.map +1 -1
- package/dist/prebundle/bundle.js +20 -17
- package/dist/prebundle/bundle.js.map +1 -1
- package/dist/prebundle/index.js +38 -35
- package/dist/prebundle/index.js.map +1 -1
- package/dist/prebundle/scanImports.js +23 -16
- package/dist/prebundle/scanImports.js.map +1 -1
- package/dist/prebundle/utils.js +14 -11
- package/dist/prebundle/utils.js.map +1 -1
- package/dist/prebundle/webpack/TaroContainerEntryModule.js +5 -2
- package/dist/prebundle/webpack/TaroContainerEntryModule.js.map +1 -1
- package/dist/prebundle/webpack/TaroContainerPlugin.js +4 -1
- package/dist/prebundle/webpack/TaroContainerPlugin.js.map +1 -1
- package/dist/prebundle/webpack/TaroContainerReferencePlugin.js +11 -8
- package/dist/prebundle/webpack/TaroContainerReferencePlugin.js.map +1 -1
- package/dist/prerender/prerender.js +16 -13
- package/dist/prerender/prerender.js.map +1 -1
- package/dist/template/custom-wrapper.js +1 -1
- package/dist/template/custom-wrapper.js.map +1 -1
- package/dist/utils/H5AppInstance.js +14 -11
- package/dist/utils/H5AppInstance.js.map +1 -1
- package/dist/utils/index.js +8 -5
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/logHelper.js +11 -8
- package/dist/utils/logHelper.js.map +1 -1
- package/dist/utils/webpack.js.map +1 -1
- package/dist/webpack/BaseConfig.js +13 -11
- package/dist/webpack/BaseConfig.js.map +1 -1
- package/dist/webpack/BuildNativePlugin.js +17 -14
- package/dist/webpack/BuildNativePlugin.js.map +1 -1
- package/dist/webpack/Combination.js +13 -10
- package/dist/webpack/Combination.js.map +1 -1
- package/dist/webpack/H5BaseConfig.js +6 -1
- package/dist/webpack/H5BaseConfig.js.map +1 -1
- package/dist/webpack/H5Combination.js +9 -6
- package/dist/webpack/H5Combination.js.map +1 -1
- package/dist/webpack/H5WebpackModule.js +5 -5
- package/dist/webpack/H5WebpackModule.js.map +1 -1
- package/dist/webpack/H5WebpackPlugin.js +8 -5
- package/dist/webpack/H5WebpackPlugin.js.map +1 -1
- package/dist/webpack/MiniCombination.js.map +1 -1
- package/dist/webpack/MiniWebpackModule.js +11 -8
- package/dist/webpack/MiniWebpackModule.js.map +1 -1
- package/dist/webpack/MiniWebpackPlugin.js +8 -5
- package/dist/webpack/MiniWebpackPlugin.js.map +1 -1
- package/dist/webpack/WebpackModule.js +16 -13
- package/dist/webpack/WebpackModule.js.map +1 -1
- package/dist/webpack/WebpackPlugin.js +8 -5
- package/dist/webpack/WebpackPlugin.js.map +1 -1
- package/package.json +18 -18
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2018
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const webpack_1 = require("webpack");
|
|
4
|
-
class TaroSingleEntryDependency extends webpack_1.dependencies.ModuleDependency {
|
|
6
|
+
const webpack_1 = __importDefault(require("webpack"));
|
|
7
|
+
class TaroSingleEntryDependency extends webpack_1.default.dependencies.ModuleDependency {
|
|
5
8
|
constructor(request, name, loc, miniType, options = {}) {
|
|
6
9
|
super(request);
|
|
7
10
|
this.name = name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaroSingleEntryDependency.js","sourceRoot":"","sources":["../../src/dependencies/TaroSingleEntryDependency.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TaroSingleEntryDependency.js","sourceRoot":"","sources":["../../src/dependencies/TaroSingleEntryDependency.ts"],"names":[],"mappings":";;;;;AACA,sDAA6B;AAE7B,MAAqB,yBAA0B,SAAQ,iBAAO,CAAC,YAAY,CAAC,gBAAgB;IAM1F,YAAa,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,GAAG,EAAE;QACrD,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED,aAAa;IACb,IAAI,IAAI;QACN,OAAO,cAAc,CAAA;IACvB,CAAC;CACF;AAlBD,4CAkBC"}
|
package/dist/index.h5.js
CHANGED
|
@@ -8,17 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
const
|
|
13
|
-
const
|
|
15
|
+
const detect_port_1 = __importDefault(require("detect-port"));
|
|
16
|
+
const path_1 = __importDefault(require("path"));
|
|
14
17
|
const url_1 = require("url");
|
|
15
|
-
const
|
|
16
|
-
const
|
|
18
|
+
const webpack_1 = __importDefault(require("webpack"));
|
|
19
|
+
const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
|
|
17
20
|
const shared_1 = require("@tarojs/shared");
|
|
18
21
|
const helper_1 = require("@tarojs/helper");
|
|
19
22
|
const H5Combination_1 = require("./webpack/H5Combination");
|
|
20
23
|
const utils_1 = require("./utils");
|
|
21
|
-
const H5AppInstance_1 = require("./utils/H5AppInstance");
|
|
24
|
+
const H5AppInstance_1 = __importDefault(require("./utils/H5AppInstance"));
|
|
22
25
|
let isFirstBuild = true;
|
|
23
26
|
function build(appPath, rawConfig) {
|
|
24
27
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -43,10 +46,10 @@ function build(appPath, rawConfig) {
|
|
|
43
46
|
exports.default = build;
|
|
44
47
|
function buildProd(webpackConfig, config) {
|
|
45
48
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
|
-
const compiler =
|
|
49
|
+
const compiler = (0, webpack_1.default)(webpackConfig);
|
|
47
50
|
const onBuildFinish = config.onBuildFinish;
|
|
48
51
|
compiler.hooks.emit.tapAsync('taroBuildDone', (compilation, callback) => __awaiter(this, void 0, void 0, function* () {
|
|
49
|
-
if (shared_1.isFunction(config.modifyBuildAssets)) {
|
|
52
|
+
if ((0, shared_1.isFunction)(config.modifyBuildAssets)) {
|
|
50
53
|
yield config.modifyBuildAssets(compilation.assets);
|
|
51
54
|
}
|
|
52
55
|
callback();
|
|
@@ -55,7 +58,7 @@ function buildProd(webpackConfig, config) {
|
|
|
55
58
|
compiler.run((error, stats) => {
|
|
56
59
|
compiler.close(error2 => {
|
|
57
60
|
const err = error || error2;
|
|
58
|
-
if (shared_1.isFunction(onBuildFinish)) {
|
|
61
|
+
if ((0, shared_1.isFunction)(onBuildFinish)) {
|
|
59
62
|
onBuildFinish({
|
|
60
63
|
error: err,
|
|
61
64
|
stats: err ? null : stats,
|
|
@@ -75,12 +78,13 @@ function buildDev(webpackConfig, config, appPath) {
|
|
|
75
78
|
const routerBasename = routerConfig.basename || '/';
|
|
76
79
|
const onBuildFinish = config.onBuildFinish;
|
|
77
80
|
const devServerOptions = yield getDevServerOptions(appPath, config);
|
|
78
|
-
|
|
79
|
-
const
|
|
81
|
+
devServerOptions.host = (0, utils_1.formatOpenHost)(devServerOptions.host);
|
|
82
|
+
const compiler = (0, webpack_1.default)(webpackConfig);
|
|
83
|
+
const server = new webpack_dev_server_1.default(devServerOptions, compiler);
|
|
80
84
|
const pathname = routerMode === 'browser' ? routerBasename : '/';
|
|
81
|
-
const devUrl = url_1.format({
|
|
85
|
+
const devUrl = (0, url_1.format)({
|
|
82
86
|
protocol: devServerOptions.https ? 'https' : 'http',
|
|
83
|
-
hostname:
|
|
87
|
+
hostname: devServerOptions.host,
|
|
84
88
|
port: devServerOptions.port,
|
|
85
89
|
pathname
|
|
86
90
|
});
|
|
@@ -93,13 +97,13 @@ function buildDev(webpackConfig, config, appPath) {
|
|
|
93
97
|
}
|
|
94
98
|
});
|
|
95
99
|
compiler.hooks.emit.tapAsync('taroBuildDone', (compilation, callback) => __awaiter(this, void 0, void 0, function* () {
|
|
96
|
-
if (shared_1.isFunction(config.modifyBuildAssets)) {
|
|
100
|
+
if ((0, shared_1.isFunction)(config.modifyBuildAssets)) {
|
|
97
101
|
yield config.modifyBuildAssets(compilation.assets);
|
|
98
102
|
}
|
|
99
103
|
callback();
|
|
100
104
|
}));
|
|
101
105
|
compiler.hooks.done.tap('taroBuildDone', stats => {
|
|
102
|
-
if (shared_1.isFunction(onBuildFinish)) {
|
|
106
|
+
if ((0, shared_1.isFunction)(onBuildFinish)) {
|
|
103
107
|
onBuildFinish({
|
|
104
108
|
error: null,
|
|
105
109
|
stats,
|
|
@@ -108,7 +112,7 @@ function buildDev(webpackConfig, config, appPath) {
|
|
|
108
112
|
}
|
|
109
113
|
});
|
|
110
114
|
compiler.hooks.failed.tap('taroBuildDone', error => {
|
|
111
|
-
if (shared_1.isFunction(onBuildFinish)) {
|
|
115
|
+
if ((0, shared_1.isFunction)(onBuildFinish)) {
|
|
112
116
|
onBuildFinish({
|
|
113
117
|
error,
|
|
114
118
|
stats: null,
|
|
@@ -129,8 +133,8 @@ function buildDev(webpackConfig, config, appPath) {
|
|
|
129
133
|
}
|
|
130
134
|
function getDevServerOptions(appPath, config) {
|
|
131
135
|
return __awaiter(this, void 0, void 0, function* () {
|
|
132
|
-
const publicPath = config.publicPath ? utils_1.addLeadingSlash(utils_1.addTrailingSlash(config.publicPath)) : '/';
|
|
133
|
-
const outputPath =
|
|
136
|
+
const publicPath = config.publicPath ? (0, utils_1.addLeadingSlash)((0, utils_1.addTrailingSlash)(config.publicPath)) : '/';
|
|
137
|
+
const outputPath = path_1.default.join(appPath, config.outputRoot || 'dist');
|
|
134
138
|
const customDevServerOption = config.devServer || {};
|
|
135
139
|
const routerConfig = config.router || {};
|
|
136
140
|
const routerMode = routerConfig.mode || 'hash';
|
|
@@ -138,7 +142,7 @@ function getDevServerOptions(appPath, config) {
|
|
|
138
142
|
const proxy = {};
|
|
139
143
|
if (isMultiRouterMode) {
|
|
140
144
|
const app = new H5AppInstance_1.default(config.entry, {
|
|
141
|
-
sourceDir:
|
|
145
|
+
sourceDir: path_1.default.join(appPath, config.sourceRoot || helper_1.SOURCE_DIR),
|
|
142
146
|
framework: config.framework,
|
|
143
147
|
entryFileName: config.entryFileName
|
|
144
148
|
});
|
|
@@ -149,12 +153,12 @@ function getDevServerOptions(appPath, config) {
|
|
|
149
153
|
const conf = [];
|
|
150
154
|
for (let key in customRoutes) {
|
|
151
155
|
const path = customRoutes[key];
|
|
152
|
-
key = utils_1.addLeadingSlash(key);
|
|
156
|
+
key = (0, utils_1.addLeadingSlash)(key);
|
|
153
157
|
if (typeof path === 'string') {
|
|
154
|
-
conf.push([key, utils_1.addLeadingSlash(path)]);
|
|
158
|
+
conf.push([key, (0, utils_1.addLeadingSlash)(path)]);
|
|
155
159
|
}
|
|
156
160
|
else if ((path === null || path === void 0 ? void 0 : path.length) > 0) {
|
|
157
|
-
conf.push(...path.map(p => [key, utils_1.addLeadingSlash(p)]));
|
|
161
|
+
conf.push(...path.map(p => [key, (0, utils_1.addLeadingSlash)(p)]));
|
|
158
162
|
}
|
|
159
163
|
}
|
|
160
164
|
return conf;
|
|
@@ -162,26 +166,26 @@ function getDevServerOptions(appPath, config) {
|
|
|
162
166
|
const bypass = req => {
|
|
163
167
|
var _a, _b, _c, _d;
|
|
164
168
|
if (((_a = req.headers.accept) === null || _a === void 0 ? void 0 : _a.indexOf('html')) !== -1) {
|
|
165
|
-
const pagePath = utils_1.stripTrailingSlash(utils_1.stripBasename(req.path, routerBasename));
|
|
169
|
+
const pagePath = (0, utils_1.stripTrailingSlash)((0, utils_1.stripBasename)(req.path, routerBasename));
|
|
166
170
|
// console.log('bypass:' + req.path, pagePath)
|
|
167
171
|
if (pagePath === '') {
|
|
168
|
-
return utils_1.addHtmlSuffix(appConfig.entryPagePath || ((_b = appConfig.pages) === null || _b === void 0 ? void 0 : _b[0]));
|
|
172
|
+
return (0, utils_1.addHtmlSuffix)(appConfig.entryPagePath || ((_b = appConfig.pages) === null || _b === void 0 ? void 0 : _b[0]));
|
|
169
173
|
}
|
|
170
|
-
const pageIdx = ((_c = appConfig.pages) !== null && _c !== void 0 ? _c : []).findIndex(e => utils_1.addLeadingSlash(e) === pagePath);
|
|
174
|
+
const pageIdx = ((_c = appConfig.pages) !== null && _c !== void 0 ? _c : []).findIndex(e => (0, utils_1.addLeadingSlash)(e) === pagePath);
|
|
171
175
|
if (pageIdx > -1) {
|
|
172
|
-
return utils_1.addHtmlSuffix((_d = appConfig.pages) === null || _d === void 0 ? void 0 : _d[pageIdx]);
|
|
176
|
+
return (0, utils_1.addHtmlSuffix)((_d = appConfig.pages) === null || _d === void 0 ? void 0 : _d[pageIdx]);
|
|
173
177
|
}
|
|
174
178
|
const customRoutesConf = getEntriesRoutes(customRoutes);
|
|
175
179
|
const idx = getEntriesRoutes(customRoutes).findIndex(list => list[1] === pagePath);
|
|
176
180
|
if (idx > -1) {
|
|
177
181
|
// NOTE: 自定义路由
|
|
178
|
-
return utils_1.addHtmlSuffix(customRoutesConf[idx][0]);
|
|
182
|
+
return (0, utils_1.addHtmlSuffix)(customRoutesConf[idx][0]);
|
|
179
183
|
}
|
|
180
184
|
}
|
|
181
185
|
};
|
|
182
186
|
proxy[routerBasename] = { bypass };
|
|
183
187
|
}
|
|
184
|
-
const devServerOptions = helper_1.recursiveMerge({
|
|
188
|
+
const devServerOptions = (0, helper_1.recursiveMerge)({
|
|
185
189
|
devMiddleware: {
|
|
186
190
|
publicPath,
|
|
187
191
|
writeToDisk: false
|
|
@@ -213,7 +217,7 @@ function getDevServerOptions(appPath, config) {
|
|
|
213
217
|
proxy
|
|
214
218
|
}, customDevServerOption);
|
|
215
219
|
const originalPort = devServerOptions.port;
|
|
216
|
-
const availablePort = yield
|
|
220
|
+
const availablePort = yield (0, detect_port_1.default)(Number(originalPort));
|
|
217
221
|
if (availablePort !== originalPort) {
|
|
218
222
|
console.log(`ℹ 预览端口 ${originalPort} 被占用, 自动切换到空闲端口 ${availablePort}`);
|
|
219
223
|
devServerOptions.port = availablePort;
|
package/dist/index.h5.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.h5.js","sourceRoot":"","sources":["../src/index.h5.ts"],"names":[],"mappings":"
|
|
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
|
@@ -8,8 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
const
|
|
15
|
+
const webpack_1 = __importDefault(require("webpack"));
|
|
13
16
|
const lodash_1 = require("lodash");
|
|
14
17
|
const MiniCombination_1 = require("./webpack/MiniCombination");
|
|
15
18
|
const prerender_1 = require("./prerender/prerender");
|
|
@@ -18,11 +21,11 @@ function build(appPath, rawConfig) {
|
|
|
18
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
19
22
|
const combination = new MiniCombination_1.MiniCombination(appPath, rawConfig);
|
|
20
23
|
yield combination.make();
|
|
21
|
-
yield prebundle_1.preBundle(combination);
|
|
24
|
+
yield (0, prebundle_1.preBundle)(combination);
|
|
22
25
|
const webpackConfig = combination.chain.toConfig();
|
|
23
26
|
const config = combination.config;
|
|
24
27
|
return new Promise((resolve, reject) => {
|
|
25
|
-
const compiler =
|
|
28
|
+
const compiler = (0, webpack_1.default)(webpackConfig);
|
|
26
29
|
const onBuildFinish = config.onBuildFinish;
|
|
27
30
|
let prerender;
|
|
28
31
|
const onFinish = function (error, stats) {
|
|
@@ -40,7 +43,7 @@ function build(appPath, rawConfig) {
|
|
|
40
43
|
onFinish(error, null);
|
|
41
44
|
return reject(error);
|
|
42
45
|
}
|
|
43
|
-
if (!lodash_1.isEmpty(config.prerender)) {
|
|
46
|
+
if (!(0, lodash_1.isEmpty)(config.prerender)) {
|
|
44
47
|
prerender = prerender !== null && prerender !== void 0 ? prerender : new prerender_1.Prerender(config, webpackConfig, stats, config.template.Adapter);
|
|
45
48
|
yield prerender.render();
|
|
46
49
|
}
|
package/dist/index.mini.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mini.js","sourceRoot":"","sources":["../src/index.mini.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.mini.js","sourceRoot":"","sources":["../src/index.mini.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAA6B;AAC7B,mCAAgC;AAChC,+DAA2D;AAC3D,qDAAiD;AACjD,2CAAuC;AAIvC,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,IAAA,qBAAS,EAAC,WAAW,CAAC,CAAA;QAE5B,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA;QAClD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAA;QAEjC,OAAO,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACpD,MAAM,QAAQ,GAAG,IAAA,iBAAO,EAAC,aAAa,CAAC,CAAA;YACvC,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAA;YAC1C,IAAI,SAAoB,CAAA;YAExB,MAAM,QAAQ,GAAG,UAAU,KAAK,EAAE,KAA2B;gBAC3D,IAAI,OAAO,aAAa,KAAK,UAAU;oBAAE,OAAM;gBAE/C,aAAa,CAAC;oBACZ,KAAK;oBACL,KAAK;oBACL,OAAO,EAAE,MAAM,CAAC,OAAO;iBACxB,CAAC,CAAA;YACJ,CAAC,CAAA;YAED,MAAM,QAAQ,GAAG,CAAO,GAAU,EAAE,KAAoB,EAAE,EAAE;gBAC1D,IAAI,GAAG,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE;oBAC5B,MAAM,KAAK,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,CAAA;oBAC1C,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;oBACrB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;iBACrB;gBAED,IAAI,CAAC,IAAA,gBAAO,EAAC,MAAM,CAAC,SAAS,CAAC,EAAE;oBAC9B,SAAS,GAAG,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,IAAI,qBAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;oBAC7F,MAAM,SAAS,CAAC,MAAM,EAAE,CAAA;iBACzB;gBAED,+BAA+B;gBAC/B,uBAAuB;gBACvB,KAAK;gBACL,4BAA4B;gBAE5B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;gBACrB,OAAO,CAAC,KAAK,CAAC,CAAA;YAChB,CAAC,CAAA,CAAA;YAED,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,QAAQ,CAAC,KAAK,CAAC;oBACb,gBAAgB,EAAE,GAAG;oBACrB,IAAI,EAAE,SAAS;iBAChB,EAAE,QAAQ,CAAC,CAAA;aACb;iBAAM;gBACL,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAU,EAAE,KAAoB,EAAE,EAAE;oBAChD,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,IAAI,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;gBACtD,CAAC,CAAC,CAAA;aACH;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA;AAxDD,wBAwDC"}
|
|
@@ -8,8 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
const
|
|
15
|
+
const sax_1 = __importDefault(require("sax"));
|
|
13
16
|
const loader_utils_1 = require("loader-utils");
|
|
14
17
|
function miniTemplateLoader(source) {
|
|
15
18
|
this.cacheable && this.cacheable();
|
|
@@ -23,7 +26,7 @@ function miniTemplateLoader(source) {
|
|
|
23
26
|
* 推荐方案1,这样在构建时会正常打入需要的包,但是若用户有 SrC 类似的写法导致引用失败,则可直接修正,不会认为是打包出现了问题
|
|
24
27
|
**/
|
|
25
28
|
const sourceWithRoot = `<root>${source}</root>`;
|
|
26
|
-
const parser =
|
|
29
|
+
const parser = sax_1.default.parser(false, { lowercase: true });
|
|
27
30
|
const requests = new Set();
|
|
28
31
|
const callback = this.async();
|
|
29
32
|
const loadModule = request => new Promise((resolve, reject) => {
|
|
@@ -38,8 +41,8 @@ function miniTemplateLoader(source) {
|
|
|
38
41
|
});
|
|
39
42
|
});
|
|
40
43
|
parser.onattribute = ({ name, value }) => {
|
|
41
|
-
if (value && name === 'src' && loader_utils_1.isUrlRequest(value)) {
|
|
42
|
-
const request = loader_utils_1.urlToRequest(value);
|
|
44
|
+
if (value && name === 'src' && (0, loader_utils_1.isUrlRequest)(value)) {
|
|
45
|
+
const request = (0, loader_utils_1.urlToRequest)(value);
|
|
43
46
|
requests.add(request);
|
|
44
47
|
}
|
|
45
48
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniTemplateLoader.js","sourceRoot":"","sources":["../../src/loaders/miniTemplateLoader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"miniTemplateLoader.js","sourceRoot":"","sources":["../../src/loaders/miniTemplateLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,8CAAqB;AACrB,+CAAyD;AAEzD,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,CAC3B,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9B,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAC3B,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACpC,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,GAAG,CAAC,CAAA;aACZ;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,CAAA;aACb;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEJ,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;YAClD,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;AA/CD,qCA+CC"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const
|
|
4
|
-
const
|
|
6
|
+
const path_1 = __importDefault(require("path"));
|
|
7
|
+
const webpack_1 = __importDefault(require("webpack"));
|
|
5
8
|
const helper_1 = require("@tarojs/helper");
|
|
6
9
|
const TaroLoadChunksPlugin_1 = require("./TaroLoadChunksPlugin");
|
|
7
|
-
const
|
|
8
|
-
const MiniPlugin_1 = require("./MiniPlugin");
|
|
10
|
+
const webpack_2 = require("../utils/webpack");
|
|
11
|
+
const MiniPlugin_1 = __importDefault(require("./MiniPlugin"));
|
|
9
12
|
const PLUGIN_NAME = 'BuildNativePlugin';
|
|
10
13
|
class BuildNativePlugin extends MiniPlugin_1.default {
|
|
11
14
|
constructor() {
|
|
@@ -25,7 +28,7 @@ class BuildNativePlugin extends MiniPlugin_1.default {
|
|
|
25
28
|
this.addLoader(compiler);
|
|
26
29
|
}
|
|
27
30
|
getPages() {
|
|
28
|
-
if (helper_1.isEmptyObject(this.appConfig)) {
|
|
31
|
+
if ((0, helper_1.isEmptyObject)(this.appConfig)) {
|
|
29
32
|
throw new Error('缺少 app 全局配置,请检查!');
|
|
30
33
|
}
|
|
31
34
|
const appPages = this.appConfig.components;
|
|
@@ -33,13 +36,13 @@ class BuildNativePlugin extends MiniPlugin_1.default {
|
|
|
33
36
|
throw new Error('全局配置缺少 components 字段,请检查!');
|
|
34
37
|
}
|
|
35
38
|
if (!this.isWatch) {
|
|
36
|
-
helper_1.printLog("compile" /* COMPILE */, '发现入口', this.getShowPath(this.appEntry));
|
|
39
|
+
(0, helper_1.printLog)("compile" /* COMPILE */, '发现入口', this.getShowPath(this.appEntry));
|
|
37
40
|
}
|
|
38
41
|
const { framework } = this.options;
|
|
39
42
|
this.prerenderPages = new Set();
|
|
40
43
|
this.pages = new Set([
|
|
41
44
|
...appPages.map(item => {
|
|
42
|
-
const pagePath = helper_1.resolveMainFilePath(
|
|
45
|
+
const pagePath = (0, helper_1.resolveMainFilePath)(path_1.default.join(this.options.sourceDir, item), helper_1.FRAMEWORK_EXT_MAP[framework]);
|
|
43
46
|
return {
|
|
44
47
|
name: item,
|
|
45
48
|
path: pagePath,
|
|
@@ -64,13 +67,13 @@ class BuildNativePlugin extends MiniPlugin_1.default {
|
|
|
64
67
|
compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
|
|
65
68
|
compilation.hooks.afterOptimizeChunks.tap(PLUGIN_NAME, chunks => {
|
|
66
69
|
for (const chunk of chunks) {
|
|
67
|
-
const id = TaroLoadChunksPlugin_1.getIdOrName(chunk);
|
|
70
|
+
const id = (0, TaroLoadChunksPlugin_1.getIdOrName)(chunk);
|
|
68
71
|
if (this.options.commonChunks.includes(id))
|
|
69
72
|
return;
|
|
70
73
|
const deps = [];
|
|
71
74
|
for (const group of chunk.groupsIterable) {
|
|
72
75
|
group.chunks.forEach(chunk => {
|
|
73
|
-
const currentChunkId = TaroLoadChunksPlugin_1.getIdOrName(chunk);
|
|
76
|
+
const currentChunkId = (0, TaroLoadChunksPlugin_1.getIdOrName)(chunk);
|
|
74
77
|
if (id === currentChunkId)
|
|
75
78
|
return;
|
|
76
79
|
deps.push({
|
|
@@ -81,16 +84,16 @@ class BuildNativePlugin extends MiniPlugin_1.default {
|
|
|
81
84
|
fileChunks.set(id, deps);
|
|
82
85
|
}
|
|
83
86
|
});
|
|
84
|
-
|
|
85
|
-
if (!
|
|
87
|
+
webpack_1.default.javascript.JavascriptModulesPlugin.getCompilationHooks(compilation).render.tap(PLUGIN_NAME, (modules, { chunk }) => {
|
|
88
|
+
if (!(0, webpack_2.getChunkEntryModule)(compilation, chunk))
|
|
86
89
|
return modules;
|
|
87
90
|
// addChunkPages
|
|
88
91
|
if (fileChunks.size) {
|
|
89
92
|
let source;
|
|
90
|
-
const id = TaroLoadChunksPlugin_1.getIdOrName(chunk);
|
|
93
|
+
const id = (0, TaroLoadChunksPlugin_1.getIdOrName)(chunk);
|
|
91
94
|
fileChunks.forEach((v, k) => {
|
|
92
95
|
if (k === id) {
|
|
93
|
-
source = TaroLoadChunksPlugin_1.addRequireToSource(id, modules, v);
|
|
96
|
+
source = (0, TaroLoadChunksPlugin_1.addRequireToSource)(id, modules, v);
|
|
94
97
|
}
|
|
95
98
|
});
|
|
96
99
|
return source;
|
|
@@ -107,7 +110,7 @@ class BuildNativePlugin extends MiniPlugin_1.default {
|
|
|
107
110
|
// 加载 taro-runtime 前必须先加载端平台插件的 runtime
|
|
108
111
|
addLoader(compiler) {
|
|
109
112
|
compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
|
|
110
|
-
|
|
113
|
+
webpack_1.default.NormalModule.getCompilationHooks(compilation).loader.tap(PLUGIN_NAME, (_loaderContext, module) => {
|
|
111
114
|
if (module.rawRequest === '@tarojs/runtime') {
|
|
112
115
|
module.loaders.unshift({
|
|
113
116
|
loader: '@tarojs/taro-loader/lib/taro-runtime',
|
|
@@ -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":"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"}
|
package/dist/plugins/H5Plugin.js
CHANGED
|
@@ -8,12 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
const helper_1 = require("@tarojs/helper");
|
|
13
16
|
const lodash_1 = require("lodash");
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const H5AppInstance_1 = require("../utils/H5AppInstance");
|
|
17
|
+
const path_1 = __importDefault(require("path"));
|
|
18
|
+
const webpack_1 = __importDefault(require("webpack"));
|
|
19
|
+
const H5AppInstance_1 = __importDefault(require("../utils/H5AppInstance"));
|
|
17
20
|
const PLUGIN_NAME = 'H5Plugin';
|
|
18
21
|
class H5Plugin {
|
|
19
22
|
constructor(options = {}) {
|
|
@@ -28,7 +31,7 @@ class H5Plugin {
|
|
|
28
31
|
callback(err);
|
|
29
32
|
}
|
|
30
33
|
});
|
|
31
|
-
this.options = lodash_1.defaults(options || {}, {
|
|
34
|
+
this.options = (0, lodash_1.defaults)(options || {}, {
|
|
32
35
|
sourceDir: '',
|
|
33
36
|
routerConfig: {},
|
|
34
37
|
entryFileName: 'app',
|
|
@@ -48,13 +51,13 @@ class H5Plugin {
|
|
|
48
51
|
this.run();
|
|
49
52
|
}));
|
|
50
53
|
compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
|
|
51
|
-
|
|
54
|
+
webpack_1.default.NormalModule.getCompilationHooks(compilation).loader.tap(PLUGIN_NAME, (_loaderContext, module) => {
|
|
52
55
|
const { framework, entryFileName, sourceDir, designWidth, deviceRatio, loaderMeta, routerConfig } = this.options;
|
|
53
|
-
const { dir, name } =
|
|
56
|
+
const { dir, name } = path_1.default.parse(module.resource);
|
|
54
57
|
const configSuffix = '.config';
|
|
55
58
|
if (!name.includes(configSuffix))
|
|
56
59
|
return;
|
|
57
|
-
const filePath =
|
|
60
|
+
const filePath = path_1.default.join(dir, name);
|
|
58
61
|
const pageName = filePath.replace(sourceDir + '/', '').replace(configSuffix, '');
|
|
59
62
|
const routerMode = (routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.mode) || 'hash';
|
|
60
63
|
const isMultiRouterMode = routerMode === 'multi';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"H5Plugin.js","sourceRoot":"","sources":["../../src/plugins/H5Plugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"H5Plugin.js","sourceRoot":"","sources":["../../src/plugins/H5Plugin.ts"],"names":[],"mappings":"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"}
|