@tarojs/webpack5-runner 3.5.0-beta.0 → 3.5.0-beta.3
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/index.h5.js +94 -92
- package/dist/index.h5.js.map +1 -1
- package/dist/index.mini.js +11 -2
- package/dist/index.mini.js.map +1 -1
- package/dist/plugins/BuildNativePlugin.js +4 -5
- package/dist/plugins/BuildNativePlugin.js.map +1 -1
- package/dist/plugins/H5Plugin.js +23 -12
- package/dist/plugins/H5Plugin.js.map +1 -1
- package/dist/plugins/MiniPlugin.js +34 -11
- package/dist/plugins/MiniPlugin.js.map +1 -1
- package/dist/plugins/MiniSplitChunksPlugin.js.map +1 -1
- package/dist/plugins/TaroLoadChunksPlugin.js +13 -34
- package/dist/plugins/TaroLoadChunksPlugin.js.map +1 -1
- package/dist/plugins/TaroNormalModulesPlugin.js.map +1 -1
- package/dist/postcss/postcss.h5.js +44 -24
- package/dist/postcss/postcss.h5.js.map +1 -1
- package/dist/prerender/prerender.js.map +1 -1
- package/dist/utils/H5AppInstance.js.map +1 -1
- package/dist/utils/webpack.js +28 -1
- package/dist/utils/webpack.js.map +1 -1
- package/dist/webpack/BaseConfig.js.map +1 -1
- package/dist/webpack/BuildNativePlugin.js.map +1 -1
- package/dist/webpack/Combination.js +16 -6
- package/dist/webpack/Combination.js.map +1 -1
- package/dist/webpack/H5Combination.js +15 -5
- package/dist/webpack/H5Combination.js.map +1 -1
- package/dist/webpack/H5WebpackModule.js +6 -5
- package/dist/webpack/H5WebpackModule.js.map +1 -1
- package/dist/webpack/H5WebpackPlugin.js +26 -6
- package/dist/webpack/H5WebpackPlugin.js.map +1 -1
- package/dist/webpack/MiniCombination.js.map +1 -1
- package/dist/webpack/MiniWebpackPlugin.js +1 -1
- package/dist/webpack/MiniWebpackPlugin.js.map +1 -1
- package/package.json +17 -19
- package/dist/prebundle/bundle.js +0 -170
- package/dist/prebundle/bundle.js.map +0 -1
- package/dist/prebundle/constant.js +0 -60
- package/dist/prebundle/constant.js.map +0 -1
- package/dist/prebundle/index.h5.js +0 -235
- package/dist/prebundle/index.h5.js.map +0 -1
- package/dist/prebundle/index.mini.js +0 -251
- package/dist/prebundle/index.mini.js.map +0 -1
- package/dist/prebundle/scanImports.js +0 -186
- package/dist/prebundle/scanImports.js.map +0 -1
- package/dist/prebundle/utils.js +0 -173
- package/dist/prebundle/utils.js.map +0 -1
- package/dist/prebundle/webpack/TaroContainerEntryModule.js +0 -79
- package/dist/prebundle/webpack/TaroContainerEntryModule.js.map +0 -1
- package/dist/prebundle/webpack/TaroContainerPlugin.js +0 -73
- package/dist/prebundle/webpack/TaroContainerPlugin.js.map +0 -1
- package/dist/prebundle/webpack/TaroContainerReferencePlugin.js +0 -127
- package/dist/prebundle/webpack/TaroContainerReferencePlugin.js.map +0 -1
package/dist/index.h5.js
CHANGED
|
@@ -14,12 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const helper_1 = require("@tarojs/helper");
|
|
16
16
|
const shared_1 = require("@tarojs/shared");
|
|
17
|
+
const webpack5_prebundle_1 = __importDefault(require("@tarojs/webpack5-prebundle"));
|
|
17
18
|
const detect_port_1 = __importDefault(require("detect-port"));
|
|
18
19
|
const path_1 = __importDefault(require("path"));
|
|
19
20
|
const url_1 = require("url");
|
|
20
21
|
const webpack_1 = __importDefault(require("webpack"));
|
|
21
22
|
const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
|
|
22
|
-
const index_h5_1 = require("./prebundle/index.h5");
|
|
23
23
|
const utils_1 = require("./utils");
|
|
24
24
|
const H5AppInstance_1 = __importDefault(require("./utils/H5AppInstance"));
|
|
25
25
|
const H5Combination_1 = require("./webpack/H5Combination");
|
|
@@ -27,112 +27,114 @@ let isFirstBuild = true;
|
|
|
27
27
|
function build(appPath, rawConfig) {
|
|
28
28
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
29
|
const combination = new H5Combination_1.H5Combination(appPath, rawConfig);
|
|
30
|
-
|
|
30
|
+
yield combination.make();
|
|
31
|
+
const { chunkDirectory = 'chunk', devServer, enableSourceMap, entryFileName = 'app', entry = {}, publicPath } = combination.config;
|
|
32
|
+
const prebundle = new webpack5_prebundle_1.default({
|
|
33
|
+
appPath,
|
|
34
|
+
sourceRoot: combination.sourceRoot,
|
|
35
|
+
chain: combination.chain,
|
|
36
|
+
chunkDirectory,
|
|
37
|
+
devServer,
|
|
38
|
+
enableSourceMap,
|
|
39
|
+
entryFileName,
|
|
40
|
+
entry,
|
|
41
|
+
publicPath
|
|
42
|
+
});
|
|
43
|
+
yield prebundle.run(combination.getPrebundleOptions());
|
|
44
|
+
const webpackConfig = combination.chain.toConfig();
|
|
31
45
|
const config = combination.config;
|
|
32
46
|
const { isWatch } = config;
|
|
33
|
-
yield (0, index_h5_1.preBundle)(combination);
|
|
34
47
|
try {
|
|
35
|
-
|
|
36
|
-
|
|
48
|
+
const onBuildFinish = config.onBuildFinish;
|
|
49
|
+
const compiler = (0, webpack_1.default)(webpackConfig);
|
|
50
|
+
if (!isWatch) {
|
|
51
|
+
compiler.hooks.emit.tapAsync('taroBuildDone', (compilation, callback) => __awaiter(this, void 0, void 0, function* () {
|
|
52
|
+
if ((0, shared_1.isFunction)(config.modifyBuildAssets)) {
|
|
53
|
+
yield config.modifyBuildAssets(compilation.assets);
|
|
54
|
+
}
|
|
55
|
+
callback();
|
|
56
|
+
}));
|
|
57
|
+
return new Promise((resolve, reject) => {
|
|
58
|
+
compiler.run((error, stats) => {
|
|
59
|
+
compiler.close(error2 => {
|
|
60
|
+
const err = error || error2;
|
|
61
|
+
if ((0, shared_1.isFunction)(onBuildFinish)) {
|
|
62
|
+
onBuildFinish({
|
|
63
|
+
error: err,
|
|
64
|
+
stats: err ? null : stats,
|
|
65
|
+
isWatch: false
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
err ? reject(err) : resolve();
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
});
|
|
37
72
|
}
|
|
38
73
|
else {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
compiler.
|
|
62
|
-
|
|
74
|
+
const routerConfig = config.router || {};
|
|
75
|
+
const routerMode = routerConfig.mode || 'hash';
|
|
76
|
+
const routerBasename = routerConfig.basename || '/';
|
|
77
|
+
config.devServer = (0, helper_1.recursiveMerge)(config.devServer || {}, webpackConfig.devServer);
|
|
78
|
+
const devServerOptions = yield getDevServerOptions(appPath, config);
|
|
79
|
+
devServerOptions.host = (0, utils_1.formatOpenHost)(devServerOptions.host);
|
|
80
|
+
const server = new webpack_dev_server_1.default(devServerOptions, compiler);
|
|
81
|
+
const pathname = routerMode === 'browser' ? routerBasename : '/';
|
|
82
|
+
const devUrl = (0, url_1.format)({
|
|
83
|
+
protocol: devServerOptions.https ? 'https' : 'http',
|
|
84
|
+
hostname: devServerOptions.host,
|
|
85
|
+
port: devServerOptions.port,
|
|
86
|
+
pathname
|
|
87
|
+
});
|
|
88
|
+
compiler.hooks.done.tap('taroDone', () => {
|
|
89
|
+
if (isFirstBuild) {
|
|
90
|
+
isFirstBuild = false;
|
|
91
|
+
if (devUrl) {
|
|
92
|
+
console.log(helper_1.chalk.cyan(`ℹ Listening at ${devUrl}\n`));
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
});
|
|
96
|
+
compiler.hooks.emit.tapAsync('taroBuildDone', (compilation, callback) => __awaiter(this, void 0, void 0, function* () {
|
|
97
|
+
if ((0, shared_1.isFunction)(config.modifyBuildAssets)) {
|
|
98
|
+
yield config.modifyBuildAssets(compilation.assets);
|
|
99
|
+
}
|
|
100
|
+
callback();
|
|
101
|
+
}));
|
|
102
|
+
compiler.hooks.done.tap('taroBuildDone', stats => {
|
|
63
103
|
if ((0, shared_1.isFunction)(onBuildFinish)) {
|
|
64
104
|
onBuildFinish({
|
|
65
|
-
error:
|
|
66
|
-
stats
|
|
67
|
-
isWatch:
|
|
105
|
+
error: null,
|
|
106
|
+
stats,
|
|
107
|
+
isWatch: true
|
|
68
108
|
});
|
|
69
109
|
}
|
|
70
|
-
err ? reject(err) : resolve();
|
|
71
110
|
});
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
const routerBasename = routerConfig.basename || '/';
|
|
81
|
-
const onBuildFinish = config.onBuildFinish;
|
|
82
|
-
const devServerOptions = yield getDevServerOptions(appPath, config);
|
|
83
|
-
devServerOptions.host = (0, utils_1.formatOpenHost)(devServerOptions.host);
|
|
84
|
-
const compiler = (0, webpack_1.default)(webpackConfig);
|
|
85
|
-
const server = new webpack_dev_server_1.default(devServerOptions, compiler);
|
|
86
|
-
const pathname = routerMode === 'browser' ? routerBasename : '/';
|
|
87
|
-
const devUrl = (0, url_1.format)({
|
|
88
|
-
protocol: devServerOptions.https ? 'https' : 'http',
|
|
89
|
-
hostname: devServerOptions.host,
|
|
90
|
-
port: devServerOptions.port,
|
|
91
|
-
pathname
|
|
92
|
-
});
|
|
93
|
-
compiler.hooks.done.tap('taroDone', () => {
|
|
94
|
-
if (isFirstBuild) {
|
|
95
|
-
isFirstBuild = false;
|
|
96
|
-
if (devUrl) {
|
|
97
|
-
console.log(helper_1.chalk.cyan(`ℹ Listening at ${devUrl}\n`));
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
});
|
|
101
|
-
compiler.hooks.emit.tapAsync('taroBuildDone', (compilation, callback) => __awaiter(this, void 0, void 0, function* () {
|
|
102
|
-
if ((0, shared_1.isFunction)(config.modifyBuildAssets)) {
|
|
103
|
-
yield config.modifyBuildAssets(compilation.assets);
|
|
104
|
-
}
|
|
105
|
-
callback();
|
|
106
|
-
}));
|
|
107
|
-
compiler.hooks.done.tap('taroBuildDone', stats => {
|
|
108
|
-
if ((0, shared_1.isFunction)(onBuildFinish)) {
|
|
109
|
-
onBuildFinish({
|
|
110
|
-
error: null,
|
|
111
|
-
stats,
|
|
112
|
-
isWatch: true
|
|
111
|
+
compiler.hooks.failed.tap('taroBuildDone', error => {
|
|
112
|
+
if ((0, shared_1.isFunction)(onBuildFinish)) {
|
|
113
|
+
onBuildFinish({
|
|
114
|
+
error,
|
|
115
|
+
stats: null,
|
|
116
|
+
isWatch: true
|
|
117
|
+
});
|
|
118
|
+
}
|
|
113
119
|
});
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
120
|
+
return new Promise((resolve, reject) => {
|
|
121
|
+
server.startCallback(err => {
|
|
122
|
+
if (err) {
|
|
123
|
+
reject(err);
|
|
124
|
+
return console.log(err);
|
|
125
|
+
}
|
|
126
|
+
resolve();
|
|
127
|
+
});
|
|
122
128
|
});
|
|
123
129
|
}
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
return console.log(err);
|
|
130
|
-
}
|
|
131
|
-
resolve();
|
|
132
|
-
});
|
|
133
|
-
});
|
|
130
|
+
}
|
|
131
|
+
catch (err) {
|
|
132
|
+
console.error(err);
|
|
133
|
+
!isWatch && process.exit(1);
|
|
134
|
+
}
|
|
134
135
|
});
|
|
135
136
|
}
|
|
137
|
+
exports.default = build;
|
|
136
138
|
function getDevServerOptions(appPath, config) {
|
|
137
139
|
return __awaiter(this, void 0, void 0, function* () {
|
|
138
140
|
const publicPath = config.publicPath ? (0, utils_1.addLeadingSlash)((0, utils_1.addTrailingSlash)(config.publicPath)) : '/';
|
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,2CAAiF;AACjF,2CAA2C;AAC3C,8DAAoC;AACpC,gDAAuB;AACvB,6BAAyC;AACzC,
|
|
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
|
@@ -12,16 +12,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
const webpack5_prebundle_1 = __importDefault(require("@tarojs/webpack5-prebundle"));
|
|
15
16
|
const lodash_1 = require("lodash");
|
|
16
17
|
const webpack_1 = __importDefault(require("webpack"));
|
|
17
|
-
const index_mini_1 = require("./prebundle/index.mini");
|
|
18
18
|
const prerender_1 = require("./prerender/prerender");
|
|
19
19
|
const MiniCombination_1 = require("./webpack/MiniCombination");
|
|
20
20
|
function build(appPath, rawConfig) {
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
const combination = new MiniCombination_1.MiniCombination(appPath, rawConfig);
|
|
23
23
|
yield combination.make();
|
|
24
|
-
|
|
24
|
+
const { enableSourceMap, entry = {}, runtimePath } = combination.config;
|
|
25
|
+
const prebundle = new webpack5_prebundle_1.default({
|
|
26
|
+
appPath,
|
|
27
|
+
sourceRoot: combination.sourceRoot,
|
|
28
|
+
chain: combination.chain,
|
|
29
|
+
enableSourceMap,
|
|
30
|
+
entry,
|
|
31
|
+
runtimePath
|
|
32
|
+
});
|
|
33
|
+
yield prebundle.run(combination.getPrebundleOptions());
|
|
25
34
|
const webpackConfig = combination.chain.toConfig();
|
|
26
35
|
const config = combination.config;
|
|
27
36
|
return new Promise((resolve, reject) => {
|
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,mCAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"index.mini.js","sourceRoot":"","sources":["../src/index.mini.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oFAAkD;AAClD,mCAAgC;AAChC,sDAAwC;AAExC,qDAAiD;AAEjD,+DAA2D;AAE3D,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,WAAW;SACZ,CAAC,CAAA;QACF,MAAM,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC,CAAA;QAEtD,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA;QAClD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAA;QAEjC,OAAO,IAAI,OAAO,CAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,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,KAAmB,EAAE,KAAmB;gBACjE,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,KAAY,EAAE,EAAE;gBAClD,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,KAAY,EAAE,EAAE;oBACxC,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;AAjED,wBAiEC"}
|
|
@@ -8,7 +8,6 @@ const path_1 = __importDefault(require("path"));
|
|
|
8
8
|
const webpack_1 = __importDefault(require("webpack"));
|
|
9
9
|
const webpack_2 = require("../utils/webpack");
|
|
10
10
|
const MiniPlugin_1 = __importDefault(require("./MiniPlugin"));
|
|
11
|
-
const TaroLoadChunksPlugin_1 = require("./TaroLoadChunksPlugin");
|
|
12
11
|
const PLUGIN_NAME = 'BuildNativePlugin';
|
|
13
12
|
class BuildNativePlugin extends MiniPlugin_1.default {
|
|
14
13
|
constructor() {
|
|
@@ -67,13 +66,13 @@ class BuildNativePlugin extends MiniPlugin_1.default {
|
|
|
67
66
|
compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
|
|
68
67
|
compilation.hooks.afterOptimizeChunks.tap(PLUGIN_NAME, chunks => {
|
|
69
68
|
for (const chunk of chunks) {
|
|
70
|
-
const id = (0,
|
|
69
|
+
const id = (0, webpack_2.getChunkIdOrName)(chunk);
|
|
71
70
|
if (this.options.commonChunks.includes(id))
|
|
72
71
|
return;
|
|
73
72
|
const deps = [];
|
|
74
73
|
for (const group of chunk.groupsIterable) {
|
|
75
74
|
group.chunks.forEach(chunk => {
|
|
76
|
-
const currentChunkId = (0,
|
|
75
|
+
const currentChunkId = (0, webpack_2.getChunkIdOrName)(chunk);
|
|
77
76
|
if (id === currentChunkId)
|
|
78
77
|
return;
|
|
79
78
|
deps.push({
|
|
@@ -90,10 +89,10 @@ class BuildNativePlugin extends MiniPlugin_1.default {
|
|
|
90
89
|
// addChunkPages
|
|
91
90
|
if (fileChunks.size) {
|
|
92
91
|
let source;
|
|
93
|
-
const id = (0,
|
|
92
|
+
const id = (0, webpack_2.getChunkIdOrName)(chunk);
|
|
94
93
|
fileChunks.forEach((v, k) => {
|
|
95
94
|
if (k === id) {
|
|
96
|
-
source = (0,
|
|
95
|
+
source = (0, webpack_2.addRequireToSource)(id, modules, v);
|
|
97
96
|
}
|
|
98
97
|
});
|
|
99
98
|
return source;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuildNativePlugin.js","sourceRoot":"","sources":["../../src/plugins/BuildNativePlugin.ts"],"names":[],"mappings":";;;;;AAAA,2CAMuB;AAEvB,gDAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"BuildNativePlugin.js","sourceRoot":"","sources":["../../src/plugins/BuildNativePlugin.ts"],"names":[],"mappings":"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"}
|
package/dist/plugins/H5Plugin.js
CHANGED
|
@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const helper_1 = require("@tarojs/helper");
|
|
16
|
+
const h5_1 = require("@tarojs/webpack5-prebundle/dist/h5");
|
|
16
17
|
const lodash_1 = require("lodash");
|
|
17
18
|
const path_1 = __importDefault(require("path"));
|
|
18
19
|
const webpack_1 = __importDefault(require("webpack"));
|
|
@@ -32,13 +33,15 @@ class H5Plugin {
|
|
|
32
33
|
}
|
|
33
34
|
});
|
|
34
35
|
this.options = (0, lodash_1.defaults)(options || {}, {
|
|
36
|
+
appPath: '',
|
|
35
37
|
sourceDir: '',
|
|
36
38
|
routerConfig: {},
|
|
37
39
|
entryFileName: 'app',
|
|
38
40
|
framework: helper_1.FRAMEWORK_MAP.NERV,
|
|
39
41
|
useHtmlComponents: false,
|
|
40
42
|
deviceRatio: {},
|
|
41
|
-
designWidth: 750
|
|
43
|
+
designWidth: 750,
|
|
44
|
+
prebundle: false
|
|
42
45
|
});
|
|
43
46
|
}
|
|
44
47
|
apply(compiler) {
|
|
@@ -52,33 +55,41 @@ class H5Plugin {
|
|
|
52
55
|
}));
|
|
53
56
|
compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
|
|
54
57
|
webpack_1.default.NormalModule.getCompilationHooks(compilation).loader.tap(PLUGIN_NAME, (_loaderContext, module) => {
|
|
55
|
-
const { framework, entryFileName, sourceDir, designWidth, deviceRatio, loaderMeta, routerConfig } = this.options;
|
|
58
|
+
const { framework, entryFileName, appPath, sourceDir, designWidth, deviceRatio, loaderMeta, prebundle, routerConfig } = this.options;
|
|
56
59
|
const { dir, name } = path_1.default.parse(module.resource);
|
|
57
|
-
const
|
|
58
|
-
if (!
|
|
60
|
+
const suffixRgx = /\.(boot|config)/;
|
|
61
|
+
if (!suffixRgx.test(name))
|
|
59
62
|
return;
|
|
60
63
|
const filePath = path_1.default.join(dir, name);
|
|
61
|
-
const pageName = filePath.replace(sourceDir + '/', '').replace(
|
|
64
|
+
const pageName = filePath.replace(sourceDir + '/', '').replace(suffixRgx, '');
|
|
62
65
|
const routerMode = (routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.mode) || 'hash';
|
|
63
66
|
const isMultiRouterMode = routerMode === 'multi';
|
|
64
67
|
const isApp = !isMultiRouterMode && pageName === entryFileName;
|
|
68
|
+
const bootstrap = prebundle && !/\.boot$/.test(name);
|
|
65
69
|
if (isApp || this.inst.pagesConfigList.has(pageName)) {
|
|
70
|
+
if (bootstrap) {
|
|
71
|
+
const bootPath = path_1.default.relative(appPath, path_1.default.join(sourceDir, `${isMultiRouterMode ? pageName : entryFileName}.boot.js`));
|
|
72
|
+
h5_1.VirtualModule.writeModule(bootPath, '/** bootstrap application code */');
|
|
73
|
+
}
|
|
66
74
|
module.loaders.push({
|
|
67
75
|
loader: '@tarojs/taro-loader/lib/h5',
|
|
68
76
|
options: {
|
|
77
|
+
bootstrap,
|
|
78
|
+
config: Object.assign({ router: this.options.routerConfig }, this.inst.appConfig),
|
|
79
|
+
entryFileName,
|
|
80
|
+
filename: name.replace(suffixRgx, ''),
|
|
69
81
|
framework,
|
|
70
82
|
loaderMeta,
|
|
71
|
-
entryFileName,
|
|
72
|
-
sourceDir,
|
|
73
|
-
filename: name.replace(configSuffix, ''),
|
|
74
83
|
pages: this.inst.pagesConfigList,
|
|
75
|
-
useHtmlComponents: this.options.useHtmlComponents,
|
|
76
|
-
config: Object.assign({ router: this.options.routerConfig }, this.inst.appConfig),
|
|
77
84
|
pxTransformConfig: {
|
|
78
85
|
designWidth,
|
|
79
86
|
deviceRatio
|
|
80
|
-
}
|
|
81
|
-
|
|
87
|
+
},
|
|
88
|
+
sourceDir,
|
|
89
|
+
useHtmlComponents: this.options.useHtmlComponents
|
|
90
|
+
},
|
|
91
|
+
ident: null,
|
|
92
|
+
type: null
|
|
82
93
|
});
|
|
83
94
|
}
|
|
84
95
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"H5Plugin.js","sourceRoot":"","sources":["../../src/plugins/H5Plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAA8C;AAE9C,mCAAiC;AACjC,gDAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"H5Plugin.js","sourceRoot":"","sources":["../../src/plugins/H5Plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,27 @@
|
|
|
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
|
+
};
|
|
2
25
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
26
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
27
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -16,7 +39,7 @@ const helper_1 = require("@tarojs/helper");
|
|
|
16
39
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
17
40
|
const loader_utils_1 = require("loader-utils");
|
|
18
41
|
const path_1 = __importDefault(require("path"));
|
|
19
|
-
const webpack_1 =
|
|
42
|
+
const webpack_1 = __importStar(require("webpack"));
|
|
20
43
|
const EntryDependency_1 = __importDefault(require("webpack/lib/dependencies/EntryDependency"));
|
|
21
44
|
const webpack_sources_1 = require("webpack-sources");
|
|
22
45
|
const TaroSingleEntryDependency_1 = __importDefault(require("../dependencies/TaroSingleEntryDependency"));
|
|
@@ -201,7 +224,7 @@ class TaroMiniPlugin {
|
|
|
201
224
|
});
|
|
202
225
|
compilation.hooks.processAssets.tapAsync({
|
|
203
226
|
name: PLUGIN_NAME,
|
|
204
|
-
stage: webpack_1.
|
|
227
|
+
stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
|
|
205
228
|
}, this.tryAsync(() => __awaiter(this, void 0, void 0, function* () {
|
|
206
229
|
yield this.generateMiniFiles(compilation);
|
|
207
230
|
})));
|
|
@@ -216,7 +239,7 @@ class TaroMiniPlugin {
|
|
|
216
239
|
* @returns app 入口文件路径
|
|
217
240
|
*/
|
|
218
241
|
getAppEntry(compiler) {
|
|
219
|
-
// const originalEntry = compiler.options.entry as webpack.
|
|
242
|
+
// const originalEntry = compiler.options.entry as webpack.EntryObject
|
|
220
243
|
// compiler.options.entry = {}
|
|
221
244
|
// return path.resolve(this.context, originalEntry.app[0])
|
|
222
245
|
const { entry } = compiler.options;
|
|
@@ -692,7 +715,8 @@ class TaroMiniPlugin {
|
|
|
692
715
|
addChunkPages: this.options.addChunkPages,
|
|
693
716
|
pages: childPages,
|
|
694
717
|
framework: this.options.framework,
|
|
695
|
-
|
|
718
|
+
isIndependentPackages: true,
|
|
719
|
+
needAddCommon: [`${name}/comp`, `${name}/custom-wrapper`]
|
|
696
720
|
}).apply(childCompiler);
|
|
697
721
|
// 添加 comp 和 custom-wrapper 组件
|
|
698
722
|
new TaroSingleEntryPlugin_1.default(compiler.context, path_1.default.resolve(__dirname, '..', 'template/comp'), `${name}/comp`, helper_1.META_TYPE.STATIC).apply(childCompiler);
|
|
@@ -826,15 +850,14 @@ class TaroMiniPlugin {
|
|
|
826
850
|
[customWrapperName]: `./${customWrapperName}`
|
|
827
851
|
}
|
|
828
852
|
});
|
|
829
|
-
this.generateConfigFile(compilation, `${name}/${customWrapperName}`, {
|
|
830
|
-
component: true,
|
|
831
|
-
usingComponents: {
|
|
832
|
-
[baseCompName]: `./${baseCompName}`,
|
|
833
|
-
[customWrapperName]: `./${customWrapperName}`
|
|
834
|
-
}
|
|
835
|
-
});
|
|
836
853
|
this.generateTemplateFile(compilation, `${name}/${baseCompName}`, template.buildBaseComponentTemplate, this.options.fileType.templ);
|
|
837
854
|
}
|
|
855
|
+
this.generateConfigFile(compilation, `${name}/${customWrapperName}`, {
|
|
856
|
+
component: true,
|
|
857
|
+
usingComponents: {
|
|
858
|
+
[customWrapperName]: `./${customWrapperName}`
|
|
859
|
+
}
|
|
860
|
+
});
|
|
838
861
|
this.generateTemplateFile(compilation, `${name}/${customWrapperName}`, template.buildCustomComponentTemplate, this.options.fileType.templ);
|
|
839
862
|
this.generateXSFile(compilation, `${name}/utils`, isBuildPlugin);
|
|
840
863
|
});
|