@tarojs/webpack5-prebundle 3.8.0-canary.0 → 4.0.0-alpha.0
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.d.ts +2 -0
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/prebundle/bundle.d.ts +16 -4
- package/dist/prebundle/bundle.js +16 -23
- package/dist/prebundle/bundle.js.map +1 -1
- package/dist/prebundle/index.d.ts +2 -0
- package/dist/prebundle/index.js +1 -1
- package/dist/prebundle/index.js.map +1 -1
- package/dist/prebundle/scanImports.js +13 -19
- package/dist/prebundle/scanImports.js.map +1 -1
- package/dist/utils/index.d.ts +0 -1
- package/dist/utils/index.js +3 -8
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/path.js.map +1 -1
- package/package.json +5 -5
package/dist/index.d.ts
CHANGED
|
@@ -21,6 +21,8 @@ export interface IPrebundleParam {
|
|
|
21
21
|
publicPath?: string;
|
|
22
22
|
runtimePath?: string | string[];
|
|
23
23
|
isBuildPlugin?: boolean;
|
|
24
|
+
alias?: Record<string, any>;
|
|
25
|
+
defineConstants?: Record<string, any>;
|
|
24
26
|
}
|
|
25
27
|
export default class TaroPrebundle {
|
|
26
28
|
protected params: IPrebundleParam;
|
package/dist/index.js
CHANGED
|
@@ -55,7 +55,7 @@ class TaroPrebundle {
|
|
|
55
55
|
var _a, _b;
|
|
56
56
|
const platformType = this.platformType;
|
|
57
57
|
const env = this.env;
|
|
58
|
-
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, isWatch = false, publicPath = chain.output.get('publicPath') || '/', runtimePath, sourceRoot = 'src', isBuildPlugin } = this.params;
|
|
58
|
+
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, isWatch = false, publicPath = chain.output.get('publicPath') || '/', runtimePath, sourceRoot = 'src', isBuildPlugin, alias, defineConstants, } = this.params;
|
|
59
59
|
let chunkFilename = (_b = chain.output.get('chunkFilename')) !== null && _b !== void 0 ? _b : `${chunkDirectory}/[name].js`;
|
|
60
60
|
chunkFilename = chunkFilename.replace(/\[([a-z]*hash)[^[\]\s]*\]/ig, '_$1_');
|
|
61
61
|
chain.output.set('chunkFilename', chunkFilename);
|
|
@@ -73,7 +73,9 @@ class TaroPrebundle {
|
|
|
73
73
|
publicPath,
|
|
74
74
|
runtimePath,
|
|
75
75
|
sourceRoot,
|
|
76
|
-
isBuildPlugin
|
|
76
|
+
isBuildPlugin,
|
|
77
|
+
alias,
|
|
78
|
+
defineConstants,
|
|
77
79
|
};
|
|
78
80
|
}
|
|
79
81
|
get entry() {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA+D;AAC/D,gDAAuB;AAIvB,+BAA+D;AAM/D,8CAA2B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,22 @@ interface BundleConfig {
|
|
|
14
14
|
customEsbuildConfig?: Record<string, any>;
|
|
15
15
|
customSwcConfig?: swc.Config;
|
|
16
16
|
}
|
|
17
|
-
export declare function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig, customSwcConfig }: BundleConfig): Promise<esbuild.BuildResult
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
export declare function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig, customSwcConfig, }: BundleConfig): Promise<esbuild.BuildResult<{
|
|
18
|
+
absWorkingDir: string;
|
|
19
|
+
bundle: true;
|
|
20
|
+
write: false;
|
|
21
|
+
entryPoints: string[];
|
|
22
|
+
mainFields: string[];
|
|
23
|
+
format: "esm";
|
|
24
|
+
loader: any;
|
|
25
|
+
define: any;
|
|
26
|
+
splitting: true;
|
|
27
|
+
metafile: true;
|
|
28
|
+
ignoreAnnotations: true;
|
|
29
|
+
outdir: string;
|
|
30
|
+
plugins: any[];
|
|
31
|
+
}>>;
|
|
32
|
+
export declare function getSwcPlugin({ appPath, flatIdExports, }: {
|
|
21
33
|
appPath: string;
|
|
22
34
|
flatIdExports: Map<string, ExportsData>;
|
|
23
35
|
}, config?: swc.Config): esbuild.Plugin;
|
package/dist/prebundle/bundle.js
CHANGED
|
@@ -25,7 +25,7 @@ const constant_1 = require("../utils/constant");
|
|
|
25
25
|
// 1. flatten all ids to eliminate slash
|
|
26
26
|
// 2. in the plugin, read the entry ourselves as virtual files to retain the
|
|
27
27
|
// path.
|
|
28
|
-
function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig = {}, customSwcConfig = {} }) {
|
|
28
|
+
function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig = {}, customSwcConfig = {}, }) {
|
|
29
29
|
return __awaiter(this, void 0, void 0, function* () {
|
|
30
30
|
yield es_module_lexer_1.init;
|
|
31
31
|
const flattenDeps = new Map();
|
|
@@ -46,10 +46,8 @@ function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig
|
|
|
46
46
|
}
|
|
47
47
|
flatIdExports.set(flatId, exportsData);
|
|
48
48
|
}
|
|
49
|
-
helper_1.fs.existsSync(prebundleOutputDir)
|
|
50
|
-
|
|
51
|
-
: helper_1.fs.ensureDirSync(prebundleOutputDir);
|
|
52
|
-
return helper_1.esbuild.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, helper_1.defaultEsbuildLoader), define: Object.assign(Object.assign({}, (0, utils_1.getDefines)(chain)), {
|
|
49
|
+
helper_1.fs.existsSync(prebundleOutputDir) ? helper_1.fs.emptyDirSync(prebundleOutputDir) : helper_1.fs.ensureDirSync(prebundleOutputDir);
|
|
50
|
+
return helper_1.esbuild.build(Object.assign(Object.assign({}, customEsbuildConfig), { absWorkingDir: appPath, bundle: true, write: false, entryPoints: Array.from(flattenDeps.keys()), mainFields: [...helper_1.defaultMainFields], format: 'esm', loader: (0, lodash_1.defaults)(customEsbuildConfig.loader, helper_1.defaultEsbuildLoader), define: Object.assign(Object.assign({}, (0, utils_1.getDefines)(chain)), {
|
|
53
51
|
// AMD 被 esbuild 转 ESM 后，是套着 ESM 外皮的 AMD 语法模块。
|
|
54
52
|
// Webpack HarmonyDetectionParserPlugin 会阻止 AMDDefineDependencyParserPlugin 对这些模块的处理。
|
|
55
53
|
// 导致这些模块报错（如 lodash）。目前的办法是把 define 置为 false，不支持 AMD 导出。
|
|
@@ -57,15 +55,15 @@ function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig
|
|
|
57
55
|
getEntryPlugin({
|
|
58
56
|
flattenDeps,
|
|
59
57
|
flatIdExports,
|
|
60
|
-
prebundleOutputDir
|
|
58
|
+
prebundleOutputDir,
|
|
61
59
|
}),
|
|
62
|
-
...customEsbuildConfig.plugins || [],
|
|
63
|
-
getSwcPlugin({ appPath, flatIdExports }, customSwcConfig)
|
|
60
|
+
...(customEsbuildConfig.plugins || []),
|
|
61
|
+
getSwcPlugin({ appPath, flatIdExports }, customSwcConfig),
|
|
64
62
|
] }));
|
|
65
63
|
});
|
|
66
64
|
}
|
|
67
65
|
exports.bundle = bundle;
|
|
68
|
-
function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
66
|
+
function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir, }) {
|
|
69
67
|
const resolve = (0, utils_1.getResolve)();
|
|
70
68
|
return {
|
|
71
69
|
name: 'entry',
|
|
@@ -76,7 +74,7 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
76
74
|
const fileExt = path_1.default.extname(filePath);
|
|
77
75
|
const fileBasename = path_1.default.basename(filePath, fileExt);
|
|
78
76
|
const fileContent = yield helper_1.fs.readFile(filePath);
|
|
79
|
-
const outputFile = path_1.default.join(prebundleOutputDir, `${fileBasename}-${(0,
|
|
77
|
+
const outputFile = path_1.default.join(prebundleOutputDir, `${fileBasename}-${(0, helper_1.getHash)(filePath)}${fileExt}`);
|
|
80
78
|
yield helper_1.fs.writeFile(outputFile, fileContent);
|
|
81
79
|
return (0, helper_1.externalEsbuildModule)({ path: `./${path_1.default.relative(prebundleOutputDir, outputFile)}` });
|
|
82
80
|
}));
|
|
@@ -85,7 +83,7 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
85
83
|
if (!importer && flattenDeps.has(id)) {
|
|
86
84
|
return {
|
|
87
85
|
path: id,
|
|
88
|
-
namespace: 'entry'
|
|
86
|
+
namespace: 'entry',
|
|
89
87
|
};
|
|
90
88
|
}
|
|
91
89
|
try {
|
|
@@ -119,9 +117,7 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
119
117
|
// export default
|
|
120
118
|
js += `import d from "${filePath}";export default d;`;
|
|
121
119
|
}
|
|
122
|
-
if (hasReExports ||
|
|
123
|
-
exportsList.length > 1 ||
|
|
124
|
-
exportsList[0] !== 'default') {
|
|
120
|
+
if (hasReExports || exportsList.length > 1 || exportsList[0] !== 'default') {
|
|
125
121
|
// export * from 'xx'
|
|
126
122
|
// export const xx
|
|
127
123
|
js += `export * from "${filePath}";`;
|
|
@@ -134,13 +130,13 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
134
130
|
return {
|
|
135
131
|
loader: 'js',
|
|
136
132
|
resolveDir: process.cwd(),
|
|
137
|
-
contents: js
|
|
133
|
+
contents: js,
|
|
138
134
|
};
|
|
139
135
|
}));
|
|
140
|
-
}
|
|
136
|
+
},
|
|
141
137
|
};
|
|
142
138
|
}
|
|
143
|
-
function getSwcPlugin({ appPath, flatIdExports }, config) {
|
|
139
|
+
function getSwcPlugin({ appPath, flatIdExports, }, config) {
|
|
144
140
|
return {
|
|
145
141
|
name: 'swc-plugin',
|
|
146
142
|
setup(build) {
|
|
@@ -164,13 +160,10 @@ function getSwcPlugin({ appPath, flatIdExports }, config) {
|
|
|
164
160
|
const entry = output.entryPoint.replace(/^entry:/, '');
|
|
165
161
|
if (!flatIdExports.has(entry))
|
|
166
162
|
continue;
|
|
167
|
-
if (((_b = flatIdExports.get(entry)) === null || _b === void 0 ? void 0 : _b.needInterop) &&
|
|
168
|
-
output.exports.length === 1 &&
|
|
169
|
-
output.exports[0] === 'default') {
|
|
163
|
+
if (((_b = flatIdExports.get(entry)) === null || _b === void 0 ? void 0 : _b.needInterop) && output.exports.length === 1 && output.exports[0] === 'default') {
|
|
170
164
|
const srcPath = path_1.default.join(appPath, outputName);
|
|
171
165
|
const destPath = path_1.default.join(appPath, outputName.replace(/(\.js)$/, '.core$1'));
|
|
172
|
-
processAll.push(helper_1.fs.move(srcPath, destPath)
|
|
173
|
-
.then(() => helper_1.fs.writeFile(srcPath, `var m = require('./${path_1.default.basename(destPath)}');
|
|
166
|
+
processAll.push(helper_1.fs.move(srcPath, destPath).then(() => helper_1.fs.writeFile(srcPath, `var m = require('./${path_1.default.basename(destPath)}');
|
|
174
167
|
module.exports = m.default;
|
|
175
168
|
exports.default = module.exports;
|
|
176
169
|
`)));
|
|
@@ -178,7 +171,7 @@ function getSwcPlugin({ appPath, flatIdExports }, config) {
|
|
|
178
171
|
}
|
|
179
172
|
yield Promise.all(processAll);
|
|
180
173
|
}));
|
|
181
|
-
}
|
|
174
|
+
},
|
|
182
175
|
};
|
|
183
176
|
}
|
|
184
177
|
exports.getSwcPlugin = getSwcPlugin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/prebundle/bundle.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/prebundle/bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,8 @@ export interface IPrebundleConfig {
|
|
|
19
19
|
platformType: PLATFORM_TYPE;
|
|
20
20
|
sourceRoot: string;
|
|
21
21
|
isBuildPlugin?: boolean;
|
|
22
|
+
alias?: Record<string, any>;
|
|
23
|
+
defineConstants?: Record<string, any>;
|
|
22
24
|
}
|
|
23
25
|
type TMode = 'production' | 'development' | 'none';
|
|
24
26
|
export default class BasePrebundle<T extends IPrebundleConfig = IPrebundleConfig> {
|
package/dist/prebundle/index.js
CHANGED
|
@@ -104,7 +104,7 @@ class BasePrebundle {
|
|
|
104
104
|
const entries = this.parseEntries(this.config.entry);
|
|
105
105
|
const appConfigPath = (0, helper_1.resolveMainFilePath)(`${appJsPath.replace(path_1.default.extname(appJsPath), '')}.config`);
|
|
106
106
|
if (helper_1.fs.existsSync(appConfigPath)) {
|
|
107
|
-
const appConfig = (0, helper_1.readConfig)(appConfigPath);
|
|
107
|
+
const appConfig = (0, helper_1.readConfig)(appConfigPath, this.config);
|
|
108
108
|
appConfig.pages.forEach((page) => {
|
|
109
109
|
const pageJsPath = (0, helper_1.resolveMainFilePath)(path_1.default.join(appPath, sourceRoot, page));
|
|
110
110
|
entries.push(pageJsPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/prebundle/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAAsH;AAEtH,gDAAuB;AACvB,2CAAwC;AACxC,sDAA6B;AAE7B,oCAAgH;AAChH,gDAA0D;AAC1D,uGAA8E;AAC9E,qCAAiC;AACjC,+CAA2C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/prebundle/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAAsH;AAEtH,gDAAuB;AACvB,2CAAwC;AACxC,sDAA6B;AAE7B,oCAAgH;AAChH,gDAA0D;AAC1D,uGAA8E;AAC9E,qCAAiC;AACjC,+CAA2C;AA2B3C,MAAqB,aAAa;IAqBhC,YAAuB,MAAS,EAAY,MAAkB;QAAvC,WAAM,GAAN,MAAM,CAAG;QAAY,WAAM,GAAN,MAAM,CAAY;QAN9D,eAAU,GAAG,IAAI,CAAA;QAEjB,SAAI,GAAkB,IAAI,GAAG,EAAE,CAAA;QAK7B,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,OAAM;QAE1B,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAC9E,MAAM,EAAE,QAAQ,GAAG,IAAA,mBAAW,EAAC,OAAO,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAEtF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAA;QAClC,IAAI,CAAC,eAAe,GAAG,GAAG,CAAA;QAC1B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,IAAI,GAAG,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,CAAU;eAC1E,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,CAAA;QACvF,IAAI,CAAC,iBAAiB,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAC9D,IAAI,CAAC,cAAc,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QACxD,IAAI,CAAC,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;QACxD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAA;QAClB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;QAErB,IAAI,CAAC,OAAO,GAAG,IAAA,kBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAE9C,IAAI;YACF,IAAI,KAAK,KAAK,IAAI,EAAE;gBAClB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,WAAE,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAA;aACpE;SACF;QAAC,OAAO,CAAC,EAAE,GAAE,CAAC,+BAA+B;QAE9C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA;QAC1C,IAAA,qBAAa,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;IACzD,CAAC;IAEK,GAAG;;YACP,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBACpB,IAAA,kBAAU,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;aAC3D;QACH,CAAC;KAAA;IAED,SAAS,CAAE,IAAY,EAAE,MAAW,EAAE,GAAG,IAA2B;QAClE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAC3C,CAAC;IAED,IAAI,SAAS;QACX,MAAM,EAAE,aAAa,GAAG,KAAK,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QACzD,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,CAAA;QAC5C,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACjC,OAAO,SAAS,CAAA;SACjB;aAAM,IAAI,SAAS,YAAY,KAAK,EAAE;YACrC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAA;SACpB;aAAM,IAAI,OAAO,SAAS,CAAC,MAAM,KAAK,QAAQ,EAAE;YAC/C,OAAO,SAAS,CAAC,MAAM,CAAA;SACxB;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAED,YAAY,CAAE,QAAqB,EAAE;QACnC,MAAM,OAAO,GAAa,EAAE,CAAA;QAC5B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC/B,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;gBACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;aAChB;iBAAM,IAAI,CAAC,YAAY,KAAK,EAAE;gBAC7B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,CAAQ,CAAC,CAAC,CAAA;aAC7C;iBAAM,IAAI,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ,EAAE;gBACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;aACvB;iBAAM,IAAI,CAAC,CAAC,MAAM,YAAY,KAAK,EAAE;gBACpC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,MAAa,CAAC,CAAC,CAAA;aACpD;QACH,CAAC,CAAC,CAAA;QACF,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,yBAAyB;IACzB,UAAU,CAAE,SAAiB;QAC3B,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAC3C,MAAM,OAAO,GAAa,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE9D,MAAM,aAAa,GAAG,IAAA,4BAAmB,EAAC,GAAG,SAAS,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAA;QACrG,IAAI,WAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;YAChC,MAAM,SAAS,GAAG,IAAA,mBAAU,EAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YAExD,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;gBACvC,MAAM,UAAU,GAAG,IAAA,4BAAmB,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAA;gBAC5E,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;SACH;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IAEK,OAAO,CAAE,OAAiB,EAAE,UAAoB,EAAE,EAAE,UAAoB,EAAE;;YAC9E,MAAM,UAAU,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAA;YAEpC,MAAM,IAAA,yBAAW,EAAC;gBAChB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;gBAC7C,OAAO;gBACP,OAAO;gBACP,OAAO;aACR,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;YAEb,IAAI,CAAC,IAAI,CAAC,IAAI;gBACZ,OAAO,CAAC,GAAG,CACT,cAAK,CAAC,IAAI,CACR,4BAA4B,EAC5B,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAQ,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,CAC1E,CACF,CAAA;YAEH,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,UAAU,CAAC,CAAA;QACnD,CAAC;KAAA;IAEK,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;gBACvB,IAAI;oBACF,MAAM,IAAA,eAAM,EAAC;wBACX,OAAO,EAAE,IAAI,CAAC,OAAO;wBACrB,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,KAAK,EAAE,IAAI,CAAC,KAAK;wBACjB,kBAAkB,EAAE,IAAI,CAAC,iBAAiB;wBAC1C,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;wBAC7C,eAAe,EAAE,IAAI,CAAC,eAAe;qBACtC,CAAC,CAAA;iBACH;gBAAC,OAAO,MAAM,EAAE;oBACf,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,CAAA;iBAC9C;aACF;YAED,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAA;QACrD,CAAC;KAAA;IAED,iBAAiB,CAAE,SAA4B,EAAE;QAC/C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QACzC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;;gBAClC,MAAM,IAAI,GAAG,CAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,IAAI,KAAI,EAAE,CAAA;gBACnC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;gBACjD,IAAI,GAAG;oBAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACpB,OAAO,CAAC,CAAA;YACV,CAAC,EAAE,EAAc,CAAC,CAAA;YAClB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;YAC1C,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnB,OAAO,CAAC,GAAG,CACT,cAAK,CAAC,YAAY,CAChB,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,cAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,EAChF,oBACE,IAAA,qBAAY,EAAC,4BAA4B,EAAE,qFAAqF,CAClI,QAAQ,CACT,CACF,CAAA;aACF;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,cAAK,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,CAAC,CAAA;aAC3C;YACD,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;SACrB;IACH,CAAC;IAED,OAAO,CAAE,UAAU,GAAG,EAAE;QACtB,IAAI,CAAC,KAAK;aACP,MAAM,CAAC,4BAA4B,CAAC;aACpC,GAAG,CAAC,oCAA0B,EAAE,CAAC;gBAChC,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE;oBACP,CAAC,kBAAO,CAAC,EAAE,GAAG,kBAAO,IAAI,UAAU,gBAAgB;iBACpD;aACF;YACD;gBACE,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;gBACxC,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY;gBACxC,mBAAmB,EAAE,IAAI,CAAC,QAAQ,CAAC,mBAAmB,IAAI,IAAI,GAAG,EAAE;aACpE,CAAC,CAAC,CAAA;IACP,CAAC;IAED,wBAAwB,CAAE,QAAuB,EAAE,SAAwB,EAAE;;QAC3E,wCAAwC;QACxC,MAAM,OAAO,qBAAQ,IAAI,CAAC,aAAa,CAAE,CAAA;QACzC,MAAM,WAAW,GAAG,CAAC,uBAAuB,EAAE,gBAAgB,EAAE,cAAc,EAAE,eAAe,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAA;QACnI,OAAO,OAAO,CAAC,SAAS,CAAA;QACjB,MAAA,OAAO,CAAC,YAAY,+CAAE,WAAW,CAAA;QACxC,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,WAAW,0CAAE,IAAI,CAAC,CAAA,EAAA,CAAC,CAAA;QAC3F,IAAI,MAAA,OAAO,CAAC,MAAM,0CAAE,KAAK,EAAE;YACzB,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAiB,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,QAAQ,EAAE,MAAK,oBAAW,CAAC,QAAQ,EAAE,CAAA,EAAA,CAAC,CAAA;SAC5H;QAED,OAAO,IAAA,iBAAO,EAAC,IAAA,uBAAc,EAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;IAC3D,CAAC;CACF;AAxND,gCAwNC"}
|
|
@@ -23,10 +23,7 @@ function scanImports({ appPath, chain, entries, include = [], exclude = [], cust
|
|
|
23
23
|
const customPlugins = customEsbuildConfig.plugins || [];
|
|
24
24
|
yield Promise.all(entries.map((entry) => __awaiter(this, void 0, void 0, function* () {
|
|
25
25
|
try {
|
|
26
|
-
yield helper_1.esbuild.build(Object.assign(Object.assign({}, customEsbuildConfig), { absWorkingDir: appPath, bundle: true, entryPoints: [entry], mainFields: [
|
|
27
|
-
scanImportsPlugin,
|
|
28
|
-
...customPlugins
|
|
29
|
-
] }));
|
|
26
|
+
yield helper_1.esbuild.build(Object.assign(Object.assign({}, customEsbuildConfig), { absWorkingDir: appPath, bundle: true, entryPoints: [entry], mainFields: [...helper_1.defaultMainFields], format: 'esm', loader: helper_1.defaultEsbuildLoader, write: false, define: Object.assign(Object.assign({}, (0, utils_1.getDefines)(chain)), { define: 'false' }), plugins: [scanImportsPlugin, ...customPlugins] }));
|
|
30
27
|
}
|
|
31
28
|
catch (e) { } // eslint-disable-line no-empty
|
|
32
29
|
})));
|
|
@@ -70,7 +67,7 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
70
67
|
name: 'scanImports',
|
|
71
68
|
setup(build) {
|
|
72
69
|
// assets
|
|
73
|
-
build.onResolve(
|
|
70
|
+
build.onResolve({ filter: constant_1.assetsRE }, helper_1.externalEsbuildModule);
|
|
74
71
|
// .vue
|
|
75
72
|
build.onLoad({ filter: /\.vue$/, namespace: 'vue' }, ({ path }) => {
|
|
76
73
|
let raw = helper_1.fs.readFileSync(path, 'utf-8');
|
|
@@ -91,12 +88,11 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
91
88
|
if (content.trim()) {
|
|
92
89
|
// append imports in TS to prevent esbuild from removing them
|
|
93
90
|
// since they may be used in the template
|
|
94
|
-
const contents = content +
|
|
95
|
-
(loader.startsWith('ts') ? extractImportPaths(content) : '');
|
|
91
|
+
const contents = content + (loader.startsWith('ts') ? extractImportPaths(content) : '');
|
|
96
92
|
const key = `${path}?id=${scriptId++}`;
|
|
97
93
|
scripts.set(key, {
|
|
98
94
|
loader,
|
|
99
|
-
contents
|
|
95
|
+
contents,
|
|
100
96
|
});
|
|
101
97
|
const virtualModulePath = JSON.stringify(constant_1.virtualModulePrefix + key);
|
|
102
98
|
js += `export * from ${virtualModulePath}\n`;
|
|
@@ -108,16 +104,16 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
108
104
|
}
|
|
109
105
|
return {
|
|
110
106
|
loader: 'js',
|
|
111
|
-
contents: js
|
|
107
|
+
contents: js,
|
|
112
108
|
};
|
|
113
109
|
});
|
|
114
|
-
build.onResolve(
|
|
110
|
+
build.onResolve({ filter: constant_1.virtualModuleRE }, ({ path }) => {
|
|
115
111
|
return {
|
|
116
112
|
path: path.replace(constant_1.virtualModulePrefix, ''),
|
|
117
|
-
namespace: 'script'
|
|
113
|
+
namespace: 'script',
|
|
118
114
|
};
|
|
119
115
|
});
|
|
120
|
-
build.onLoad(
|
|
116
|
+
build.onLoad({ filter: /.*/, namespace: 'script' }, ({ path }) => {
|
|
121
117
|
return scripts.get(path);
|
|
122
118
|
});
|
|
123
119
|
// bare imports
|
|
@@ -137,7 +133,7 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
137
133
|
else if ((0, utils_1.isScanIncluded)(resolvedPath)) {
|
|
138
134
|
return {
|
|
139
135
|
path: resolvedPath,
|
|
140
|
-
namespace: 'vue'
|
|
136
|
+
namespace: 'vue',
|
|
141
137
|
};
|
|
142
138
|
}
|
|
143
139
|
else if (constant_1.assetsRE.test(resolvedPath)) {
|
|
@@ -145,7 +141,7 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
145
141
|
}
|
|
146
142
|
else {
|
|
147
143
|
return {
|
|
148
|
-
path: resolvedPath
|
|
144
|
+
path: resolvedPath,
|
|
149
145
|
};
|
|
150
146
|
}
|
|
151
147
|
}
|
|
@@ -159,10 +155,10 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
159
155
|
const namespace = (0, utils_1.isScanIncluded)(resolvedPath) ? 'vue' : undefined;
|
|
160
156
|
return {
|
|
161
157
|
path: resolvedPath,
|
|
162
|
-
namespace
|
|
158
|
+
namespace,
|
|
163
159
|
};
|
|
164
160
|
}));
|
|
165
|
-
}
|
|
161
|
+
},
|
|
166
162
|
};
|
|
167
163
|
}
|
|
168
164
|
/**
|
|
@@ -174,9 +170,7 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
174
170
|
*/
|
|
175
171
|
function extractImportPaths(code) {
|
|
176
172
|
// empty singleline & multiline comments to avoid matching comments
|
|
177
|
-
code = code
|
|
178
|
-
.replace(constant_1.multilineCommentsRE, '/* */')
|
|
179
|
-
.replace(constant_1.singlelineCommentsRE, '');
|
|
173
|
+
code = code.replace(constant_1.multilineCommentsRE, '/* */').replace(constant_1.singlelineCommentsRE, '');
|
|
180
174
|
let js = '';
|
|
181
175
|
let m;
|
|
182
176
|
while ((m = constant_1.importsRE.exec(code)) != null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanImports.js","sourceRoot":"","sources":["../../src/prebundle/scanImports.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"scanImports.js","sourceRoot":"","sources":["../../src/prebundle/scanImports.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -17,7 +17,6 @@ export declare function getDefines(chain: Chain): any;
|
|
|
17
17
|
export declare function isExclude(id: string, excludes: (string | RegExp)[]): boolean;
|
|
18
18
|
export declare function isOptimizeIncluded(path: string): boolean;
|
|
19
19
|
export declare function isScanIncluded(path: string): boolean;
|
|
20
|
-
export declare function getHash(content: string): string;
|
|
21
20
|
export declare function getBundleHash(appPath: string, deps: CollectedDeps, chain: Chain, cacheDir: string): Promise<string>;
|
|
22
21
|
export declare const sortDeps: (a: string | string[], b: string | string[]) => number;
|
|
23
22
|
export declare function formatDepsString(deps: CollectedDeps): string;
|
package/dist/utils/index.js
CHANGED
|
@@ -26,9 +26,8 @@ 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.sortDeps = exports.getBundleHash = exports.
|
|
29
|
+
exports.getMeasure = exports.commitMeta = exports.getMfHash = exports.formatDepsString = exports.sortDeps = exports.getBundleHash = exports.isScanIncluded = exports.isOptimizeIncluded = exports.isExclude = exports.getDefines = exports.getCacheDir = exports.flattenId = exports.getResolve = exports.createResolve = void 0;
|
|
30
30
|
const helper_1 = require("@tarojs/helper");
|
|
31
|
-
const crypto_1 = require("crypto");
|
|
32
31
|
const enhanced_resolve_1 = __importDefault(require("enhanced-resolve"));
|
|
33
32
|
const path_1 = __importDefault(require("path"));
|
|
34
33
|
const perf_hooks_1 = require("perf_hooks");
|
|
@@ -109,10 +108,6 @@ function isScanIncluded(path) {
|
|
|
109
108
|
return /\.vue/.test(path);
|
|
110
109
|
}
|
|
111
110
|
exports.isScanIncluded = isScanIncluded;
|
|
112
|
-
function getHash(content) {
|
|
113
|
-
return (0, crypto_1.createHash)('sha256').update(content).digest('hex').substring(0, 8);
|
|
114
|
-
}
|
|
115
|
-
exports.getHash = getHash;
|
|
116
111
|
function getBundleHash(appPath, deps, chain, cacheDir) {
|
|
117
112
|
return __awaiter(this, void 0, void 0, function* () {
|
|
118
113
|
const defines = getDefines(chain);
|
|
@@ -124,7 +119,7 @@ function getBundleHash(appPath, deps, chain, cacheDir) {
|
|
|
124
119
|
.catch(() => resolve(''));
|
|
125
120
|
});
|
|
126
121
|
}));
|
|
127
|
-
return getHash(formatDepsString(deps) +
|
|
122
|
+
return (0, helper_1.getHash)(formatDepsString(deps) +
|
|
128
123
|
lockfilesContents.join('\n') +
|
|
129
124
|
JSON.stringify(defines) +
|
|
130
125
|
cacheDir);
|
|
@@ -143,7 +138,7 @@ function formatDepsString(deps) {
|
|
|
143
138
|
}
|
|
144
139
|
exports.formatDepsString = formatDepsString;
|
|
145
140
|
function getMfHash(obj) {
|
|
146
|
-
return getHash(JSON.stringify(obj));
|
|
141
|
+
return (0, helper_1.getHash)(JSON.stringify(obj));
|
|
147
142
|
}
|
|
148
143
|
exports.getMfHash = getMfHash;
|
|
149
144
|
function commitMeta(appPath, metadataPath, metadata) {
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/path.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../src/utils/path.ts"],"names":[],"mappings":";;;AAAO,MAAM,eAAe,GAAG,CAAC,GAAG,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAA;AAAzE,QAAA,eAAe,mBAA0D;AAC/E,MAAM,gBAAgB,GAAG,CAAC,GAAG,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAA;AAAvF,QAAA,gBAAgB,oBAAuE;AACpG,SAAgB,eAAe,CAAE,UAAU,GAAG,GAAG;IAC/C,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../src/utils/path.ts"],"names":[],"mappings":";;;AAAO,MAAM,eAAe,GAAG,CAAC,GAAG,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAA;AAAzE,QAAA,eAAe,mBAA0D;AAC/E,MAAM,gBAAgB,GAAG,CAAC,GAAG,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAA;AAAvF,QAAA,gBAAgB,oBAAuE;AACpG,SAAgB,eAAe,CAAE,UAAU,GAAG,GAAG;IAC/C,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,wBAAgB,EAAC,UAAU,CAAC,CAAA;AACtF,CAAC;AAFD,0CAEC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/webpack5-prebundle",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.0-alpha.0",
|
|
4
4
|
"description": "Taro app webpack5 prebundle",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -25,9 +25,9 @@
|
|
|
25
25
|
"lodash": "^4.17.21",
|
|
26
26
|
"webpack-chain": "6.5.1",
|
|
27
27
|
"webpack-virtual-modules": "^0.5.0",
|
|
28
|
-
"@tarojs/helper": "
|
|
29
|
-
"@tarojs/taro": "
|
|
30
|
-
"@tarojs/shared": "
|
|
28
|
+
"@tarojs/helper": "4.0.0-alpha.0",
|
|
29
|
+
"@tarojs/taro": "4.0.0-alpha.0",
|
|
30
|
+
"@tarojs/shared": "4.0.0-alpha.0"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"jest": "^29.3.1",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"build": "pnpm run clean && pnpm run prod",
|
|
46
46
|
"dev": "tsc -w",
|
|
47
47
|
"prod": "tsc",
|
|
48
|
-
"clean": "rimraf dist",
|
|
48
|
+
"clean": "rimraf --impl=move-remove dist",
|
|
49
49
|
"test": "cross-env NODE_ENV=jest jest",
|
|
50
50
|
"test:ci": "cross-env NODE_ENV=jest jest --ci -i --passWithNoTests",
|
|
51
51
|
"test:coverage": "cross-env NODE_ENV=jest jest --coverage"
|