@tarojs/webpack5-runner 3.5.0-alpha.7 → 3.5.0-alpha.8
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 +3 -26
- package/dist/index.h5.js.map +1 -1
- package/dist/loaders/miniTemplateLoader.js +5 -25
- package/dist/loaders/miniTemplateLoader.js.map +1 -1
- package/dist/plugins/BuildNativePlugin.js +2 -25
- package/dist/plugins/BuildNativePlugin.js.map +1 -1
- package/dist/plugins/H5Plugin.js +3 -26
- package/dist/plugins/H5Plugin.js.map +1 -1
- package/dist/plugins/MiniPlugin.js +51 -74
- package/dist/plugins/MiniPlugin.js.map +1 -1
- package/dist/plugins/MiniSplitChunksPlugin.js +20 -40
- package/dist/plugins/MiniSplitChunksPlugin.js.map +1 -1
- package/dist/plugins/TaroLoadChunksPlugin.js +2 -25
- package/dist/plugins/TaroLoadChunksPlugin.js.map +1 -1
- package/dist/postcss/postcss.h5.js +6 -26
- package/dist/postcss/postcss.h5.js.map +1 -1
- package/dist/postcss/postcss.mini.js +4 -24
- package/dist/postcss/postcss.mini.js.map +1 -1
- package/dist/prebundle/bundle.js +11 -34
- package/dist/prebundle/bundle.js.map +1 -1
- package/dist/prebundle/index.js +17 -40
- package/dist/prebundle/index.js.map +1 -1
- package/dist/prebundle/scanImports.js +5 -28
- package/dist/prebundle/scanImports.js.map +1 -1
- package/dist/prebundle/utils.js +11 -31
- package/dist/prebundle/utils.js.map +1 -1
- package/dist/prerender/prerender.js +7 -27
- package/dist/prerender/prerender.js.map +1 -1
- package/dist/utils/H5AppInstance.js +10 -30
- package/dist/utils/H5AppInstance.js.map +1 -1
- package/dist/utils/index.js +4 -24
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/logHelper.js +2 -25
- package/dist/utils/logHelper.js.map +1 -1
- package/dist/webpack/BaseConfig.js +6 -29
- package/dist/webpack/BaseConfig.js.map +1 -1
- package/dist/webpack/BuildNativePlugin.js +16 -36
- package/dist/webpack/BuildNativePlugin.js.map +1 -1
- package/dist/webpack/Combination.js +3 -26
- package/dist/webpack/Combination.js.map +1 -1
- package/dist/webpack/H5Combination.js +3 -26
- package/dist/webpack/H5Combination.js.map +1 -1
- package/dist/webpack/H5WebpackPlugin.js +4 -27
- package/dist/webpack/H5WebpackPlugin.js.map +1 -1
- package/dist/webpack/MiniWebpackModule.js +5 -25
- package/dist/webpack/MiniWebpackModule.js.map +1 -1
- package/dist/webpack/WebpackModule.js +8 -28
- package/dist/webpack/WebpackModule.js.map +1 -1
- package/dist/webpack/WebpackPlugin.js +2 -25
- package/dist/webpack/WebpackPlugin.js.map +1 -1
- package/package.json +16 -19
package/dist/index.h5.js
CHANGED
|
@@ -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) {
|
|
@@ -36,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
13
|
};
|
|
37
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
15
|
const detect_port_1 = __importDefault(require("detect-port"));
|
|
39
|
-
const
|
|
16
|
+
const path_1 = __importDefault(require("path"));
|
|
40
17
|
const url_1 = require("url");
|
|
41
18
|
const webpack_1 = __importDefault(require("webpack"));
|
|
42
19
|
const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
|
|
@@ -156,7 +133,7 @@ function buildDev(webpackConfig, config, appPath) {
|
|
|
156
133
|
function getDevServerOptions(appPath, config) {
|
|
157
134
|
return __awaiter(this, void 0, void 0, function* () {
|
|
158
135
|
const publicPath = config.publicPath ? (0, utils_1.addLeadingSlash)((0, utils_1.addTrailingSlash)(config.publicPath)) : '/';
|
|
159
|
-
const outputPath =
|
|
136
|
+
const outputPath = path_1.default.join(appPath, config.outputRoot || 'dist');
|
|
160
137
|
const customDevServerOption = config.devServer || {};
|
|
161
138
|
const routerConfig = config.router || {};
|
|
162
139
|
const routerMode = routerConfig.mode || 'hash';
|
|
@@ -164,7 +141,7 @@ function getDevServerOptions(appPath, config) {
|
|
|
164
141
|
const proxy = {};
|
|
165
142
|
if (isMultiRouterMode) {
|
|
166
143
|
const app = new H5AppInstance_1.default(config.entry, {
|
|
167
|
-
sourceDir:
|
|
144
|
+
sourceDir: path_1.default.join(appPath, config.sourceRoot || helper_1.SOURCE_DIR),
|
|
168
145
|
framework: config.framework,
|
|
169
146
|
entryFileName: config.entryFileName
|
|
170
147
|
});
|
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":";;;;;;;;;;;;;;AAAA,8DAAoC;AACpC,gDAAuB;AACvB,6BAAyC;AACzC,sDAA6B;AAC7B,4EAAiD;AACjD,2CAA2C;AAC3C,2CAAiF;AACjF,2DAAuD;AACvD,mCAA6G;AAG7G,0EAAiD;AAEjD,IAAI,YAAY,GAAG,IAAI,CAAA;AAEvB,SAA8B,KAAK,CAAE,OAAe,EAAE,SAAwB;;QAC5E,MAAM,WAAW,GAAG,IAAI,6BAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QACzD,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,gBAAgB,EAAE,CAAA;QAC1D,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAA;QACjC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;QAE1B,IAAI;YACF,IAAI,OAAO,EAAE;gBACX,MAAM,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;aAC/C;iBAAM;gBACL,MAAM,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;aACvC;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;SAC5B;IACH,CAAC;CAAA;AAhBD,wBAgBC;AAED,SAAe,SAAS,CAAE,aAAoC,EAAE,MAAqB;;QACnF,MAAM,QAAQ,GAAG,IAAA,iBAAO,EAAC,aAAa,CAAC,CAAA;QACvC,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAA;QAC1C,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAO,WAAW,EAAE,QAAQ,EAAE,EAAE;YAC5E,IAAI,IAAA,mBAAU,EAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;gBACxC,MAAM,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;aACnD;YACD,QAAQ,EAAE,CAAA;QACZ,CAAC,CAAA,CAAC,CAAA;QACF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBAC5B,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;oBACtB,MAAM,GAAG,GAAG,KAAK,IAAI,MAAM,CAAA;oBAE3B,IAAI,IAAA,mBAAU,EAAC,aAAa,CAAC,EAAE;wBAC7B,aAAa,CAAC;4BACZ,KAAK,EAAE,GAAG;4BACV,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;4BACzB,OAAO,EAAE,KAAK;yBACf,CAAC,CAAA;qBACH;oBAED,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;gBAC/B,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA;AAED,SAAe,QAAQ,CAAE,aAAoC,EAAE,MAAqB,EAAE,OAAe;;QACnG,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAA;QACxC,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,IAAI,MAAM,CAAA;QAC9C,MAAM,cAAc,GAAG,YAAY,CAAC,QAAQ,IAAI,GAAG,CAAA;QACnD,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAA;QAE1C,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAEnE,MAAM,QAAQ,GAAG,IAAA,iBAAO,EAAC,aAAa,CAAC,CAAA;QACvC,MAAM,MAAM,GAAG,IAAI,4BAAgB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAA;QAE/D,MAAM,QAAQ,GAAG,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAA;QAChE,MAAM,MAAM,GAAG,IAAA,YAAS,EAAC;YACvB,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;YACnD,QAAQ,EAAE,CAAC,gBAAgB,CAAC,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI;YACtH,IAAI,EAAE,gBAAgB,CAAC,IAAI;YAC3B,QAAQ;SACT,CAAC,CAAA;QACF,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE;YACvC,IAAI,YAAY,EAAE;gBAChB,YAAY,GAAG,KAAK,CAAA;gBACpB,IAAI,MAAM,EAAE;oBACV,OAAO,CAAC,GAAG,CAAC,cAAK,CAAC,IAAI,CAAC,kBAAkB,MAAM,IAAI,CAAC,CAAC,CAAA;iBACtD;aACF;QACH,CAAC,CAAC,CAAA;QAEF,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAO,WAAW,EAAE,QAAQ,EAAE,EAAE;YAC5E,IAAI,IAAA,mBAAU,EAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;gBACxC,MAAM,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;aACnD;YACD,QAAQ,EAAE,CAAA;QACZ,CAAC,CAAA,CAAC,CAAA;QACF,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,EAAE;YAC/C,IAAI,IAAA,mBAAU,EAAC,aAAa,CAAC,EAAE;gBAC7B,aAAa,CAAC;oBACZ,KAAK,EAAE,IAAI;oBACX,KAAK;oBACL,OAAO,EAAE,IAAI;iBACd,CAAC,CAAA;aACH;QACH,CAAC,CAAC,CAAA;QACF,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,EAAE;YACjD,IAAI,IAAA,mBAAU,EAAC,aAAa,CAAC,EAAE;gBAC7B,aAAa,CAAC;oBACZ,KAAK;oBACL,KAAK,EAAE,IAAI;oBACX,OAAO,EAAE,IAAI;iBACd,CAAC,CAAA;aACH;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE;gBACzB,IAAI,GAAG,EAAE;oBACP,MAAM,CAAC,GAAG,CAAC,CAAA;oBACX,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;iBACxB;gBACD,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA;AAED,SAAe,mBAAmB,CAAE,OAAe,EAAE,MAAqB;;QACxE,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,uBAAe,EAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;QACjG,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,CAAA;QAClE,MAAM,qBAAqB,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAA;QACpD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAA;QACxC,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,IAAI,MAAM,CAAA;QAC9C,MAAM,iBAAiB,GAAG,UAAU,KAAK,OAAO,CAAA;QAChD,MAAM,KAAK,GAAG,EAAE,CAAA;QAChB,IAAI,iBAAiB,EAAE;YACrB,MAAM,GAAG,GAAG,IAAI,uBAAa,CAAC,MAAM,CAAC,KAAgC,EAAE;gBACrE,SAAS,EAAE,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,IAAI,mBAAU,CAAC;gBAC9D,SAAS,EAAE,MAAM,CAAC,SAA0B;gBAC5C,aAAa,EAAE,MAAM,CAAC,aAAa;aACpC,CAAC,CAAA;YACF,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;YAC/B,MAAM,YAAY,GAAG,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,KAAI,EAAE,CAAA;YACrD,MAAM,cAAc,GAAG,YAAY,CAAC,QAAQ,IAAI,GAAG,CAAA;YACnD,MAAM,gBAAgB,GAAG,CAAC,eAAkD,EAAE,EAAE,EAAE;gBAChF,MAAM,IAAI,GAAe,EAAE,CAAA;gBAC3B,KAAK,IAAI,GAAG,IAAI,YAAY,EAAE;oBAC5B,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;oBAC9B,GAAG,GAAG,IAAA,uBAAe,EAAC,GAAG,CAAC,CAAA;oBAC1B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;wBAC5B,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,IAAA,uBAAe,EAAC,IAAI,CAAC,CAAC,CAAC,CAAA;qBACxC;yBAAM,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,IAAG,CAAC,EAAE;wBAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,IAAA,uBAAe,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;qBACvD;iBACF;gBACD,OAAO,IAAI,CAAA;YACb,CAAC,CAAA;YACD,MAAM,MAAM,GAA4B,GAAG,CAAC,EAAE;;gBAC5C,IAAI,CAAA,MAAA,GAAG,CAAC,OAAO,CAAC,MAAM,0CAAE,OAAO,CAAC,MAAM,CAAC,MAAK,CAAC,CAAC,EAAE;oBAC9C,MAAM,QAAQ,GAAG,IAAA,0BAAkB,EAAC,IAAA,qBAAa,EAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAA;oBAC5E,8CAA8C;oBAC9C,IAAI,QAAQ,KAAK,EAAE,EAAE;wBACnB,OAAO,IAAA,qBAAa,EAAC,SAAS,CAAC,aAAa,KAAI,MAAA,SAAS,CAAC,KAAK,0CAAG,CAAC,CAAC,CAAA,CAAC,CAAA;qBACtE;oBAED,MAAM,OAAO,GAAG,CAAC,MAAA,SAAS,CAAC,KAAK,mCAAI,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,uBAAe,EAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAA;oBACvF,IAAI,OAAO,GAAG,CAAC,CAAC,EAAE;wBAChB,OAAO,IAAA,qBAAa,EAAC,MAAA,SAAS,CAAC,KAAK,0CAAG,OAAO,CAAC,CAAC,CAAA;qBACjD;oBAED,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAA;oBACvD,MAAM,GAAG,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAA;oBAClF,IAAI,GAAG,GAAG,CAAC,CAAC,EAAE;wBACZ,cAAc;wBACd,OAAO,IAAA,qBAAa,EAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;qBAC/C;iBACF;YACH,CAAC,CAAA;YACD,KAAK,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,CAAA;SACnC;QAED,MAAM,gBAAgB,GAAmC,IAAA,uBAAc,EACrE;YACE,aAAa,EAAE;gBACb,UAAU;gBACV,WAAW,EAAE,KAAK;aACnB;YACD,MAAM,EAAE;gBACN,SAAS,EAAE,UAAU;gBACrB,KAAK,EAAE,IAAI,CAAC,8CAA8C;aAC3D;YACD,QAAQ,EAAE,IAAI;YACd,wHAAwH;YACxH,IAAI,EAAE,SAAS;YACf,kIAAkI;YAClI,GAAG,EAAE,IAAI;YACT,KAAK,EAAE,KAAK;YACZ,oEAAoE;YACpE,IAAI,EAAE,IAAI;YACV,MAAM,EAAE;gBACN,OAAO,EAAE,IAAI;aACd;YACD,IAAI,EAAE,KAAK;YACX,6LAA6L;YAC7L,kBAAkB,EAAE;gBAClB,cAAc,EAAE,IAAI;gBACpB,QAAQ,EAAE,CAAC;wBACT,IAAI,EAAE,GAAG;wBACT,EAAE,EAAE,UAAU;qBACf,CAAC;aACH;YACD,KAAK;SACN,EACD,qBAAqB,CACtB,CAAA;QAED,MAAM,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAA;QAC1C,MAAM,aAAa,GAAG,MAAM,IAAA,qBAAU,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAA;QAE5D,IAAI,aAAa,KAAK,YAAY,EAAE;YAClC,OAAO,CAAC,GAAG,CAAC,UAAU,YAAY,mBAAmB,aAAa,EAAE,CAAC,CAAA;YACrE,gBAAgB,CAAC,IAAI,GAAG,aAAa,CAAA;SACtC;QAED,OAAO,gBAAgB,CAAA;IACzB,CAAC;CAAA"}
|
|
@@ -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) {
|
|
@@ -31,8 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
31
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
9
|
});
|
|
33
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
34
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
const
|
|
15
|
+
const sax_1 = __importDefault(require("sax"));
|
|
36
16
|
const loader_utils_1 = require("loader-utils");
|
|
37
17
|
function miniTemplateLoader(source) {
|
|
38
18
|
this.cacheable && this.cacheable();
|
|
@@ -46,7 +26,7 @@ function miniTemplateLoader(source) {
|
|
|
46
26
|
* 推荐方案1，这样在构建时会正常打入需要的包，但是若用户有 SrC 类似的写法导致引用失败，则可直接修正，不会认为是打包出现了问题
|
|
47
27
|
**/
|
|
48
28
|
const sourceWithRoot = `<root>${source}</root>`;
|
|
49
|
-
const parser =
|
|
29
|
+
const parser = sax_1.default.parser(false, { lowercase: true });
|
|
50
30
|
const requests = new Set();
|
|
51
31
|
const callback = this.async();
|
|
52
32
|
const loadModule = request => new Promise((resolve, reject) => {
|
|
@@ -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,32 +1,9 @@
|
|
|
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 __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
4
|
};
|
|
28
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
const
|
|
6
|
+
const path_1 = __importDefault(require("path"));
|
|
30
7
|
const webpack_1 = __importDefault(require("webpack"));
|
|
31
8
|
const helper_1 = require("@tarojs/helper");
|
|
32
9
|
const TaroLoadChunksPlugin_1 = require("./TaroLoadChunksPlugin");
|
|
@@ -65,7 +42,7 @@ class BuildNativePlugin extends MiniPlugin_1.default {
|
|
|
65
42
|
this.prerenderPages = new Set();
|
|
66
43
|
this.pages = new Set([
|
|
67
44
|
...appPages.map(item => {
|
|
68
|
-
const pagePath = (0, helper_1.resolveMainFilePath)(
|
|
45
|
+
const pagePath = (0, helper_1.resolveMainFilePath)(path_1.default.join(this.options.sourceDir, item), helper_1.FRAMEWORK_EXT_MAP[framework]);
|
|
69
46
|
return {
|
|
70
47
|
name: item,
|
|
71
48
|
path: pagePath,
|
|
@@ -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
|
@@ -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) {
|
|
@@ -37,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
15
|
const helper_1 = require("@tarojs/helper");
|
|
39
16
|
const lodash_1 = require("lodash");
|
|
40
|
-
const
|
|
17
|
+
const path_1 = __importDefault(require("path"));
|
|
41
18
|
const webpack_1 = __importDefault(require("webpack"));
|
|
42
19
|
const H5AppInstance_1 = __importDefault(require("../utils/H5AppInstance"));
|
|
43
20
|
const PLUGIN_NAME = 'H5Plugin';
|
|
@@ -76,11 +53,11 @@ class H5Plugin {
|
|
|
76
53
|
compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
|
|
77
54
|
webpack_1.default.NormalModule.getCompilationHooks(compilation).loader.tap(PLUGIN_NAME, (_loaderContext, module) => {
|
|
78
55
|
const { framework, entryFileName, sourceDir, designWidth, deviceRatio, loaderMeta, routerConfig } = this.options;
|
|
79
|
-
const { dir, name } =
|
|
56
|
+
const { dir, name } = path_1.default.parse(module.resource);
|
|
80
57
|
const configSuffix = '.config';
|
|
81
58
|
if (!name.includes(configSuffix))
|
|
82
59
|
return;
|
|
83
|
-
const filePath =
|
|
60
|
+
const filePath = path_1.default.join(dir, name);
|
|
84
61
|
const pageName = filePath.replace(sourceDir + '/', '').replace(configSuffix, '');
|
|
85
62
|
const routerMode = (routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.mode) || 'hash';
|
|
86
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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"}
|
|
@@ -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,10 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
13
|
};
|
|
37
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
-
const
|
|
39
|
-
const
|
|
15
|
+
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
16
|
+
const path_1 = __importDefault(require("path"));
|
|
40
17
|
const webpack_1 = __importDefault(require("webpack"));
|
|
41
|
-
const
|
|
18
|
+
const EntryDependency_1 = __importDefault(require("webpack/lib/dependencies/EntryDependency"));
|
|
42
19
|
const webpack_sources_1 = require("webpack-sources");
|
|
43
20
|
const loader_utils_1 = require("loader-utils");
|
|
44
21
|
const helper_1 = require("@tarojs/helper");
|
|
@@ -152,7 +129,7 @@ class TaroMiniPlugin {
|
|
|
152
129
|
})));
|
|
153
130
|
compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation, { normalModuleFactory }) => {
|
|
154
131
|
/** For Webpack compilation get factory from compilation.dependencyFactories by denpendence's constructor */
|
|
155
|
-
compilation.dependencyFactories.set(
|
|
132
|
+
compilation.dependencyFactories.set(EntryDependency_1.default, normalModuleFactory);
|
|
156
133
|
compilation.dependencyFactories.set(TaroSingleEntryDependency_1.default, normalModuleFactory);
|
|
157
134
|
/**
|
|
158
135
|
* webpack NormalModule 在 runLoaders 真正解析资源的前一刻，
|
|
@@ -344,9 +321,9 @@ class TaroMiniPlugin {
|
|
|
344
321
|
}
|
|
345
322
|
});
|
|
346
323
|
if (!template.isSupportRecursive) {
|
|
347
|
-
this.addEntry(
|
|
324
|
+
this.addEntry(path_1.default.resolve(__dirname, '..', 'template/comp'), this.getIsBuildPluginPath('comp', true), helper_1.META_TYPE.STATIC);
|
|
348
325
|
}
|
|
349
|
-
this.addEntry(
|
|
326
|
+
this.addEntry(path_1.default.resolve(__dirname, '..', 'template/custom-wrapper'), this.getIsBuildPluginPath('custom-wrapper', true), helper_1.META_TYPE.STATIC);
|
|
350
327
|
normalFiles.forEach(item => {
|
|
351
328
|
this.addEntry(item.path, item.name, helper_1.META_TYPE.NORMAL, {
|
|
352
329
|
library: {
|
|
@@ -362,10 +339,10 @@ class TaroMiniPlugin {
|
|
|
362
339
|
this.compileFile(item);
|
|
363
340
|
if (item.isNative) {
|
|
364
341
|
this.addEntry(item.path, item.name, helper_1.META_TYPE.NORMAL);
|
|
365
|
-
if (item.stylePath &&
|
|
342
|
+
if (item.stylePath && fs_extra_1.default.existsSync(item.stylePath)) {
|
|
366
343
|
this.addEntry(item.stylePath, this.getStylePath(item.name), helper_1.META_TYPE.NORMAL);
|
|
367
344
|
}
|
|
368
|
-
if (item.templatePath &&
|
|
345
|
+
if (item.templatePath && fs_extra_1.default.existsSync(item.templatePath)) {
|
|
369
346
|
this.addEntry(item.templatePath, this.getTemplatePath(item.name), helper_1.META_TYPE.NORMAL);
|
|
370
347
|
}
|
|
371
348
|
}
|
|
@@ -377,10 +354,10 @@ class TaroMiniPlugin {
|
|
|
377
354
|
this.compileFile(item);
|
|
378
355
|
if (item.isNative) {
|
|
379
356
|
this.addEntry(item.path, item.name, helper_1.META_TYPE.NORMAL);
|
|
380
|
-
if (item.stylePath &&
|
|
357
|
+
if (item.stylePath && fs_extra_1.default.existsSync(item.stylePath)) {
|
|
381
358
|
this.addEntry(item.stylePath, this.getStylePath(item.name), helper_1.META_TYPE.NORMAL);
|
|
382
359
|
}
|
|
383
|
-
if (item.templatePath &&
|
|
360
|
+
if (item.templatePath && fs_extra_1.default.existsSync(item.templatePath)) {
|
|
384
361
|
this.addEntry(item.templatePath, this.getTemplatePath(item.name), helper_1.META_TYPE.NORMAL);
|
|
385
362
|
}
|
|
386
363
|
}
|
|
@@ -405,7 +382,7 @@ class TaroMiniPlugin {
|
|
|
405
382
|
* @returns app config 配置内容
|
|
406
383
|
*/
|
|
407
384
|
getAppConfig() {
|
|
408
|
-
const appName =
|
|
385
|
+
const appName = path_1.default.basename(this.appEntry).replace(path_1.default.extname(this.appEntry), '');
|
|
409
386
|
this.compileFile({
|
|
410
387
|
name: appName,
|
|
411
388
|
path: this.appEntry,
|
|
@@ -439,7 +416,7 @@ class TaroMiniPlugin {
|
|
|
439
416
|
this.getTabBarFiles(this.appConfig);
|
|
440
417
|
this.pages = new Set([
|
|
441
418
|
...appPages.map(item => {
|
|
442
|
-
const pagePath = (0, helper_1.resolveMainFilePath)(
|
|
419
|
+
const pagePath = (0, helper_1.resolveMainFilePath)(path_1.default.join(this.options.sourceDir, item), helper_1.FRAMEWORK_EXT_MAP[framework]);
|
|
443
420
|
const pageTemplatePath = this.getTemplatePath(pagePath);
|
|
444
421
|
const isNative = this.isNativePageORComponent(pageTemplatePath);
|
|
445
422
|
return {
|
|
@@ -471,7 +448,7 @@ class TaroMiniPlugin {
|
|
|
471
448
|
getConfigFiles(compiler) {
|
|
472
449
|
const filesConfig = this.filesConfig;
|
|
473
450
|
Object.keys(filesConfig).forEach(item => {
|
|
474
|
-
if (
|
|
451
|
+
if (fs_extra_1.default.existsSync(filesConfig[item].path)) {
|
|
475
452
|
this.addEntry(filesConfig[item].path, item, helper_1.META_TYPE.CONFIG);
|
|
476
453
|
}
|
|
477
454
|
});
|
|
@@ -513,16 +490,16 @@ class TaroMiniPlugin {
|
|
|
513
490
|
const { template } = this.options;
|
|
514
491
|
this.addEntry(this.appEntry, 'app', helper_1.META_TYPE.ENTRY);
|
|
515
492
|
if (!template.isSupportRecursive) {
|
|
516
|
-
this.addEntry(
|
|
493
|
+
this.addEntry(path_1.default.resolve(__dirname, '..', 'template/comp'), 'comp', helper_1.META_TYPE.STATIC);
|
|
517
494
|
}
|
|
518
|
-
this.addEntry(
|
|
495
|
+
this.addEntry(path_1.default.resolve(__dirname, '..', 'template/custom-wrapper'), 'custom-wrapper', helper_1.META_TYPE.STATIC);
|
|
519
496
|
this.pages.forEach(item => {
|
|
520
497
|
if (item.isNative) {
|
|
521
498
|
this.addEntry(item.path, item.name, helper_1.META_TYPE.NORMAL);
|
|
522
|
-
if (item.stylePath &&
|
|
499
|
+
if (item.stylePath && fs_extra_1.default.existsSync(item.stylePath)) {
|
|
523
500
|
this.addEntry(item.stylePath, this.getStylePath(item.name), helper_1.META_TYPE.NORMAL);
|
|
524
501
|
}
|
|
525
|
-
if (item.templatePath &&
|
|
502
|
+
if (item.templatePath && fs_extra_1.default.existsSync(item.templatePath)) {
|
|
526
503
|
this.addEntry(item.templatePath, this.getTemplatePath(item.name), helper_1.META_TYPE.NORMAL);
|
|
527
504
|
}
|
|
528
505
|
}
|
|
@@ -533,10 +510,10 @@ class TaroMiniPlugin {
|
|
|
533
510
|
this.components.forEach(item => {
|
|
534
511
|
if (item.isNative) {
|
|
535
512
|
this.addEntry(item.path, item.name, helper_1.META_TYPE.NORMAL);
|
|
536
|
-
if (item.stylePath &&
|
|
513
|
+
if (item.stylePath && fs_extra_1.default.existsSync(item.stylePath)) {
|
|
537
514
|
this.addEntry(item.stylePath, this.getStylePath(item.name), helper_1.META_TYPE.NORMAL);
|
|
538
515
|
}
|
|
539
|
-
if (item.templatePath &&
|
|
516
|
+
if (item.templatePath && fs_extra_1.default.existsSync(item.templatePath)) {
|
|
540
517
|
this.addEntry(item.templatePath, this.getTemplatePath(item.name), helper_1.META_TYPE.NORMAL);
|
|
541
518
|
}
|
|
542
519
|
}
|
|
@@ -546,7 +523,7 @@ class TaroMiniPlugin {
|
|
|
546
523
|
});
|
|
547
524
|
}
|
|
548
525
|
replaceExt(file, ext) {
|
|
549
|
-
return
|
|
526
|
+
return path_1.default.join(path_1.default.dirname(file), path_1.default.basename(file, path_1.default.extname(file)) + `${ext}`);
|
|
550
527
|
}
|
|
551
528
|
/**
|
|
552
529
|
* 读取页面、组件的配置，并递归读取依赖的组件的配置
|
|
@@ -576,8 +553,8 @@ class TaroMiniPlugin {
|
|
|
576
553
|
}
|
|
577
554
|
}
|
|
578
555
|
depComponents.forEach(item => {
|
|
579
|
-
const componentPath = (0, helper_1.resolveMainFilePath)(
|
|
580
|
-
if (
|
|
556
|
+
const componentPath = (0, helper_1.resolveMainFilePath)(path_1.default.resolve(path_1.default.dirname(file.path), item.path));
|
|
557
|
+
if (fs_extra_1.default.existsSync(componentPath) && !Array.from(this.components).some(item => item.path === componentPath)) {
|
|
581
558
|
const componentName = this.getComponentName(componentPath);
|
|
582
559
|
const componentTempPath = this.getTemplatePath(componentPath);
|
|
583
560
|
const isNative = this.isNativePageORComponent(componentTempPath);
|
|
@@ -622,7 +599,7 @@ class TaroMiniPlugin {
|
|
|
622
599
|
}
|
|
623
600
|
});
|
|
624
601
|
if (!hasPageIn) {
|
|
625
|
-
const pagePath = (0, helper_1.resolveMainFilePath)(
|
|
602
|
+
const pagePath = (0, helper_1.resolveMainFilePath)(path_1.default.join(this.options.sourceDir, pageItem), helper_1.FRAMEWORK_EXT_MAP[framework]);
|
|
626
603
|
const templatePath = this.getTemplatePath(pagePath);
|
|
627
604
|
const isNative = this.isNativePageORComponent(templatePath);
|
|
628
605
|
if (isIndependent) {
|
|
@@ -665,7 +642,7 @@ class TaroMiniPlugin {
|
|
|
665
642
|
path: `${compiler.options.output.path}/${name}`,
|
|
666
643
|
chunkLoadingGlobal: `subpackage_${name}`
|
|
667
644
|
});
|
|
668
|
-
const compPath =
|
|
645
|
+
const compPath = path_1.default.resolve(__dirname, '..', 'template/comp');
|
|
669
646
|
childCompiler.inputFileSystem = compiler.inputFileSystem;
|
|
670
647
|
childCompiler.outputFileSystem = compiler.outputFileSystem;
|
|
671
648
|
childCompiler.context = compiler.context;
|
|
@@ -718,8 +695,8 @@ class TaroMiniPlugin {
|
|
|
718
695
|
needAddCommon: [`${name}/comp`]
|
|
719
696
|
}).apply(childCompiler);
|
|
720
697
|
// 添加 comp 和 custom-wrapper 组件
|
|
721
|
-
new TaroSingleEntryPlugin_1.default(compiler.context,
|
|
722
|
-
new TaroSingleEntryPlugin_1.default(compiler.context,
|
|
698
|
+
new TaroSingleEntryPlugin_1.default(compiler.context, path_1.default.resolve(__dirname, '..', 'template/comp'), `${name}/comp`, helper_1.META_TYPE.STATIC).apply(childCompiler);
|
|
699
|
+
new TaroSingleEntryPlugin_1.default(compiler.context, path_1.default.resolve(__dirname, '..', 'template/custom-wrapper'), `${name}/custom-wrapper`, helper_1.META_TYPE.STATIC).apply(childCompiler);
|
|
723
700
|
promises.push(new Promise((resolve, reject) => {
|
|
724
701
|
childCompiler.runAsChild(err => {
|
|
725
702
|
if (err) {
|
|
@@ -749,9 +726,9 @@ class TaroMiniPlugin {
|
|
|
749
726
|
item['selectedIconPath'] && this.tabBarIcons.add(item['selectedIconPath']);
|
|
750
727
|
});
|
|
751
728
|
if (tabBar.custom) {
|
|
752
|
-
const customTabBarPath =
|
|
729
|
+
const customTabBarPath = path_1.default.join(sourceDir, 'custom-tab-bar');
|
|
753
730
|
const customTabBarComponentPath = (0, helper_1.resolveMainFilePath)(customTabBarPath, [...helper_1.FRAMEWORK_EXT_MAP[framework], ...helper_1.SCRIPT_EXT]);
|
|
754
|
-
if (
|
|
731
|
+
if (fs_extra_1.default.existsSync(customTabBarComponentPath)) {
|
|
755
732
|
const customTabBarComponentTemplPath = this.getTemplatePath(customTabBarComponentPath);
|
|
756
733
|
const isNative = this.isNativePageORComponent(customTabBarComponentTemplPath);
|
|
757
734
|
if (!this.isWatch && ((_a = this.options.logger) === null || _a === void 0 ? void 0 : _a.quiet) === false) {
|
|
@@ -772,7 +749,7 @@ class TaroMiniPlugin {
|
|
|
772
749
|
}
|
|
773
750
|
/** 是否为小程序原生页面或组件 */
|
|
774
751
|
isNativePageORComponent(templatePath) {
|
|
775
|
-
return
|
|
752
|
+
return fs_extra_1.default.existsSync(templatePath);
|
|
776
753
|
}
|
|
777
754
|
getShowPath(filePath) {
|
|
778
755
|
return filePath.replace(this.context, '').replace(/\\/g, '/').replace(/^\//, '');
|
|
@@ -805,7 +782,7 @@ class TaroMiniPlugin {
|
|
|
805
782
|
}
|
|
806
783
|
if (!this.options.blended && !isBuildPlugin) {
|
|
807
784
|
const appConfigPath = this.getConfigFilePath(this.appEntry);
|
|
808
|
-
const appConfigName =
|
|
785
|
+
const appConfigName = path_1.default.basename(appConfigPath).replace(path_1.default.extname(appConfigPath), '');
|
|
809
786
|
this.generateConfigFile(compilation, this.appEntry, this.filesConfig[appConfigName].content);
|
|
810
787
|
}
|
|
811
788
|
if (!template.isSupportRecursive) {
|
|
@@ -862,7 +839,7 @@ class TaroMiniPlugin {
|
|
|
862
839
|
this.generateXSFile(compilation, `${name}/utils`, isBuildPlugin);
|
|
863
840
|
});
|
|
864
841
|
this.components.forEach(component => {
|
|
865
|
-
const importBaseTemplatePath = (0, helper_1.promoteRelativePath)(
|
|
842
|
+
const importBaseTemplatePath = (0, helper_1.promoteRelativePath)(path_1.default.relative(component.path, path_1.default.join(sourceDir, this.getTemplatePath(baseTemplateName))));
|
|
866
843
|
const config = this.filesConfig[this.getConfigFilePath(component.name)];
|
|
867
844
|
if (config) {
|
|
868
845
|
this.generateConfigFile(compilation, component.path, config.content);
|
|
@@ -872,7 +849,7 @@ class TaroMiniPlugin {
|
|
|
872
849
|
}
|
|
873
850
|
});
|
|
874
851
|
this.pages.forEach(page => {
|
|
875
|
-
let importBaseTemplatePath = (0, helper_1.promoteRelativePath)(
|
|
852
|
+
let importBaseTemplatePath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, this.getTemplatePath(baseTemplateName))));
|
|
876
853
|
const config = this.filesConfig[this.getConfigFilePath(page.name)];
|
|
877
854
|
let isIndependent = false;
|
|
878
855
|
let independentName = '';
|
|
@@ -880,15 +857,15 @@ class TaroMiniPlugin {
|
|
|
880
857
|
if (pages.includes(page.path)) {
|
|
881
858
|
isIndependent = true;
|
|
882
859
|
independentName = name;
|
|
883
|
-
importBaseTemplatePath = (0, helper_1.promoteRelativePath)(
|
|
860
|
+
importBaseTemplatePath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, name, this.getTemplatePath(baseTemplateName))));
|
|
884
861
|
}
|
|
885
862
|
});
|
|
886
863
|
if (config) {
|
|
887
|
-
let importBaseCompPath = (0, helper_1.promoteRelativePath)(
|
|
888
|
-
let importCustomWrapperPath = (0, helper_1.promoteRelativePath)(
|
|
864
|
+
let importBaseCompPath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, this.getTargetFilePath(this.getIsBuildPluginPath(baseCompName, isBuildPlugin), ''))));
|
|
865
|
+
let importCustomWrapperPath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, this.getTargetFilePath(this.getIsBuildPluginPath(customWrapperName, isBuildPlugin), ''))));
|
|
889
866
|
if (isIndependent) {
|
|
890
|
-
importBaseCompPath = (0, helper_1.promoteRelativePath)(
|
|
891
|
-
importCustomWrapperPath = (0, helper_1.promoteRelativePath)(
|
|
867
|
+
importBaseCompPath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, independentName, this.getTargetFilePath(this.getIsBuildPluginPath(baseCompName, isBuildPlugin), ''))));
|
|
868
|
+
importCustomWrapperPath = (0, helper_1.promoteRelativePath)(path_1.default.relative(page.path, path_1.default.join(sourceDir, independentName, this.getTargetFilePath(this.getIsBuildPluginPath(customWrapperName, isBuildPlugin), ''))));
|
|
892
869
|
}
|
|
893
870
|
config.content.usingComponents = Object.assign({ [customWrapperName]: importCustomWrapperPath }, config.content.usingComponents);
|
|
894
871
|
if (!template.isSupportRecursive && !page.isNative) {
|
|
@@ -906,9 +883,9 @@ class TaroMiniPlugin {
|
|
|
906
883
|
this.generateDarkModeFile(compilation);
|
|
907
884
|
}
|
|
908
885
|
if (isBuildPlugin) {
|
|
909
|
-
const pluginJSONPath =
|
|
910
|
-
if (
|
|
911
|
-
const pluginJSON =
|
|
886
|
+
const pluginJSONPath = path_1.default.join(sourceDir, 'plugin', 'plugin.json');
|
|
887
|
+
if (fs_extra_1.default.existsSync(pluginJSONPath)) {
|
|
888
|
+
const pluginJSON = fs_extra_1.default.readJSONSync(pluginJSONPath);
|
|
912
889
|
this.modifyPluginJSON(pluginJSON);
|
|
913
890
|
const relativePath = pluginJSONPath.replace(sourceDir, '').replace(/\\/g, '/');
|
|
914
891
|
compilation.assets[relativePath] = new webpack_sources_1.RawSource(JSON.stringify(pluginJSON));
|
|
@@ -954,11 +931,11 @@ class TaroMiniPlugin {
|
|
|
954
931
|
getComponentName(componentPath) {
|
|
955
932
|
let componentName;
|
|
956
933
|
if (helper_1.NODE_MODULES_REG.test(componentPath)) {
|
|
957
|
-
componentName = componentPath.replace(this.context, '').replace(/\\/g, '/').replace(
|
|
934
|
+
componentName = componentPath.replace(this.context, '').replace(/\\/g, '/').replace(path_1.default.extname(componentPath), '');
|
|
958
935
|
componentName = componentName.replace(/node_modules/gi, 'npm');
|
|
959
936
|
}
|
|
960
937
|
else {
|
|
961
|
-
componentName = componentPath.replace(this.options.sourceDir, '').replace(/\\/g, '/').replace(
|
|
938
|
+
componentName = componentPath.replace(this.options.sourceDir, '').replace(/\\/g, '/').replace(path_1.default.extname(componentPath), '');
|
|
962
939
|
}
|
|
963
940
|
return componentName.replace(/^(\/|\\)/, '');
|
|
964
941
|
}
|
|
@@ -970,7 +947,7 @@ class TaroMiniPlugin {
|
|
|
970
947
|
* @returns config 的路径
|
|
971
948
|
*/
|
|
972
949
|
getConfigFilePath(filePath) {
|
|
973
|
-
return (0, helper_1.resolveMainFilePath)(`${filePath.replace(
|
|
950
|
+
return (0, helper_1.resolveMainFilePath)(`${filePath.replace(path_1.default.extname(filePath), '')}.config`);
|
|
974
951
|
}
|
|
975
952
|
/** 处理 xml 文件后缀 */
|
|
976
953
|
getTemplatePath(filePath) {
|
|
@@ -986,7 +963,7 @@ class TaroMiniPlugin {
|
|
|
986
963
|
}
|
|
987
964
|
/** 处理 extname */
|
|
988
965
|
getTargetFilePath(filePath, targetExtname) {
|
|
989
|
-
const extname =
|
|
966
|
+
const extname = path_1.default.extname(filePath);
|
|
990
967
|
if (extname) {
|
|
991
968
|
return filePath.replace(extname, targetExtname);
|
|
992
969
|
}
|
|
@@ -997,9 +974,9 @@ class TaroMiniPlugin {
|
|
|
997
974
|
* @param compilation
|
|
998
975
|
*/
|
|
999
976
|
generateDarkModeFile(compilation) {
|
|
1000
|
-
const themeLocationPath =
|
|
1001
|
-
if (
|
|
1002
|
-
const themeLocationSource =
|
|
977
|
+
const themeLocationPath = path_1.default.resolve(this.options.sourceDir, this.themeLocation);
|
|
978
|
+
if (fs_extra_1.default.existsSync(themeLocationPath)) {
|
|
979
|
+
const themeLocationSource = fs_extra_1.default.readFileSync(themeLocationPath);
|
|
1003
980
|
compilation.assets[this.themeLocation] = new webpack_sources_1.RawSource(themeLocationSource);
|
|
1004
981
|
}
|
|
1005
982
|
}
|
|
@@ -1008,9 +985,9 @@ class TaroMiniPlugin {
|
|
|
1008
985
|
*/
|
|
1009
986
|
generateTabBarFiles(compilation) {
|
|
1010
987
|
this.tabBarIcons.forEach(icon => {
|
|
1011
|
-
const iconPath =
|
|
1012
|
-
if (
|
|
1013
|
-
const iconSource =
|
|
988
|
+
const iconPath = path_1.default.resolve(this.options.sourceDir, icon);
|
|
989
|
+
if (fs_extra_1.default.existsSync(iconPath)) {
|
|
990
|
+
const iconSource = fs_extra_1.default.readFileSync(iconPath);
|
|
1014
991
|
compilation.assets[icon] = new webpack_sources_1.RawSource(iconSource);
|
|
1015
992
|
}
|
|
1016
993
|
});
|
|
@@ -1027,7 +1004,7 @@ class TaroMiniPlugin {
|
|
|
1027
1004
|
const originSource = assets[appStyle];
|
|
1028
1005
|
const source = new webpack_sources_1.ConcatSource(originSource);
|
|
1029
1006
|
Object.keys(assets).forEach(assetName => {
|
|
1030
|
-
const fileName =
|
|
1007
|
+
const fileName = path_1.default.basename(assetName, path_1.default.extname(assetName));
|
|
1031
1008
|
if ((helper_1.REG_STYLE.test(assetName) || REG_STYLE_EXT.test(assetName)) && this.options.commonChunks.includes(fileName)) {
|
|
1032
1009
|
source.add('\n');
|
|
1033
1010
|
source.add(`@import ${JSON.stringify((0, loader_utils_1.urlToRequest)(assetName))};`);
|