@tarojs/webpack5-prebundle 3.5.0-beta.4 → 3.5.0-beta.7
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/h5.d.ts +1 -0
- package/dist/h5.js +14 -9
- package/dist/h5.js.map +1 -1
- package/dist/index.d.ts +4 -3
- package/dist/index.js +11 -3
- package/dist/index.js.map +1 -1
- package/dist/mini.d.ts +1 -1
- package/dist/mini.js +32 -29
- package/dist/mini.js.map +1 -1
- package/dist/prebundle/bundle.d.ts +3 -3
- package/dist/prebundle/bundle.js +20 -55
- package/dist/prebundle/bundle.js.map +1 -1
- package/dist/prebundle/index.d.ts +8 -5
- package/dist/prebundle/index.js +73 -18
- package/dist/prebundle/index.js.map +1 -1
- package/dist/prebundle/scanImports.js +32 -32
- package/dist/prebundle/scanImports.js.map +1 -1
- package/dist/utils/constant.d.ts +1 -0
- package/dist/utils/constant.js +2 -1
- package/dist/utils/constant.js.map +1 -1
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.js +14 -7
- package/dist/utils/index.js.map +1 -1
- package/package.json +13 -14
package/dist/h5.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import VirtualModulesPlugin from 'webpack-virtual-modules';
|
|
|
3
3
|
import BasePrebundle, { IPrebundleConfig } from './prebundle';
|
|
4
4
|
export declare const VirtualModule: VirtualModulesPlugin;
|
|
5
5
|
export interface IH5PrebundleConfig extends IPrebundleConfig {
|
|
6
|
+
chunkFilename?: string;
|
|
6
7
|
devServer?: webpackDevServer.Configuration;
|
|
7
8
|
publicPath?: string;
|
|
8
9
|
}
|
package/dist/h5.js
CHANGED
|
@@ -49,16 +49,16 @@ const TaroModuleFederationPlugin_1 = __importDefault(require("./webpack/TaroModu
|
|
|
49
49
|
exports.VirtualModule = new webpack_virtual_modules_1.default();
|
|
50
50
|
class H5Prebundle extends prebundle_1.default {
|
|
51
51
|
buildLib() {
|
|
52
|
+
var _a, _b;
|
|
52
53
|
return __awaiter(this, void 0, void 0, function* () {
|
|
53
54
|
const BUILD_LIB_START = perf_hooks_1.performance.now();
|
|
54
55
|
const exposes = {};
|
|
55
|
-
const { chunkDirectory = 'chunk' } = this.config;
|
|
56
56
|
const mode = process.env.NODE_ENV === 'production' ? 'production' : 'development';
|
|
57
57
|
const devtool = this.config.enableSourceMap && 'hidden-source-map';
|
|
58
58
|
const mainBuildOutput = this.chain.output.entries();
|
|
59
59
|
const publicPath = this.config.publicPath ? (0, utils_1.addLeadingSlash)((0, utils_1.addTrailingSlash)(this.config.publicPath)) : '/';
|
|
60
60
|
const output = {
|
|
61
|
-
chunkFilename:
|
|
61
|
+
chunkFilename: this.config.chunkFilename,
|
|
62
62
|
chunkLoadingGlobal: mainBuildOutput.chunkLoadingGlobal,
|
|
63
63
|
globalObject: mainBuildOutput.globalObject,
|
|
64
64
|
path: this.remoteCacheDir,
|
|
@@ -137,7 +137,9 @@ class H5Prebundle extends prebundle_1.default {
|
|
|
137
137
|
this.metadata.runtimeRequirements = new Set(this.preMetadata.runtimeRequirements);
|
|
138
138
|
this.metadata.remoteAssets = this.preMetadata.remoteAssets;
|
|
139
139
|
}
|
|
140
|
-
|
|
140
|
+
if (process.env.NODE_ENV === 'production' || ((_b = (_a = this.config.devServer) === null || _a === void 0 ? void 0 : _a.devMiddleware) === null || _b === void 0 ? void 0 : _b.writeToDisk)) {
|
|
141
|
+
fs_extra_1.default.copy(this.remoteCacheDir, mainBuildOutput.path);
|
|
142
|
+
}
|
|
141
143
|
this.measure(`Build remote ${constant_1.MF_NAME} duration`, BUILD_LIB_START);
|
|
142
144
|
});
|
|
143
145
|
}
|
|
@@ -158,7 +160,7 @@ class H5Prebundle extends prebundle_1.default {
|
|
|
158
160
|
/** 扫描出所有的 node_modules 依赖 */
|
|
159
161
|
const entries = this.getEntries(this.entryPath);
|
|
160
162
|
const { include = [], exclude = [] } = this.option;
|
|
161
|
-
yield this.setDeps(entries,
|
|
163
|
+
yield this.setDeps(entries, include, exclude);
|
|
162
164
|
/** 使用 esbuild 对 node_modules 依赖进行 bundle */
|
|
163
165
|
yield this.bundle();
|
|
164
166
|
/** 把依赖的 bundle 产物打包成 Webpack Module Federation 格式 */
|
|
@@ -169,11 +171,14 @@ class H5Prebundle extends prebundle_1.default {
|
|
|
169
171
|
const script = this.chain.module.rule('script');
|
|
170
172
|
script.exclude.add(/node_modules/);
|
|
171
173
|
// Proxy
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
174
|
+
if (process.env.NODE_ENV !== 'production' || this.config.devServer) {
|
|
175
|
+
this.chain.devServer.merge({
|
|
176
|
+
static: [{
|
|
177
|
+
directory: this.remoteCacheDir,
|
|
178
|
+
watch: true
|
|
179
|
+
}]
|
|
180
|
+
});
|
|
181
|
+
}
|
|
177
182
|
yield _super.run.call(this);
|
|
178
183
|
});
|
|
179
184
|
}
|
package/dist/h5.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"h5.js","sourceRoot":"","sources":["../src/h5.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qDAAqD;AACrD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wDAAyB;AACzB,gDAAuB;AACvB,2CAAwC;AACxC,sDAAwC;AAExC,sFAA0D;AAE1D,4DAA6D;AAC7D,mCAMgB;AAChB,+CAAoD;AACpD,sGAA6E;AAEhE,QAAA,aAAa,GAAG,IAAI,iCAAoB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"h5.js","sourceRoot":"","sources":["../src/h5.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -7,10 +7,10 @@ import { IPrebundle } from './prebundle';
|
|
|
7
7
|
export * from './prebundle';
|
|
8
8
|
export interface IPrebundleParam {
|
|
9
9
|
env?: string;
|
|
10
|
-
appPath
|
|
11
|
-
sourceRoot
|
|
10
|
+
appPath?: string;
|
|
11
|
+
sourceRoot?: string;
|
|
12
12
|
chain: Chain;
|
|
13
|
-
entry
|
|
13
|
+
entry?: EntryObject;
|
|
14
14
|
chunkDirectory?: string;
|
|
15
15
|
enableSourceMap?: boolean;
|
|
16
16
|
entryFileName?: string;
|
|
@@ -23,5 +23,6 @@ export default class TaroPrebundle {
|
|
|
23
23
|
env: string;
|
|
24
24
|
constructor(params: IPrebundleParam);
|
|
25
25
|
get config(): IH5PrebundleConfig | IMiniPrebundleConfig;
|
|
26
|
+
get entry(): EntryObject;
|
|
26
27
|
run(options: IPrebundle): Promise<void>;
|
|
27
28
|
}
|
package/dist/index.js
CHANGED
|
@@ -43,22 +43,30 @@ class TaroPrebundle {
|
|
|
43
43
|
this.env = env;
|
|
44
44
|
}
|
|
45
45
|
get config() {
|
|
46
|
+
var _a, _b;
|
|
46
47
|
const env = this.env;
|
|
47
|
-
const { appPath, chain, chunkDirectory = 'chunk', devServer, enableSourceMap = false, entryFileName = 'app', entry =
|
|
48
|
+
const { appPath = process.cwd(), chain, chunkDirectory = 'chunk', devServer = (_a = chain.devServer) === null || _a === void 0 ? void 0 : _a.entries(), enableSourceMap = false, entryFileName = 'app', entry = this.entry, publicPath = chain.output.get('publicPath'), runtimePath, sourceRoot = 'src' } = this.params;
|
|
49
|
+
const chunkFilename = (_b = chain.output.get('chunkFilename')) !== null && _b !== void 0 ? _b : `${chunkDirectory}/[name].js`;
|
|
48
50
|
return {
|
|
49
51
|
appPath,
|
|
50
52
|
chain,
|
|
51
|
-
|
|
53
|
+
chunkFilename,
|
|
52
54
|
devServer,
|
|
53
55
|
enableSourceMap,
|
|
54
56
|
entryFileName,
|
|
55
|
-
entry,
|
|
57
|
+
entry: typeof entry === 'string' ? { [entryFileName]: entry } : entry,
|
|
56
58
|
env,
|
|
57
59
|
publicPath,
|
|
58
60
|
runtimePath,
|
|
59
61
|
sourceRoot
|
|
60
62
|
};
|
|
61
63
|
}
|
|
64
|
+
get entry() {
|
|
65
|
+
return Object.entries(this.params.chain.entryPoints.entries()).reduce((entry, [key, value]) => {
|
|
66
|
+
entry[key] = value.values();
|
|
67
|
+
return entry;
|
|
68
|
+
}, {});
|
|
69
|
+
}
|
|
62
70
|
run(options) {
|
|
63
71
|
return __awaiter(this, void 0, void 0, function* () {
|
|
64
72
|
if (!options.enable)
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,8CAA2B;AAkB3B,MAAqB,aAAa;IAGhC,YAAuB,MAAuB;QAAvB,WAAM,GAAN,MAAM,CAAiB;QAC5C,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,IAAI,EAAE,GAAG,MAAM,CAAA;QACrD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,IAAI,MAAM
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,8CAA2B;AAkB3B,MAAqB,aAAa;IAGhC,YAAuB,MAAuB;QAAvB,WAAM,GAAN,MAAM,CAAiB;QAC5C,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,IAAI,EAAE,GAAG,MAAM,CAAA;QACrD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,IAAI,MAAM;;QACR,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;QACpB,MAAM,EACJ,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,EACvB,KAAK,EACL,cAAc,GAAG,OAAO,EACxB,SAAS,GAAG,MAAA,KAAK,CAAC,SAAS,0CAAE,OAAO,EAAE,EACtC,eAAe,GAAG,KAAK,EACvB,aAAa,GAAG,KAAK,EACrB,KAAK,GAAG,IAAI,CAAC,KAAK,EAClB,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,EAC3C,WAAW,EACX,UAAU,GAAG,KAAK,EACnB,GAAG,IAAI,CAAC,MAAM,CAAA;QACf,MAAM,aAAa,GAAG,MAAA,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,mCAAI,GAAG,cAAc,YAAY,CAAA;QAExF,OAAO;YACL,OAAO;YACP,KAAK;YACL,aAAa;YACb,SAAS;YACT,eAAe;YACf,aAAa;YACb,KAAK,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK;YACrE,GAAG;YACH,UAAU;YACV,WAAW;YACX,UAAU;SACX,CAAA;IACH,CAAC;IAED,IAAI,KAAK;QACP,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC5F,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAA;YAC3B,OAAO,KAAK,CAAA;QACd,CAAC,EAAE,EAAiB,CAAC,CAAA;IACvB,CAAC;IAEK,GAAG,CAAE,OAAmB;;YAC5B,IAAI,CAAC,OAAO,CAAC,MAAM;gBAAE,OAAM;YAE3B,IAAI,eAA8B,CAAA;YAElC,QAAQ,IAAI,CAAC,GAAG,EAAE;gBAChB,KAAK,IAAI;oBACP,eAAe,GAAG,IAAI,CAAC,wDAAa,MAAM,GAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;oBAC9E,MAAK;gBACP;oBACE,eAAe,GAAG,IAAI,CAAC,wDAAa,QAAQ,GAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;aACrF;YAED,OAAO,eAAe,CAAC,GAAG,EAAE,CAAA;QAC9B,CAAC;KAAA;CACF;AA7DD,gCA6DC"}
|
package/dist/mini.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ export interface IMiniPrebundleConfig extends IPrebundleConfig {
|
|
|
3
3
|
runtimePath?: string | string[];
|
|
4
4
|
}
|
|
5
5
|
export declare class MiniPrebundle extends BasePrebundle<IMiniPrebundleConfig> {
|
|
6
|
-
bundle(): Promise<
|
|
6
|
+
bundle(): Promise<any>;
|
|
7
7
|
buildLib(): Promise<void>;
|
|
8
8
|
run(): Promise<void>;
|
|
9
9
|
}
|
package/dist/mini.js
CHANGED
|
@@ -76,33 +76,38 @@ class MiniPrebundle extends prebundle_1.default {
|
|
|
76
76
|
this.metadata.bundleHash = yield (0, utils_1.getBundleHash)(this.appPath, this.deps, this.chain, this.cacheDir);
|
|
77
77
|
if (this.preMetadata.bundleHash !== this.metadata.bundleHash) {
|
|
78
78
|
this.isUseCache = false;
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
const
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
79
|
+
try {
|
|
80
|
+
const { metafile } = yield (0, bundle_1.bundle)({
|
|
81
|
+
appPath: this.appPath,
|
|
82
|
+
deps: this.deps,
|
|
83
|
+
chain: this.chain,
|
|
84
|
+
prebundleOutputDir: this.prebundleCacheDir,
|
|
85
|
+
customEsbuildConfig: this.customEsbuildConfig,
|
|
86
|
+
customSwcConfig: this.customSwcConfig
|
|
87
|
+
});
|
|
88
|
+
// 找出 @tarojs/runtime 被 split 切分的 chunk，作为后续 ProvidePlugin 的提供者。
|
|
89
|
+
// 原因是 @tarojs/runtime 里使用了一些如 raf、caf 等全局变量，又因为 esbuild 把
|
|
90
|
+
// @tarojs/runtime split 成 entry 和依赖 chunk 两部分。如果我们把 entry 作为
|
|
91
|
+
// ProvidePlugin 的提供者，依赖 chunk 会被注入 raf、caf，导致循环依赖的问题。所以
|
|
92
|
+
// 这种情况下只能把依赖 chunk 作为 ProvidePlugin 的提供者。
|
|
93
|
+
metafile && Object.keys(metafile.outputs).some(key => {
|
|
94
|
+
const output = metafile.outputs[key];
|
|
95
|
+
if (output.entryPoint === 'entry:@tarojs_runtime') {
|
|
96
|
+
const dep = output.imports.find(dep => {
|
|
97
|
+
const depPath = dep.path;
|
|
98
|
+
const depOutput = metafile.outputs[depPath];
|
|
99
|
+
return depOutput.exports.includes('TaroRootElement');
|
|
100
|
+
});
|
|
101
|
+
if (dep) {
|
|
102
|
+
this.metadata.taroRuntimeBundlePath = path_1.default.join(this.appPath, dep.path);
|
|
103
|
+
}
|
|
104
|
+
return true;
|
|
102
105
|
}
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
catch (result) {
|
|
109
|
+
return this.handleBundleError(result === null || result === void 0 ? void 0 : result.errors);
|
|
110
|
+
}
|
|
106
111
|
}
|
|
107
112
|
else {
|
|
108
113
|
this.metadata.taroRuntimeBundlePath = path_1.default.join(this.appPath, this.preMetadata.taroRuntimeBundlePath);
|
|
@@ -224,9 +229,7 @@ class MiniPrebundle extends prebundle_1.default {
|
|
|
224
229
|
// plugin-platform 等插件的 runtime 文件入口
|
|
225
230
|
const runtimePath = typeof this.config.runtimePath === 'string' ? [this.config.runtimePath] : this.config.runtimePath || [];
|
|
226
231
|
const { include = [], exclude = [] } = this.option;
|
|
227
|
-
yield this.setDeps(entries,
|
|
228
|
-
'@tarojs/components' // 小程序编译 Host 时需要扫描 @tarojs/components 的 useExports，因此不能被 external
|
|
229
|
-
].concat(exclude));
|
|
232
|
+
yield this.setDeps(entries, include.concat(...runtimePath.map(item => item.replace(/^post:/, ''))), exclude);
|
|
230
233
|
/** 使用 esbuild 对 node_modules 依赖进行 bundle */
|
|
231
234
|
yield this.bundle();
|
|
232
235
|
/** 把依赖的 bundle 产物打包成 Webpack Module Federation 格式 */
|
package/dist/mini.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mini.js","sourceRoot":"","sources":["../src/mini.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAqD;AACrD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wDAAyB;AACzB,gDAAuB;AACvB,2CAAwC;AACxC,mDAAuD;AAEvD,4DAA6D;AAC7D,+CAA2C;AAC3C,mCAKgB;AAChB,+CAA0C;AAC1C,sGAA6E;AAM7E,MAAa,aAAc,SAAQ,mBAAmC;IAC9D,MAAM;;YACV,MAAM,eAAe,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAA;YAEzC,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,MAAM,IAAA,qBAAa,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;YAElG,IAAI,IAAI,CAAC,WAAW,CAAC,UAAU,KAAK,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;gBAC5D,IAAI,CAAC,UAAU,GAAG,KAAK,CAAA;gBAEvB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,eAAM,EAAC;
|
|
1
|
+
{"version":3,"file":"mini.js","sourceRoot":"","sources":["../src/mini.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Config } from '@swc/core';
|
|
2
2
|
import { parse } from 'es-module-lexer';
|
|
3
3
|
import esbuild, { Plugin } from 'esbuild';
|
|
4
4
|
import Chain from 'webpack-chain';
|
|
@@ -13,7 +13,7 @@ interface BundleConfig {
|
|
|
13
13
|
chain: Chain;
|
|
14
14
|
prebundleOutputDir: string;
|
|
15
15
|
customEsbuildConfig?: Record<string, any>;
|
|
16
|
-
customSwcConfig?:
|
|
16
|
+
customSwcConfig?: Config;
|
|
17
17
|
}
|
|
18
18
|
export declare function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig, customSwcConfig }: BundleConfig): Promise<esbuild.BuildResult & {
|
|
19
19
|
outputFiles: esbuild.OutputFile[];
|
|
@@ -21,5 +21,5 @@ export declare function bundle({ appPath, deps, chain, prebundleOutputDir, custo
|
|
|
21
21
|
export declare function getSwcPlugin({ appPath, flatIdExports }: {
|
|
22
22
|
appPath: string;
|
|
23
23
|
flatIdExports: Map<string, ExportsData>;
|
|
24
|
-
}, config?:
|
|
24
|
+
}, config?: Config): Plugin;
|
|
25
25
|
export {};
|
package/dist/prebundle/bundle.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
|
exports.getSwcPlugin = exports.bundle = void 0;
|
|
39
|
-
const
|
|
16
|
+
const core_1 = require("@swc/core");
|
|
40
17
|
const helper_1 = require("@tarojs/helper");
|
|
41
18
|
const es_module_lexer_1 = require("es-module-lexer");
|
|
42
19
|
const esbuild_1 = __importDefault(require("esbuild"));
|
|
@@ -75,34 +52,19 @@ function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig
|
|
|
75
52
|
fs_extra_1.default.existsSync(prebundleOutputDir)
|
|
76
53
|
? fs_extra_1.default.emptyDirSync(prebundleOutputDir)
|
|
77
54
|
: fs_extra_1.default.ensureDirSync(prebundleOutputDir);
|
|
78
|
-
return esbuild_1.default.build({
|
|
79
|
-
absWorkingDir: appPath,
|
|
80
|
-
bundle: true,
|
|
81
|
-
write: false,
|
|
82
|
-
entryPoints: Array.from(flattenDeps.keys()),
|
|
83
|
-
mainFields: ['main:h5', 'browser', 'module', 'jsnext:main', 'main'],
|
|
84
|
-
format: 'esm',
|
|
85
|
-
loader: (0, lodash_1.defaults)(customEsbuildConfig.loader, constant_1.defaultEsbuildLoader),
|
|
86
|
-
define: Object.assign(Object.assign({}, (0, utils_1.getDefines)(chain)), {
|
|
55
|
+
return esbuild_1.default.build(Object.assign(Object.assign({}, customEsbuildConfig), { absWorkingDir: appPath, bundle: true, write: false, entryPoints: Array.from(flattenDeps.keys()), mainFields: ['main:h5', 'browser', 'module', 'jsnext:main', 'main'], format: 'esm', loader: (0, lodash_1.defaults)(customEsbuildConfig.loader, constant_1.defaultEsbuildLoader), define: Object.assign(Object.assign({}, (0, utils_1.getDefines)(chain)), {
|
|
87
56
|
// AMD 被 esbuild 转 ESM 后，是套着 ESM 外皮的 AMD 语法模块。
|
|
88
57
|
// Webpack HarmonyDetectionParserPlugin 会阻止 AMDDefineDependencyParserPlugin 对这些模块的处理。
|
|
89
58
|
// 导致这些模块报错（如 lodash）。目前的办法是把 define 置为 false，不支持 AMD 导出。
|
|
90
|
-
define: 'false' }),
|
|
91
|
-
splitting: true,
|
|
92
|
-
metafile: true,
|
|
93
|
-
ignoreAnnotations: true,
|
|
94
|
-
outdir: prebundleOutputDir,
|
|
95
|
-
plugins: [
|
|
59
|
+
define: 'false' }), splitting: true, metafile: true, ignoreAnnotations: true, outdir: prebundleOutputDir, plugins: [
|
|
96
60
|
getEntryPlugin({
|
|
97
61
|
flattenDeps,
|
|
98
62
|
flatIdExports,
|
|
99
|
-
prebundleOutputDir
|
|
100
|
-
swcConfig: customSwcConfig || {}
|
|
63
|
+
prebundleOutputDir
|
|
101
64
|
}),
|
|
102
65
|
...customEsbuildConfig.plugins || [],
|
|
103
66
|
getSwcPlugin({ appPath, flatIdExports }, customSwcConfig)
|
|
104
|
-
]
|
|
105
|
-
});
|
|
67
|
+
] }));
|
|
106
68
|
});
|
|
107
69
|
}
|
|
108
70
|
exports.bundle = bundle;
|
|
@@ -112,8 +74,8 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
112
74
|
name: 'entry',
|
|
113
75
|
setup(build) {
|
|
114
76
|
// assets
|
|
115
|
-
build.onResolve({ filter: constant_1.assetsRE }, ({ path: id,
|
|
116
|
-
const filePath = path_1.default.
|
|
77
|
+
build.onResolve({ filter: constant_1.assetsRE }, ({ path: id, importer }) => __awaiter(this, void 0, void 0, function* () {
|
|
78
|
+
const filePath = yield resolve(path_1.default.dirname(importer), id);
|
|
117
79
|
const fileExt = path_1.default.extname(filePath);
|
|
118
80
|
const fileBasename = path_1.default.basename(filePath, fileExt);
|
|
119
81
|
const fileContent = yield fs_extra_1.default.readFile(filePath);
|
|
@@ -121,7 +83,7 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
121
83
|
yield fs_extra_1.default.writeFile(outputFile, fileContent);
|
|
122
84
|
return (0, utils_1.externalModule)({ path: `./${path_1.default.relative(prebundleOutputDir, outputFile)}` });
|
|
123
85
|
}));
|
|
124
|
-
build.onResolve({ filter:
|
|
86
|
+
build.onResolve({ filter: constant_1.moduleRE }, ({ path: id, importer }) => __awaiter(this, void 0, void 0, function* () {
|
|
125
87
|
// entry
|
|
126
88
|
if (!importer && flattenDeps.has(id)) {
|
|
127
89
|
return {
|
|
@@ -129,17 +91,20 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
129
91
|
namespace: 'entry'
|
|
130
92
|
};
|
|
131
93
|
}
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
94
|
+
try {
|
|
95
|
+
const resolvedPath = yield resolve(path_1.default.dirname(importer), id);
|
|
96
|
+
if (typeof resolvedPath === 'string' && !constant_1.assetsRE.test(resolvedPath)) {
|
|
97
|
+
return { path: resolvedPath };
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
return (0, utils_1.externalModule)({ path: id });
|
|
101
|
+
}
|
|
135
102
|
}
|
|
136
|
-
|
|
137
|
-
return {
|
|
138
|
-
path: resolvedPath
|
|
139
|
-
};
|
|
103
|
+
catch (e) {
|
|
104
|
+
return (0, utils_1.externalModule)({ path: id });
|
|
140
105
|
}
|
|
141
106
|
}));
|
|
142
|
-
build.onLoad({ filter:
|
|
107
|
+
build.onLoad({ filter: constant_1.moduleRE, namespace: 'entry' }, ({ path: id }) => __awaiter(this, void 0, void 0, function* () {
|
|
143
108
|
var _a;
|
|
144
109
|
let js = '';
|
|
145
110
|
const filePath = (_a = flattenDeps.get(id)) === null || _a === void 0 ? void 0 : _a.replace(/\\/g, '\\\\');
|
|
@@ -187,7 +152,7 @@ function getSwcPlugin({ appPath, flatIdExports }, config) {
|
|
|
187
152
|
yield Promise.all(outputFiles.map(({ path, text }) => __awaiter(this, void 0, void 0, function* () {
|
|
188
153
|
if (!helper_1.REG_SCRIPTS.test(path))
|
|
189
154
|
return;
|
|
190
|
-
const { code } =
|
|
155
|
+
const { code } = (0, core_1.transformSync)(text, (0, lodash_1.defaults)(config, { jsc: { target: 'es2015' } }));
|
|
191
156
|
fs_extra_1.default.writeFile(path, code);
|
|
192
157
|
})));
|
|
193
158
|
// esbuild 把 Commonjs 转 ESM 时，打包后只有 export default 语句，
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/prebundle/bundle.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/prebundle/bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Config } from '@swc/core';
|
|
2
2
|
import { IProjectBaseConfig } from '@tarojs/taro/types/compile';
|
|
3
|
+
import { Message } from 'esbuild';
|
|
3
4
|
import { EntryObject } from 'webpack';
|
|
4
5
|
import Chain from 'webpack-chain';
|
|
5
6
|
import { getMeasure, Metadata } from '../utils';
|
|
@@ -8,7 +9,7 @@ export declare type IPrebundle = Exclude<IProjectBaseConfig['compiler'], string
|
|
|
8
9
|
export interface IPrebundleConfig {
|
|
9
10
|
appPath: string;
|
|
10
11
|
chain: Chain;
|
|
11
|
-
|
|
12
|
+
chunkFilename?: string;
|
|
12
13
|
enableSourceMap: boolean;
|
|
13
14
|
entry: EntryObject;
|
|
14
15
|
entryFileName?: string;
|
|
@@ -23,7 +24,7 @@ export default class BasePrebundle<T extends IPrebundleConfig = IPrebundleConfig
|
|
|
23
24
|
cacheDir: string;
|
|
24
25
|
chain: Chain;
|
|
25
26
|
customEsbuildConfig: IPrebundle['esbuild'];
|
|
26
|
-
customSwcConfig?:
|
|
27
|
+
customSwcConfig?: Config;
|
|
27
28
|
env: string;
|
|
28
29
|
prebundleCacheDir: string;
|
|
29
30
|
remoteCacheDir: string;
|
|
@@ -36,10 +37,12 @@ export default class BasePrebundle<T extends IPrebundleConfig = IPrebundleConfig
|
|
|
36
37
|
constructor(config: T, option: IPrebundle);
|
|
37
38
|
run(): Promise<void>;
|
|
38
39
|
addPlugin(name: string, plugin: any, ...args: Record<string, any>[]): void;
|
|
39
|
-
get entryPath():
|
|
40
|
+
get entryPath(): string;
|
|
41
|
+
parseEntries(entry?: EntryObject): string[];
|
|
40
42
|
/** 找出所有 webpack entry */
|
|
41
43
|
getEntries(appJsPath: string): string[];
|
|
42
44
|
setDeps(entries: string[], include?: string[], exclude?: string[]): Promise<void>;
|
|
43
|
-
bundle():
|
|
45
|
+
bundle(): any;
|
|
46
|
+
handleBundleError(errors?: Message[]): any;
|
|
44
47
|
setHost(): void;
|
|
45
48
|
}
|
package/dist/prebundle/index.js
CHANGED
|
@@ -62,19 +62,48 @@ class BasePrebundle {
|
|
|
62
62
|
}
|
|
63
63
|
get entryPath() {
|
|
64
64
|
const { entryFileName = 'app', entry = {} } = this.config;
|
|
65
|
-
|
|
65
|
+
const appJsPath = entry[entryFileName] || '';
|
|
66
|
+
if (typeof appJsPath === 'string') {
|
|
67
|
+
return appJsPath;
|
|
68
|
+
}
|
|
69
|
+
else if (appJsPath instanceof Array) {
|
|
70
|
+
return appJsPath[0];
|
|
71
|
+
}
|
|
72
|
+
else if (typeof appJsPath.import === 'string') {
|
|
73
|
+
return appJsPath.import;
|
|
74
|
+
}
|
|
75
|
+
return '';
|
|
76
|
+
}
|
|
77
|
+
parseEntries(entry = {}) {
|
|
78
|
+
const entries = [];
|
|
79
|
+
Object.values(entry).forEach(e => {
|
|
80
|
+
if (typeof e === 'string') {
|
|
81
|
+
entries.push(e);
|
|
82
|
+
}
|
|
83
|
+
else if (e instanceof Array) {
|
|
84
|
+
entries.push(...this.parseEntries(e));
|
|
85
|
+
}
|
|
86
|
+
else if (typeof e.import === 'string') {
|
|
87
|
+
entries.push(e.import);
|
|
88
|
+
}
|
|
89
|
+
else if (e.import instanceof Array) {
|
|
90
|
+
entries.push(...this.parseEntries(e.import));
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
return entries;
|
|
66
94
|
}
|
|
67
95
|
/** 找出所有 webpack entry */
|
|
68
96
|
getEntries(appJsPath) {
|
|
69
97
|
const { appPath, sourceRoot } = this.config;
|
|
70
|
-
const entries =
|
|
71
|
-
entries.push(appJsPath);
|
|
98
|
+
const entries = this.parseEntries(this.config.entry);
|
|
72
99
|
const appConfigPath = (0, helper_1.resolveMainFilePath)(`${appJsPath.replace(path_1.default.extname(appJsPath), '')}.config`);
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
100
|
+
if (helper_1.fs.existsSync(appConfigPath)) {
|
|
101
|
+
const appConfig = (0, helper_1.readConfig)(appConfigPath);
|
|
102
|
+
appConfig.pages.forEach((page) => {
|
|
103
|
+
const pageJsPath = (0, helper_1.resolveMainFilePath)(path_1.default.join(appPath, sourceRoot, page));
|
|
104
|
+
entries.push(pageJsPath);
|
|
105
|
+
});
|
|
106
|
+
}
|
|
78
107
|
return entries;
|
|
79
108
|
}
|
|
80
109
|
setDeps(entries, include = [], exclude = []) {
|
|
@@ -84,11 +113,11 @@ class BasePrebundle {
|
|
|
84
113
|
appPath: this.appPath,
|
|
85
114
|
customEsbuildConfig: this.customEsbuildConfig,
|
|
86
115
|
entries,
|
|
116
|
+
include,
|
|
87
117
|
exclude,
|
|
88
|
-
include
|
|
89
118
|
}, this.deps);
|
|
90
119
|
this.deps.size &&
|
|
91
|
-
console.log(helper_1.chalk.cyan('Prebundle dependencies: \n', ...
|
|
120
|
+
console.log(helper_1.chalk.cyan('Prebundle dependencies: \n', ...Array.from(this.deps.keys()).sort(utils_1.sortDeps).map(dep => ` ${dep}\n`)));
|
|
92
121
|
this.measure('Scan imports duration', SCAN_START);
|
|
93
122
|
});
|
|
94
123
|
}
|
|
@@ -98,18 +127,44 @@ class BasePrebundle {
|
|
|
98
127
|
this.metadata.bundleHash = yield (0, utils_1.getBundleHash)(this.appPath, this.deps, this.chain, this.cacheDir);
|
|
99
128
|
if (this.preMetadata.bundleHash !== this.metadata.bundleHash) {
|
|
100
129
|
this.isUseCache = false;
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
130
|
+
try {
|
|
131
|
+
yield (0, bundle_1.bundle)({
|
|
132
|
+
appPath: this.appPath,
|
|
133
|
+
deps: this.deps,
|
|
134
|
+
chain: this.chain,
|
|
135
|
+
prebundleOutputDir: this.prebundleCacheDir,
|
|
136
|
+
customEsbuildConfig: this.customEsbuildConfig,
|
|
137
|
+
customSwcConfig: this.customSwcConfig,
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
catch (result) {
|
|
141
|
+
return this.handleBundleError(result === null || result === void 0 ? void 0 : result.errors);
|
|
142
|
+
}
|
|
109
143
|
}
|
|
110
144
|
this.measure('Prebundle duration', PREBUNDLE_START);
|
|
111
145
|
});
|
|
112
146
|
}
|
|
147
|
+
handleBundleError(errors = []) {
|
|
148
|
+
const keys = Array.from(this.deps.keys());
|
|
149
|
+
if (errors.length > 0) {
|
|
150
|
+
const deps = errors.reduce((p, e) => {
|
|
151
|
+
var _a;
|
|
152
|
+
const file = ((_a = e.location) === null || _a === void 0 ? void 0 : _a.file) || '';
|
|
153
|
+
const key = keys.find(key => file === null || file === void 0 ? void 0 : file.includes(key));
|
|
154
|
+
if (key)
|
|
155
|
+
p.push(key);
|
|
156
|
+
return p;
|
|
157
|
+
}, []);
|
|
158
|
+
deps.forEach(key => this.deps.delete(key));
|
|
159
|
+
if (deps.length > 0) {
|
|
160
|
+
console.log(helper_1.chalk.yellowBright(`检测到依赖编译错误，已跳过`, deps.sort(utils_1.sortDeps).map(e => helper_1.chalk.bold(e)).join('、'), `依赖预编译。`, `\n > 可以通过手动配置 ${(0, helper_1.terminalLink)('compiler.prebundle.exclude', 'https://nervjs.github.io/taro-docs/docs/next/config-detail#compilerprebundleexclude')} 忽略该提示`));
|
|
161
|
+
}
|
|
162
|
+
else {
|
|
163
|
+
console.log(helper_1.chalk.yellowBright(...errors));
|
|
164
|
+
}
|
|
165
|
+
return this.bundle();
|
|
166
|
+
}
|
|
167
|
+
}
|
|
113
168
|
setHost() {
|
|
114
169
|
this.chain
|
|
115
170
|
.plugin('TaroModuleFederationPlugin')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/prebundle/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/prebundle/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.scanImports = void 0;
|
|
16
16
|
const esbuild_1 = __importDefault(require("esbuild"));
|
|
17
17
|
const fs_1 = __importDefault(require("fs"));
|
|
18
|
-
const lodash_1 = require("lodash");
|
|
19
18
|
const path_1 = __importDefault(require("path"));
|
|
20
19
|
const utils_1 = require("../utils");
|
|
21
20
|
const constant_1 = require("../utils/constant");
|
|
@@ -23,18 +22,14 @@ function scanImports({ appPath, entries, include = [], exclude = [], customEsbui
|
|
|
23
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
23
|
const scanImportsPlugin = getScanImportsPlugin(deps, include, exclude);
|
|
25
24
|
const customPlugins = customEsbuildConfig.plugins || [];
|
|
26
|
-
yield Promise.all(entries.map(entry =>
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
plugins: [
|
|
35
|
-
scanImportsPlugin,
|
|
36
|
-
...customPlugins
|
|
37
|
-
]
|
|
25
|
+
yield Promise.all(entries.map((entry) => __awaiter(this, void 0, void 0, function* () {
|
|
26
|
+
try {
|
|
27
|
+
yield esbuild_1.default.build(Object.assign(Object.assign({}, customEsbuildConfig), { absWorkingDir: appPath, bundle: true, entryPoints: [entry], mainFields: ['main:h5', 'browser', 'module', 'jsnext:main', 'main'], format: 'esm', loader: constant_1.defaultEsbuildLoader, write: false, plugins: [
|
|
28
|
+
scanImportsPlugin,
|
|
29
|
+
...customPlugins
|
|
30
|
+
] }));
|
|
31
|
+
}
|
|
32
|
+
catch (e) { }
|
|
38
33
|
})));
|
|
39
34
|
// 有一些 Webpack loaders 添加的依赖没有办法提前分析出来
|
|
40
35
|
// 可以把它们写进 includes，然后在这里 resolve 后加入到 deps
|
|
@@ -127,31 +122,36 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
127
122
|
return scripts.get(path);
|
|
128
123
|
});
|
|
129
124
|
// bare imports
|
|
130
|
-
build.onResolve({ filter:
|
|
125
|
+
build.onResolve({ filter: constant_1.moduleRE }, ({ path: id, importer }) => __awaiter(this, void 0, void 0, function* () {
|
|
131
126
|
if ((0, utils_1.isExclude)(id, excludes))
|
|
132
127
|
return (0, utils_1.externalModule)({ path: id });
|
|
133
128
|
if (deps.has(id))
|
|
134
129
|
return (0, utils_1.externalModule)({ path: id });
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
if ((
|
|
138
|
-
|
|
130
|
+
try {
|
|
131
|
+
const resolvedPath = yield resolve(path_1.default.dirname(importer), id);
|
|
132
|
+
if (resolvedPath.includes('node_modules') || includes.includes(id)) {
|
|
133
|
+
if ((0, utils_1.isOptimizeIncluded)(resolvedPath)) {
|
|
134
|
+
deps.set(id, resolvedPath);
|
|
135
|
+
}
|
|
136
|
+
return (0, utils_1.externalModule)({ path: id });
|
|
137
|
+
}
|
|
138
|
+
else if ((0, utils_1.isScanIncluded)(resolvedPath)) {
|
|
139
|
+
return {
|
|
140
|
+
path: resolvedPath,
|
|
141
|
+
namespace: 'vue'
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
else if (constant_1.assetsRE.test(resolvedPath)) {
|
|
145
|
+
(0, utils_1.externalModule)({ path: id });
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
return {
|
|
149
|
+
path: resolvedPath
|
|
150
|
+
};
|
|
139
151
|
}
|
|
140
|
-
return (0, utils_1.externalModule)({ path: id });
|
|
141
|
-
}
|
|
142
|
-
else if ((0, utils_1.isScanIncluded)(resolvedPath)) {
|
|
143
|
-
return {
|
|
144
|
-
path: resolvedPath,
|
|
145
|
-
namespace: 'vue'
|
|
146
|
-
};
|
|
147
|
-
}
|
|
148
|
-
else if (constant_1.assetsRE.test(resolvedPath)) {
|
|
149
|
-
(0, utils_1.externalModule)({ path: id });
|
|
150
152
|
}
|
|
151
|
-
|
|
152
|
-
return {
|
|
153
|
-
path: resolvedPath
|
|
154
|
-
};
|
|
153
|
+
catch (e) {
|
|
154
|
+
return (0, utils_1.externalModule)({ path: id });
|
|
155
155
|
}
|
|
156
156
|
}));
|
|
157
157
|
// catch all
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanImports.js","sourceRoot":"","sources":["../../src/prebundle/scanImports.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sDAAyC;AACzC,4CAAmB;AACnB,
|
|
1
|
+
{"version":3,"file":"scanImports.js","sourceRoot":"","sources":["../../src/prebundle/scanImports.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/constant.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export declare const langRE: RegExp;
|
|
|
8
8
|
export declare const multilineCommentsRE: RegExp;
|
|
9
9
|
export declare const singlelineCommentsRE: RegExp;
|
|
10
10
|
export declare const importsRE: RegExp;
|
|
11
|
+
export declare const moduleRE: RegExp;
|
|
11
12
|
export declare type CollectedDeps = Map<string, string>;
|
|
12
13
|
export declare const MF_NAME = "taro_app_library";
|
|
13
14
|
export declare const defaultEsbuildLoader: Record<string, Loader>;
|
package/dist/utils/constant.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.defaultEsbuildLoader = exports.MF_NAME = exports.importsRE = exports.singlelineCommentsRE = exports.multilineCommentsRE = exports.langRE = exports.scriptRE = exports.commentRE = exports.assetsRE = exports.virtualModuleRE = exports.virtualModulePrefix = void 0;
|
|
3
|
+
exports.defaultEsbuildLoader = exports.MF_NAME = exports.moduleRE = exports.importsRE = exports.singlelineCommentsRE = exports.multilineCommentsRE = exports.langRE = exports.scriptRE = exports.commentRE = exports.assetsRE = exports.virtualModuleRE = exports.virtualModulePrefix = void 0;
|
|
4
4
|
const KNOWN_ASSET_TYPES = [
|
|
5
5
|
// css
|
|
6
6
|
'css',
|
|
@@ -57,6 +57,7 @@ exports.singlelineCommentsRE = /\/\/.*/g;
|
|
|
57
57
|
// since even missed imports can be caught at runtime, and false positives will
|
|
58
58
|
// simply be ignored.
|
|
59
59
|
exports.importsRE = /(?<!\/\/.*)(?<=^|;|\*\/)\s*import(?!\s+type)(?:[\w*{}\n\r\t, ]+from\s*)?\s*("[^"]+"|'[^']+')\s*(?=$|;|\/\/|\/\*)/gm;
|
|
60
|
+
exports.moduleRE = /^[^./\\][^:]/;
|
|
60
61
|
exports.MF_NAME = 'taro_app_library';
|
|
61
62
|
exports.defaultEsbuildLoader = {
|
|
62
63
|
'.js': 'jsx',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../src/utils/constant.ts"],"names":[],"mappings":";;;AAEA,MAAM,iBAAiB,GAAG;IACxB,MAAM;IACN,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,QAAQ;IACR,MAAM;IACN,SAAS;IAET,OAAO;IACP,MAAM;IAEN,SAAS;IACT,KAAK;IACL,OAAO;IACP,KAAK;IACL,KAAK;IACL,KAAK;IACL,MAAM;IACN,MAAM;IAEN,QAAQ;IACR,KAAK;IACL,MAAM;IACN,KAAK;IACL,KAAK;IACL,KAAK;IACL,MAAM;IACN,KAAK;IAEL,QAAQ;IACR,QAAQ;IACR,KAAK;IACL,KAAK;IACL,KAAK;IAEL,QAAQ;IACR,MAAM;IACN,aAAa;IACb,KAAK;IACL,KAAK;CACN,CAAA;AAEY,QAAA,mBAAmB,GAAG,iBAAiB,CAAA;AACvC,QAAA,eAAe,GAAG,IAAI,MAAM,CAAC,IAAI,2BAAmB,EAAE,CAAC,CAAA;AAEvD,QAAA,QAAQ,GAAG,IAAI,MAAM,CAAC,OAAO,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;AAE7D,QAAA,SAAS,GAAG,qBAAqB,CAAA;AACjC,QAAA,QAAQ,GAAG,8CAA8C,CAAA;AACzD,QAAA,MAAM,GAAG,oDAAoD,CAAA;AAC7D,QAAA,mBAAmB,GAAG,wBAAwB,CAAA;AAC9C,QAAA,oBAAoB,GAAG,SAAS,CAAA;AAE7C,gEAAgE;AAChE,uEAAuE;AACvE,4EAA4E;AAC5E,qCAAqC;AACrC,6EAA6E;AAC7E,4EAA4E;AAC5E,+EAA+E;AAC/E,qBAAqB;AACR,QAAA,SAAS,GACpB,oHAAoH,CAAA;
|
|
1
|
+
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../src/utils/constant.ts"],"names":[],"mappings":";;;AAEA,MAAM,iBAAiB,GAAG;IACxB,MAAM;IACN,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,QAAQ;IACR,MAAM;IACN,SAAS;IAET,OAAO;IACP,MAAM;IAEN,SAAS;IACT,KAAK;IACL,OAAO;IACP,KAAK;IACL,KAAK;IACL,KAAK;IACL,MAAM;IACN,MAAM;IAEN,QAAQ;IACR,KAAK;IACL,MAAM;IACN,KAAK;IACL,KAAK;IACL,KAAK;IACL,MAAM;IACN,KAAK;IAEL,QAAQ;IACR,QAAQ;IACR,KAAK;IACL,KAAK;IACL,KAAK;IAEL,QAAQ;IACR,MAAM;IACN,aAAa;IACb,KAAK;IACL,KAAK;CACN,CAAA;AAEY,QAAA,mBAAmB,GAAG,iBAAiB,CAAA;AACvC,QAAA,eAAe,GAAG,IAAI,MAAM,CAAC,IAAI,2BAAmB,EAAE,CAAC,CAAA;AAEvD,QAAA,QAAQ,GAAG,IAAI,MAAM,CAAC,OAAO,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;AAE7D,QAAA,SAAS,GAAG,qBAAqB,CAAA;AACjC,QAAA,QAAQ,GAAG,8CAA8C,CAAA;AACzD,QAAA,MAAM,GAAG,oDAAoD,CAAA;AAC7D,QAAA,mBAAmB,GAAG,wBAAwB,CAAA;AAC9C,QAAA,oBAAoB,GAAG,SAAS,CAAA;AAE7C,gEAAgE;AAChE,uEAAuE;AACvE,4EAA4E;AAC5E,qCAAqC;AACrC,6EAA6E;AAC7E,4EAA4E;AAC5E,+EAA+E;AAC/E,qBAAqB;AACR,QAAA,SAAS,GACpB,oHAAoH,CAAA;AAEzG,QAAA,QAAQ,GAAG,cAAc,CAAA;AAIzB,QAAA,OAAO,GAAG,kBAAkB,CAAA;AAE5B,QAAA,oBAAoB,GAA2B;IAC1D,KAAK,EAAE,KAAK;IACZ,KAAK,EAAE,KAAK;CACb,CAAA"}
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -25,6 +25,7 @@ export declare function isOptimizeIncluded(path: string): boolean;
|
|
|
25
25
|
export declare function isScanIncluded(path: string): boolean;
|
|
26
26
|
export declare function getHash(content: string): string;
|
|
27
27
|
export declare function getBundleHash(appPath: string, deps: CollectedDeps, chain: Chain, cacheDir: string): Promise<string>;
|
|
28
|
+
export declare const sortDeps: (a: string | string[], b: string | string[]) => number;
|
|
28
29
|
export declare function formatDepsString(deps: CollectedDeps): string;
|
|
29
30
|
export declare function getMfHash(obj: Record<string, any>): string;
|
|
30
31
|
export declare function commitMeta(appPath: string, metadataPath: string, metadata: Metadata): Promise<void>;
|
package/dist/utils/index.js
CHANGED
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.getMeasure = exports.commitMeta = exports.getMfHash = exports.formatDepsString = exports.getBundleHash = exports.getHash = exports.isScanIncluded = exports.isOptimizeIncluded = exports.isExclude = exports.getDefines = exports.getCacheDir = exports.flattenId = exports.externalModule = exports.getResolve = exports.createResolve = void 0;
|
|
29
|
+
exports.getMeasure = exports.commitMeta = exports.getMfHash = exports.formatDepsString = exports.sortDeps = exports.getBundleHash = exports.getHash = exports.isScanIncluded = exports.isOptimizeIncluded = exports.isExclude = exports.getDefines = exports.getCacheDir = exports.flattenId = exports.externalModule = exports.getResolve = exports.createResolve = void 0;
|
|
30
30
|
const helper_1 = require("@tarojs/helper");
|
|
31
31
|
const crypto_1 = require("crypto");
|
|
32
32
|
const enhanced_resolve_1 = __importDefault(require("enhanced-resolve"));
|
|
@@ -76,10 +76,12 @@ function getCacheDir(appPath, env = '') {
|
|
|
76
76
|
exports.getCacheDir = getCacheDir;
|
|
77
77
|
function getDefines(chain) {
|
|
78
78
|
let defines;
|
|
79
|
-
chain.
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
79
|
+
if (chain.plugins.has('definePlugin')) {
|
|
80
|
+
chain.plugin('definePlugin').tap(args => {
|
|
81
|
+
defines = args[0];
|
|
82
|
+
return args;
|
|
83
|
+
});
|
|
84
|
+
}
|
|
83
85
|
return defines;
|
|
84
86
|
}
|
|
85
87
|
exports.getDefines = getDefines;
|
|
@@ -132,9 +134,14 @@ function getBundleHash(appPath, deps, chain, cacheDir) {
|
|
|
132
134
|
});
|
|
133
135
|
}
|
|
134
136
|
exports.getBundleHash = getBundleHash;
|
|
137
|
+
const sortDeps = (a, b) => {
|
|
138
|
+
const x = typeof a === 'string' ? a : a[0];
|
|
139
|
+
const y = typeof b === 'string' ? b : b[0];
|
|
140
|
+
return x.localeCompare(y);
|
|
141
|
+
};
|
|
142
|
+
exports.sortDeps = sortDeps;
|
|
135
143
|
function formatDepsString(deps) {
|
|
136
|
-
const list = Array.from(deps.entries());
|
|
137
|
-
list.sort((a, b) => a[0].localeCompare(b[0]));
|
|
144
|
+
const list = Array.from(deps.entries()).sort(exports.sortDeps);
|
|
138
145
|
return JSON.stringify(list);
|
|
139
146
|
}
|
|
140
147
|
exports.formatDepsString = formatDepsString;
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAsC;AACtC,mCAAmC;AACnC,wEAA8C;AAC9C,wDAAyB;AACzB,gDAAuB;AACvB,2CAAwC;AAaxC,IAAI,OAA+D,CAAA;AACnE,SAAgB,aAAa,CAAE,OAAe,EAAE,cAAc;IAC5D,MAAM,qBAAqB,GAAG;QAC5B,cAAc,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC;QACpF,WAAW,EAAE,CAAC,SAAS,CAAC;QACxB,KAAK,EAAE,IAAI;QACX,SAAS,EAAE,CAAC,OAAO,CAAC;QACpB,aAAa,EAAE,CAAC,SAAS,CAAC;QAC1B,KAAK,EAAE,OAAO;KACf,CAAA;IACD,MAAM,QAAQ,GAAG,0BAAe,CAAC,MAAM,iCAClC,qBAAqB,GACrB,cAAc,EACjB,CAAA;IACF,OAAO,GAAG,UAAU,QAAgB,EAAE,OAAe;QACnD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE;gBACxD,IAAI,GAAG;oBAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;gBAC3B,OAAO,CAAC,YAAY,CAAC,CAAA;YACvB,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AArBD,sCAqBC;AACD,SAAgB,UAAU;IACxB,OAAO,OAAO,CAAA;AAChB,CAAC;AAFD,gCAEC;AAED,SAAgB,cAAc,CAAE,EAAE,IAAI,EAAoB;IACxD,OAAO;QACL,IAAI;QACJ,QAAQ,EAAE,IAAI;KACf,CAAA;AACH,CAAC;AALD,wCAKC;AAED,SAAgB,SAAS,CAAE,EAAU;IACnC,OAAO,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;AAC9D,CAAC;AAFD,8BAEC;AAED,SAAgB,WAAW,CAAE,OAAe,EAAE,GAAG,GAAG,EAAE;IACpD,OAAO,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,sBAAsB,EAAE,GAAG,CAAC,CAAA;AAC3D,CAAC;AAFD,kCAEC;AAED,SAAgB,UAAU,CAAE,KAAY;IACtC,IAAI,OAAO,CAAA;IACX,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,17 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/webpack5-prebundle",
|
|
3
|
-
"version": "3.5.0-beta.
|
|
3
|
+
"version": "3.5.0-beta.7",
|
|
4
4
|
"description": "Taro app webpack5 prebundle",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
|
-
"scripts": {
|
|
7
|
-
"build": "npm run clean && npm run prod",
|
|
8
|
-
"dev": "tsc -w",
|
|
9
|
-
"prod": "tsc",
|
|
10
|
-
"clean": "rimraf dist",
|
|
11
|
-
"test": "cross-env NODE_ENV=jest jest",
|
|
12
|
-
"test:ci": "cross-env NODE_ENV=jest jest -i",
|
|
13
|
-
"test:coverage": "cross-env NODE_ENV=jest jest --coverage"
|
|
14
|
-
},
|
|
15
6
|
"repository": {
|
|
16
7
|
"type": "git",
|
|
17
8
|
"url": "git+https://github.com/NervJS/taro.git"
|
|
@@ -30,8 +21,8 @@
|
|
|
30
21
|
"homepage": "https://github.com/NervJS/taro#readme",
|
|
31
22
|
"dependencies": {
|
|
32
23
|
"@swc/core": "^1.2.204",
|
|
33
|
-
"@tarojs/helper": "3.5.0-beta.
|
|
34
|
-
"@tarojs/taro": "3.5.0-beta.
|
|
24
|
+
"@tarojs/helper": "3.5.0-beta.7",
|
|
25
|
+
"@tarojs/taro": "3.5.0-beta.7",
|
|
35
26
|
"enhanced-resolve": "^5.9.3",
|
|
36
27
|
"es-module-lexer": "^0.10.4",
|
|
37
28
|
"esbuild": "^0.14.27",
|
|
@@ -45,5 +36,13 @@
|
|
|
45
36
|
"peerDependencies": {
|
|
46
37
|
"webpack": "5.69.0"
|
|
47
38
|
},
|
|
48
|
-
"
|
|
49
|
-
|
|
39
|
+
"scripts": {
|
|
40
|
+
"build": "pnpm run clean && pnpm run prod",
|
|
41
|
+
"dev": "tsc -w",
|
|
42
|
+
"prod": "tsc",
|
|
43
|
+
"clean": "rimraf dist",
|
|
44
|
+
"test": "cross-env NODE_ENV=jest jest",
|
|
45
|
+
"test:ci": "cross-env NODE_ENV=jest jest -i",
|
|
46
|
+
"test:coverage": "cross-env NODE_ENV=jest jest --coverage"
|
|
47
|
+
}
|
|
48
|
+
}
|