@tarojs/webpack5-prebundle 3.7.0-alpha.2 → 3.7.0-alpha.22
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 +5 -3
- package/dist/index.js +35 -1
- package/dist/index.js.map +1 -1
- package/dist/mini.js +3 -3
- package/dist/mini.js.map +1 -1
- package/dist/prebundle/bundle.d.ts +8 -9
- package/dist/prebundle/bundle.js +23 -33
- package/dist/prebundle/bundle.js.map +1 -1
- package/dist/prebundle/index.d.ts +5 -6
- package/dist/prebundle/index.js.map +1 -1
- package/dist/prebundle/scanImports.d.ts +2 -2
- package/dist/prebundle/scanImports.js +20 -27
- package/dist/prebundle/scanImports.js.map +1 -1
- package/dist/utils/constant.d.ts +1 -3
- package/dist/utils/constant.js +1 -6
- package/dist/utils/constant.js.map +1 -1
- package/dist/utils/index.d.ts +1 -7
- package/dist/utils/index.js +3 -11
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/path.js.map +1 -1
- package/dist/utils/webpack.js +1 -1
- package/dist/utils/webpack.js.map +1 -1
- package/dist/web.d.ts +1 -1
- package/dist/web.js +2 -3
- package/dist/web.js.map +1 -1
- package/dist/webpack/TaroContainerEntryModule.d.ts +1 -1
- package/dist/webpack/TaroContainerReferencePlugin.d.ts +1 -1
- package/package.json +6 -8
package/dist/index.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { PLATFORM_TYPE } from '@tarojs/shared';
|
|
2
2
|
import webpackDevServer from 'webpack-dev-server';
|
|
3
3
|
import { IPrebundle } from './prebundle';
|
|
4
|
-
import type
|
|
4
|
+
import { type IWebPrebundleConfig } from './web';
|
|
5
|
+
import type { Compiler, EntryObject } from 'webpack';
|
|
5
6
|
import type Chain from 'webpack-chain';
|
|
6
7
|
import type { IMiniPrebundleConfig } from './mini';
|
|
7
|
-
import type { IWebPrebundleConfig } from './web';
|
|
8
8
|
export * from './prebundle';
|
|
9
9
|
export interface IPrebundleParam {
|
|
10
10
|
env?: string;
|
|
@@ -27,8 +27,10 @@ export default class TaroPrebundle {
|
|
|
27
27
|
env: string;
|
|
28
28
|
platformType: PLATFORM_TYPE;
|
|
29
29
|
isBuildPlugin: boolean;
|
|
30
|
+
protected options: IPrebundle;
|
|
30
31
|
constructor(params: IPrebundleParam);
|
|
31
32
|
get config(): IWebPrebundleConfig | IMiniPrebundleConfig;
|
|
32
33
|
get entry(): EntryObject;
|
|
33
|
-
run(options
|
|
34
|
+
run(options?: IPrebundle): Promise<void>;
|
|
35
|
+
postCompilerStart(compiler: Compiler): Promise<void>;
|
|
34
36
|
}
|
package/dist/index.js
CHANGED
|
@@ -34,8 +34,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
34
34
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
35
35
|
});
|
|
36
36
|
};
|
|
37
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
38
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
39
|
+
};
|
|
37
40
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
41
|
const shared_1 = require("@tarojs/shared");
|
|
42
|
+
const path_1 = __importDefault(require("path"));
|
|
43
|
+
const web_1 = require("./web");
|
|
39
44
|
__exportStar(require("./prebundle"), exports);
|
|
40
45
|
class TaroPrebundle {
|
|
41
46
|
constructor(params) {
|
|
@@ -78,8 +83,9 @@ class TaroPrebundle {
|
|
|
78
83
|
return entry;
|
|
79
84
|
}, {});
|
|
80
85
|
}
|
|
81
|
-
run(options) {
|
|
86
|
+
run(options = {}) {
|
|
82
87
|
return __awaiter(this, void 0, void 0, function* () {
|
|
88
|
+
this.options = options;
|
|
83
89
|
if (!options.enable)
|
|
84
90
|
return;
|
|
85
91
|
let prebundleRunner;
|
|
@@ -93,6 +99,34 @@ class TaroPrebundle {
|
|
|
93
99
|
return prebundleRunner.run();
|
|
94
100
|
});
|
|
95
101
|
}
|
|
102
|
+
postCompilerStart(compiler) {
|
|
103
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
104
|
+
if (!this.options.enable)
|
|
105
|
+
return;
|
|
106
|
+
if (this.platformType === 'web') {
|
|
107
|
+
web_1.VirtualModule.apply(compiler);
|
|
108
|
+
Object.values(this.entry).forEach((item) => {
|
|
109
|
+
let resource = '';
|
|
110
|
+
if (Array.isArray(item)) {
|
|
111
|
+
resource = item[0];
|
|
112
|
+
}
|
|
113
|
+
else if (typeof item === 'string') {
|
|
114
|
+
resource = item;
|
|
115
|
+
}
|
|
116
|
+
else if (typeof item.import === 'string') {
|
|
117
|
+
resource = item.import;
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
resource = item.import[0];
|
|
121
|
+
}
|
|
122
|
+
const { dir, name } = path_1.default.parse(resource);
|
|
123
|
+
const filePath = path_1.default.join(dir, name).replace(/\.config/, '');
|
|
124
|
+
const bootPath = path_1.default.relative(this.config.appPath, `${filePath}.boot.js`);
|
|
125
|
+
web_1.VirtualModule.writeModule(bootPath, '/** bootstrap application code */');
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
});
|
|
129
|
+
}
|
|
96
130
|
}
|
|
97
131
|
exports.default = TaroPrebundle;
|
|
98
132
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/mini.js
CHANGED
|
@@ -37,7 +37,7 @@ exports.MiniPrebundle = void 0;
|
|
|
37
37
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
38
38
|
* SOFTWARE.
|
|
39
39
|
*/
|
|
40
|
-
const
|
|
40
|
+
const helper_1 = require("@tarojs/helper");
|
|
41
41
|
const path_1 = __importDefault(require("path"));
|
|
42
42
|
const perf_hooks_1 = require("perf_hooks");
|
|
43
43
|
const webpack_1 = require("webpack");
|
|
@@ -138,7 +138,7 @@ class MiniPrebundle extends prebundle_1.default {
|
|
|
138
138
|
});
|
|
139
139
|
if (this.preMetadata.mfHash !== this.metadata.mfHash) {
|
|
140
140
|
this.isUseCache = false;
|
|
141
|
-
|
|
141
|
+
helper_1.fs.existsSync(this.remoteCacheDir) && helper_1.fs.emptyDirSync(this.remoteCacheDir);
|
|
142
142
|
for (const id of this.deps.keys()) {
|
|
143
143
|
const flatId = (0, utils_1.flattenId)(id);
|
|
144
144
|
exposes[`./${id}`] = path_1.default.join(this.prebundleCacheDir, `${flatId}.js`);
|
|
@@ -196,7 +196,7 @@ class MiniPrebundle extends prebundle_1.default {
|
|
|
196
196
|
this.metadata.runtimeRequirements = new Set(this.preMetadata.runtimeRequirements);
|
|
197
197
|
this.metadata.remoteAssets = this.preMetadata.remoteAssets;
|
|
198
198
|
}
|
|
199
|
-
|
|
199
|
+
helper_1.fs.copy(this.remoteCacheDir, path_1.default.join(this.getIsBuildPluginPath(mainBuildOutput.path, this.config.isBuildPlugin), 'prebundle'));
|
|
200
200
|
this.measure(`Build remote ${constant_1.MF_NAME} duration`, BUILD_LIB_START);
|
|
201
201
|
});
|
|
202
202
|
}
|
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,
|
|
1
|
+
{"version":3,"file":"mini.js","sourceRoot":"","sources":["../src/mini.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { esbuild, swc } from '@tarojs/helper';
|
|
2
2
|
import { parse } from 'es-module-lexer';
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
|
|
6
|
-
declare type ExportsData = ReturnType<typeof parse> & {
|
|
3
|
+
import type Chain from 'webpack-chain';
|
|
4
|
+
import type { CollectedDeps } from '../utils/constant';
|
|
5
|
+
type ExportsData = ReturnType<typeof parse> & {
|
|
7
6
|
hasReExports?: boolean;
|
|
8
7
|
needInterop?: boolean;
|
|
9
8
|
};
|
|
@@ -13,13 +12,13 @@ interface BundleConfig {
|
|
|
13
12
|
chain: Chain;
|
|
14
13
|
prebundleOutputDir: string;
|
|
15
14
|
customEsbuildConfig?: Record<string, any>;
|
|
16
|
-
customSwcConfig?: Config;
|
|
15
|
+
customSwcConfig?: swc.Config;
|
|
17
16
|
}
|
|
18
|
-
export declare function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig, customSwcConfig }: BundleConfig): Promise<esbuild.BuildResult & {
|
|
17
|
+
export declare function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig, customSwcConfig, }: BundleConfig): Promise<esbuild.BuildResult & {
|
|
19
18
|
outputFiles: esbuild.OutputFile[];
|
|
20
19
|
}>;
|
|
21
|
-
export declare function getSwcPlugin({ appPath, flatIdExports }: {
|
|
20
|
+
export declare function getSwcPlugin({ appPath, flatIdExports, }: {
|
|
22
21
|
appPath: string;
|
|
23
22
|
flatIdExports: Map<string, ExportsData>;
|
|
24
|
-
}, config?: Config): Plugin;
|
|
23
|
+
}, config?: swc.Config): esbuild.Plugin;
|
|
25
24
|
export {};
|
package/dist/prebundle/bundle.js
CHANGED
|
@@ -13,11 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.getSwcPlugin = exports.bundle = void 0;
|
|
16
|
-
const core_1 = require("@swc/core");
|
|
17
16
|
const helper_1 = require("@tarojs/helper");
|
|
18
17
|
const es_module_lexer_1 = require("es-module-lexer");
|
|
19
|
-
const esbuild_1 = __importDefault(require("esbuild"));
|
|
20
|
-
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
21
18
|
const lodash_1 = require("lodash");
|
|
22
19
|
const path_1 = __importDefault(require("path"));
|
|
23
20
|
const utils_1 = require("../utils");
|
|
@@ -28,7 +25,7 @@ const constant_1 = require("../utils/constant");
|
|
|
28
25
|
// 1. flatten all ids to eliminate slash
|
|
29
26
|
// 2. in the plugin, read the entry ourselves as virtual files to retain the
|
|
30
27
|
// path.
|
|
31
|
-
function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig = {}, customSwcConfig = {} }) {
|
|
28
|
+
function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig = {}, customSwcConfig = {}, }) {
|
|
32
29
|
return __awaiter(this, void 0, void 0, function* () {
|
|
33
30
|
yield es_module_lexer_1.init;
|
|
34
31
|
const flattenDeps = new Map();
|
|
@@ -39,7 +36,7 @@ function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig
|
|
|
39
36
|
flattenDeps.set(flatId, dep);
|
|
40
37
|
// Use es-module-lexer to check ES exports
|
|
41
38
|
// But "export * from" syntax should be checked alone
|
|
42
|
-
const fileContent =
|
|
39
|
+
const fileContent = helper_1.fs.readFileSync(dep, 'utf-8');
|
|
43
40
|
const exportsData = (0, es_module_lexer_1.parse)(fileContent);
|
|
44
41
|
for (const { ss, se } of exportsData[0]) {
|
|
45
42
|
const exp = fileContent.slice(ss, se);
|
|
@@ -49,10 +46,8 @@ function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig
|
|
|
49
46
|
}
|
|
50
47
|
flatIdExports.set(flatId, exportsData);
|
|
51
48
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
: fs_extra_1.default.ensureDirSync(prebundleOutputDir);
|
|
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)), {
|
|
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)), {
|
|
56
51
|
// AMD 被 esbuild 转 ESM 后，是套着 ESM 外皮的 AMD 语法模块。
|
|
57
52
|
// Webpack HarmonyDetectionParserPlugin 会阻止 AMDDefineDependencyParserPlugin 对这些模块的处理。
|
|
58
53
|
// 导致这些模块报错（如 lodash）。目前的办法是把 define 置为 false，不支持 AMD 导出。
|
|
@@ -60,15 +55,15 @@ function bundle({ appPath, deps, chain, prebundleOutputDir, customEsbuildConfig
|
|
|
60
55
|
getEntryPlugin({
|
|
61
56
|
flattenDeps,
|
|
62
57
|
flatIdExports,
|
|
63
|
-
prebundleOutputDir
|
|
58
|
+
prebundleOutputDir,
|
|
64
59
|
}),
|
|
65
|
-
...customEsbuildConfig.plugins || [],
|
|
66
|
-
getSwcPlugin({ appPath, flatIdExports }, customSwcConfig)
|
|
60
|
+
...(customEsbuildConfig.plugins || []),
|
|
61
|
+
getSwcPlugin({ appPath, flatIdExports }, customSwcConfig),
|
|
67
62
|
] }));
|
|
68
63
|
});
|
|
69
64
|
}
|
|
70
65
|
exports.bundle = bundle;
|
|
71
|
-
function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
66
|
+
function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir, }) {
|
|
72
67
|
const resolve = (0, utils_1.getResolve)();
|
|
73
68
|
return {
|
|
74
69
|
name: 'entry',
|
|
@@ -78,17 +73,17 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
78
73
|
const filePath = yield resolve(path_1.default.dirname(importer), id);
|
|
79
74
|
const fileExt = path_1.default.extname(filePath);
|
|
80
75
|
const fileBasename = path_1.default.basename(filePath, fileExt);
|
|
81
|
-
const fileContent = yield
|
|
76
|
+
const fileContent = yield helper_1.fs.readFile(filePath);
|
|
82
77
|
const outputFile = path_1.default.join(prebundleOutputDir, `${fileBasename}-${(0, utils_1.getHash)(filePath)}${fileExt}`);
|
|
83
|
-
yield
|
|
84
|
-
return (0,
|
|
78
|
+
yield helper_1.fs.writeFile(outputFile, fileContent);
|
|
79
|
+
return (0, helper_1.externalEsbuildModule)({ path: `./${path_1.default.relative(prebundleOutputDir, outputFile)}` });
|
|
85
80
|
}));
|
|
86
81
|
build.onResolve({ filter: constant_1.moduleRE }, ({ path: id, importer }) => __awaiter(this, void 0, void 0, function* () {
|
|
87
82
|
// entry
|
|
88
83
|
if (!importer && flattenDeps.has(id)) {
|
|
89
84
|
return {
|
|
90
85
|
path: id,
|
|
91
|
-
namespace: 'entry'
|
|
86
|
+
namespace: 'entry',
|
|
92
87
|
};
|
|
93
88
|
}
|
|
94
89
|
try {
|
|
@@ -97,11 +92,11 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
97
92
|
return { path: resolvedPath };
|
|
98
93
|
}
|
|
99
94
|
else {
|
|
100
|
-
return (0,
|
|
95
|
+
return (0, helper_1.externalEsbuildModule)({ path: id });
|
|
101
96
|
}
|
|
102
97
|
}
|
|
103
98
|
catch (e) {
|
|
104
|
-
return (0,
|
|
99
|
+
return (0, helper_1.externalEsbuildModule)({ path: id });
|
|
105
100
|
}
|
|
106
101
|
}));
|
|
107
102
|
build.onLoad({ filter: constant_1.moduleRE, namespace: 'entry' }, ({ path: id }) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -122,9 +117,7 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
122
117
|
// export default
|
|
123
118
|
js += `import d from "${filePath}";export default d;`;
|
|
124
119
|
}
|
|
125
|
-
if (hasReExports ||
|
|
126
|
-
exportsList.length > 1 ||
|
|
127
|
-
exportsList[0] !== 'default') {
|
|
120
|
+
if (hasReExports || exportsList.length > 1 || exportsList[0] !== 'default') {
|
|
128
121
|
// export * from 'xx'
|
|
129
122
|
// export const xx
|
|
130
123
|
js += `export * from "${filePath}";`;
|
|
@@ -137,13 +130,13 @@ function getEntryPlugin({ flattenDeps, flatIdExports, prebundleOutputDir }) {
|
|
|
137
130
|
return {
|
|
138
131
|
loader: 'js',
|
|
139
132
|
resolveDir: process.cwd(),
|
|
140
|
-
contents: js
|
|
133
|
+
contents: js,
|
|
141
134
|
};
|
|
142
135
|
}));
|
|
143
|
-
}
|
|
136
|
+
},
|
|
144
137
|
};
|
|
145
138
|
}
|
|
146
|
-
function getSwcPlugin({ appPath, flatIdExports }, config) {
|
|
139
|
+
function getSwcPlugin({ appPath, flatIdExports, }, config) {
|
|
147
140
|
return {
|
|
148
141
|
name: 'swc-plugin',
|
|
149
142
|
setup(build) {
|
|
@@ -152,8 +145,8 @@ function getSwcPlugin({ appPath, flatIdExports }, config) {
|
|
|
152
145
|
yield Promise.all(outputFiles.map(({ path, text }) => __awaiter(this, void 0, void 0, function* () {
|
|
153
146
|
if (!helper_1.REG_SCRIPTS.test(path))
|
|
154
147
|
return;
|
|
155
|
-
const { code } =
|
|
156
|
-
|
|
148
|
+
const { code } = helper_1.swc.transformSync(text, (0, lodash_1.defaults)(config, { jsc: { target: 'es2015' } }));
|
|
149
|
+
helper_1.fs.writeFile(path, code);
|
|
157
150
|
})));
|
|
158
151
|
// esbuild 把 Commonjs 转 ESM 时，打包后只有 export default 语句，
|
|
159
152
|
// 无法实现原模块 module.exports = 的功能。
|
|
@@ -167,13 +160,10 @@ function getSwcPlugin({ appPath, flatIdExports }, config) {
|
|
|
167
160
|
const entry = output.entryPoint.replace(/^entry:/, '');
|
|
168
161
|
if (!flatIdExports.has(entry))
|
|
169
162
|
continue;
|
|
170
|
-
if (((_b = flatIdExports.get(entry)) === null || _b === void 0 ? void 0 : _b.needInterop) &&
|
|
171
|
-
output.exports.length === 1 &&
|
|
172
|
-
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') {
|
|
173
164
|
const srcPath = path_1.default.join(appPath, outputName);
|
|
174
165
|
const destPath = path_1.default.join(appPath, outputName.replace(/(\.js)$/, '.core$1'));
|
|
175
|
-
processAll.push(
|
|
176
|
-
.then(() => fs_extra_1.default.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)}');
|
|
177
167
|
module.exports = m.default;
|
|
178
168
|
exports.default = module.exports;
|
|
179
169
|
`)));
|
|
@@ -181,7 +171,7 @@ function getSwcPlugin({ appPath, flatIdExports }, config) {
|
|
|
181
171
|
}
|
|
182
172
|
yield Promise.all(processAll);
|
|
183
173
|
}));
|
|
184
|
-
}
|
|
174
|
+
},
|
|
185
175
|
};
|
|
186
176
|
}
|
|
187
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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"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { PLATFORM_TYPE } from '@tarojs/shared';
|
|
2
|
-
import { Message } from 'esbuild';
|
|
3
2
|
import webpack from 'webpack';
|
|
4
3
|
import { getMeasure, Metadata } from '../utils';
|
|
5
4
|
import { CollectedDeps } from '../utils/constant';
|
|
6
|
-
import type {
|
|
5
|
+
import type { esbuild, swc } from '@tarojs/helper';
|
|
7
6
|
import type { IProjectBaseConfig } from '@tarojs/taro/types/compile';
|
|
8
7
|
import type { Configuration, EntryObject } from 'webpack';
|
|
9
8
|
import type Chain from 'webpack-chain';
|
|
10
|
-
export
|
|
9
|
+
export type IPrebundle = Exclude<Exclude<IProjectBaseConfig['compiler'], string | undefined>['prebundle'], undefined>;
|
|
11
10
|
export interface IPrebundleConfig {
|
|
12
11
|
appPath: string;
|
|
13
12
|
chain: Chain;
|
|
@@ -21,7 +20,7 @@ export interface IPrebundleConfig {
|
|
|
21
20
|
sourceRoot: string;
|
|
22
21
|
isBuildPlugin?: boolean;
|
|
23
22
|
}
|
|
24
|
-
|
|
23
|
+
type TMode = 'production' | 'development' | 'none';
|
|
25
24
|
export default class BasePrebundle<T extends IPrebundleConfig = IPrebundleConfig> {
|
|
26
25
|
protected config: T;
|
|
27
26
|
protected option: IPrebundle;
|
|
@@ -30,7 +29,7 @@ export default class BasePrebundle<T extends IPrebundleConfig = IPrebundleConfig
|
|
|
30
29
|
cacheDir: string;
|
|
31
30
|
chain: Chain;
|
|
32
31
|
customEsbuildConfig: IPrebundle['esbuild'];
|
|
33
|
-
customSwcConfig?: Config;
|
|
32
|
+
customSwcConfig?: swc.Config;
|
|
34
33
|
env: string;
|
|
35
34
|
mode: TMode;
|
|
36
35
|
platformType: PLATFORM_TYPE;
|
|
@@ -52,7 +51,7 @@ export default class BasePrebundle<T extends IPrebundleConfig = IPrebundleConfig
|
|
|
52
51
|
getEntries(appJsPath: string): string[];
|
|
53
52
|
setDeps(entries: string[], include?: string[], exclude?: string[]): Promise<void>;
|
|
54
53
|
bundle(): any;
|
|
55
|
-
handleBundleError(errors?: Message[]): any;
|
|
54
|
+
handleBundleError(errors?: esbuild.Message[]): any;
|
|
56
55
|
setHost(publicPath?: string): void;
|
|
57
56
|
getRemoteWebpackCompiler(standard: Configuration, custom?: Configuration): webpack.Compiler;
|
|
58
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/prebundle/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAAsH;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/prebundle/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.scanImports = void 0;
|
|
16
|
-
const
|
|
17
|
-
const fs_1 = __importDefault(require("fs"));
|
|
16
|
+
const helper_1 = require("@tarojs/helper");
|
|
18
17
|
const path_1 = __importDefault(require("path"));
|
|
19
18
|
const utils_1 = require("../utils");
|
|
20
19
|
const constant_1 = require("../utils/constant");
|
|
@@ -24,10 +23,7 @@ function scanImports({ appPath, chain, entries, include = [], exclude = [], cust
|
|
|
24
23
|
const customPlugins = customEsbuildConfig.plugins || [];
|
|
25
24
|
yield Promise.all(entries.map((entry) => __awaiter(this, void 0, void 0, function* () {
|
|
26
25
|
try {
|
|
27
|
-
yield
|
|
28
|
-
scanImportsPlugin,
|
|
29
|
-
...customPlugins
|
|
30
|
-
] }));
|
|
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] }));
|
|
31
27
|
}
|
|
32
28
|
catch (e) { } // eslint-disable-line no-empty
|
|
33
29
|
})));
|
|
@@ -71,10 +67,10 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
71
67
|
name: 'scanImports',
|
|
72
68
|
setup(build) {
|
|
73
69
|
// assets
|
|
74
|
-
build.onResolve(
|
|
70
|
+
build.onResolve({ filter: constant_1.assetsRE }, helper_1.externalEsbuildModule);
|
|
75
71
|
// .vue
|
|
76
72
|
build.onLoad({ filter: /\.vue$/, namespace: 'vue' }, ({ path }) => {
|
|
77
|
-
let raw =
|
|
73
|
+
let raw = helper_1.fs.readFileSync(path, 'utf-8');
|
|
78
74
|
raw = raw.replace(constant_1.commentRE, '<!---->');
|
|
79
75
|
const regex = constant_1.scriptRE;
|
|
80
76
|
regex.lastIndex = 0;
|
|
@@ -92,12 +88,11 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
92
88
|
if (content.trim()) {
|
|
93
89
|
// append imports in TS to prevent esbuild from removing them
|
|
94
90
|
// since they may be used in the template
|
|
95
|
-
const contents = content +
|
|
96
|
-
(loader.startsWith('ts') ? extractImportPaths(content) : '');
|
|
91
|
+
const contents = content + (loader.startsWith('ts') ? extractImportPaths(content) : '');
|
|
97
92
|
const key = `${path}?id=${scriptId++}`;
|
|
98
93
|
scripts.set(key, {
|
|
99
94
|
loader,
|
|
100
|
-
contents
|
|
95
|
+
contents,
|
|
101
96
|
});
|
|
102
97
|
const virtualModulePath = JSON.stringify(constant_1.virtualModulePrefix + key);
|
|
103
98
|
js += `export * from ${virtualModulePath}\n`;
|
|
@@ -109,49 +104,49 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
109
104
|
}
|
|
110
105
|
return {
|
|
111
106
|
loader: 'js',
|
|
112
|
-
contents: js
|
|
107
|
+
contents: js,
|
|
113
108
|
};
|
|
114
109
|
});
|
|
115
|
-
build.onResolve(
|
|
110
|
+
build.onResolve({ filter: constant_1.virtualModuleRE }, ({ path }) => {
|
|
116
111
|
return {
|
|
117
112
|
path: path.replace(constant_1.virtualModulePrefix, ''),
|
|
118
|
-
namespace: 'script'
|
|
113
|
+
namespace: 'script',
|
|
119
114
|
};
|
|
120
115
|
});
|
|
121
|
-
build.onLoad(
|
|
116
|
+
build.onLoad({ filter: /.*/, namespace: 'script' }, ({ path }) => {
|
|
122
117
|
return scripts.get(path);
|
|
123
118
|
});
|
|
124
119
|
// bare imports
|
|
125
120
|
build.onResolve({ filter: constant_1.moduleRE }, ({ path: id, importer }) => __awaiter(this, void 0, void 0, function* () {
|
|
126
121
|
if ((0, utils_1.isExclude)(id, excludes))
|
|
127
|
-
return (0,
|
|
122
|
+
return (0, helper_1.externalEsbuildModule)({ path: id });
|
|
128
123
|
if (deps.has(id))
|
|
129
|
-
return (0,
|
|
124
|
+
return (0, helper_1.externalEsbuildModule)({ path: id });
|
|
130
125
|
try {
|
|
131
126
|
const resolvedPath = yield resolve(path_1.default.dirname(importer), id);
|
|
132
127
|
if (resolvedPath.includes('node_modules') || includes.includes(id)) {
|
|
133
128
|
if ((0, utils_1.isOptimizeIncluded)(resolvedPath)) {
|
|
134
129
|
deps.set(id, resolvedPath);
|
|
135
130
|
}
|
|
136
|
-
return (0,
|
|
131
|
+
return (0, helper_1.externalEsbuildModule)({ path: id });
|
|
137
132
|
}
|
|
138
133
|
else if ((0, utils_1.isScanIncluded)(resolvedPath)) {
|
|
139
134
|
return {
|
|
140
135
|
path: resolvedPath,
|
|
141
|
-
namespace: 'vue'
|
|
136
|
+
namespace: 'vue',
|
|
142
137
|
};
|
|
143
138
|
}
|
|
144
139
|
else if (constant_1.assetsRE.test(resolvedPath)) {
|
|
145
|
-
(0,
|
|
140
|
+
(0, helper_1.externalEsbuildModule)({ path: id });
|
|
146
141
|
}
|
|
147
142
|
else {
|
|
148
143
|
return {
|
|
149
|
-
path: resolvedPath
|
|
144
|
+
path: resolvedPath,
|
|
150
145
|
};
|
|
151
146
|
}
|
|
152
147
|
}
|
|
153
148
|
catch (e) {
|
|
154
|
-
return (0,
|
|
149
|
+
return (0, helper_1.externalEsbuildModule)({ path: id });
|
|
155
150
|
}
|
|
156
151
|
}));
|
|
157
152
|
// catch all
|
|
@@ -160,10 +155,10 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
160
155
|
const namespace = (0, utils_1.isScanIncluded)(resolvedPath) ? 'vue' : undefined;
|
|
161
156
|
return {
|
|
162
157
|
path: resolvedPath,
|
|
163
|
-
namespace
|
|
158
|
+
namespace,
|
|
164
159
|
};
|
|
165
160
|
}));
|
|
166
|
-
}
|
|
161
|
+
},
|
|
167
162
|
};
|
|
168
163
|
}
|
|
169
164
|
/**
|
|
@@ -175,9 +170,7 @@ function getScanImportsPlugin(deps, includes, excludes) {
|
|
|
175
170
|
*/
|
|
176
171
|
function extractImportPaths(code) {
|
|
177
172
|
// empty singleline & multiline comments to avoid matching comments
|
|
178
|
-
code = code
|
|
179
|
-
.replace(constant_1.multilineCommentsRE, '/* */')
|
|
180
|
-
.replace(constant_1.singlelineCommentsRE, '');
|
|
173
|
+
code = code.replace(constant_1.multilineCommentsRE, '/* */').replace(constant_1.singlelineCommentsRE, '');
|
|
181
174
|
let js = '';
|
|
182
175
|
let m;
|
|
183
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/constant.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Loader } from 'esbuild';
|
|
2
1
|
export declare const virtualModulePrefix = "virtual-module:";
|
|
3
2
|
export declare const virtualModuleRE: RegExp;
|
|
4
3
|
export declare const assetsRE: RegExp;
|
|
@@ -9,6 +8,5 @@ export declare const multilineCommentsRE: RegExp;
|
|
|
9
8
|
export declare const singlelineCommentsRE: RegExp;
|
|
10
9
|
export declare const importsRE: RegExp;
|
|
11
10
|
export declare const moduleRE: RegExp;
|
|
12
|
-
export
|
|
11
|
+
export type CollectedDeps = Map<string, string>;
|
|
13
12
|
export declare const MF_NAME = "taro_app_library";
|
|
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.
|
|
3
|
+
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',
|
|
@@ -59,9 +59,4 @@ exports.singlelineCommentsRE = /\/\/.*/g;
|
|
|
59
59
|
exports.importsRE = /(?<!\/\/.*)(?<=^|;|\*\/)\s*import(?!\s+type)(?:[\w*{}\n\r\t, ]+from\s*)?\s*("[^"]+"|'[^']+')\s*(?=$|;|\/\/|\/\*)/gm;
|
|
60
60
|
exports.moduleRE = /^[^./\\][^:]/;
|
|
61
61
|
exports.MF_NAME = 'taro_app_library';
|
|
62
|
-
exports.defaultEsbuildLoader = {
|
|
63
|
-
'.js': 'tsx',
|
|
64
|
-
'.jsx': 'tsx',
|
|
65
|
-
'.ts': 'tsx'
|
|
66
|
-
};
|
|
67
62
|
//# sourceMappingURL=constant.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../src/utils/constant.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../src/utils/constant.ts"],"names":[],"mappings":";;;AAAA,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"}
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import Chain from 'webpack-chain';
|
|
1
|
+
import type Chain from 'webpack-chain';
|
|
2
2
|
import type { CollectedDeps } from './constant';
|
|
3
3
|
export interface Metadata {
|
|
4
4
|
bundleHash?: string;
|
|
@@ -11,12 +11,6 @@ export interface Metadata {
|
|
|
11
11
|
}
|
|
12
12
|
export declare function createResolve(appPath: string, resolveOptions: any): void;
|
|
13
13
|
export declare function getResolve(): (importer: string, request: string) => Promise<string>;
|
|
14
|
-
export declare function externalModule({ path }: {
|
|
15
|
-
path: string;
|
|
16
|
-
}): {
|
|
17
|
-
path: string;
|
|
18
|
-
external: boolean;
|
|
19
|
-
};
|
|
20
14
|
export declare function flattenId(id: string): string;
|
|
21
15
|
export declare function getCacheDir(appPath: string, env?: string): string;
|
|
22
16
|
export declare function getDefines(chain: Chain): any;
|
package/dist/utils/index.js
CHANGED
|
@@ -26,11 +26,10 @@ 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.getHash = exports.isScanIncluded = exports.isOptimizeIncluded = exports.isExclude = exports.getDefines = exports.getCacheDir = exports.flattenId = exports.
|
|
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.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"));
|
|
33
|
-
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
34
33
|
const path_1 = __importDefault(require("path"));
|
|
35
34
|
const perf_hooks_1 = require("perf_hooks");
|
|
36
35
|
let resolve;
|
|
@@ -59,13 +58,6 @@ function getResolve() {
|
|
|
59
58
|
return resolve;
|
|
60
59
|
}
|
|
61
60
|
exports.getResolve = getResolve;
|
|
62
|
-
function externalModule({ path }) {
|
|
63
|
-
return {
|
|
64
|
-
path,
|
|
65
|
-
external: true
|
|
66
|
-
};
|
|
67
|
-
}
|
|
68
|
-
exports.externalModule = externalModule;
|
|
69
61
|
function flattenId(id) {
|
|
70
62
|
return id.replace(/(\s*>\s*)/g, '__').replace(/[/.:]/g, '_');
|
|
71
63
|
}
|
|
@@ -127,7 +119,7 @@ function getBundleHash(appPath, deps, chain, cacheDir) {
|
|
|
127
119
|
const lockfiles = ['package-lock.json', 'yarn.lock', 'pnpm-lock.yaml'];
|
|
128
120
|
const lockfilesContents = yield Promise.all(lockfiles.map(item => {
|
|
129
121
|
return new Promise(resolve => {
|
|
130
|
-
|
|
122
|
+
helper_1.fs.readFile(path_1.default.join(appPath, item))
|
|
131
123
|
.then(content => resolve(content.toString()))
|
|
132
124
|
.catch(() => resolve(''));
|
|
133
125
|
});
|
|
@@ -157,7 +149,7 @@ exports.getMfHash = getMfHash;
|
|
|
157
149
|
function commitMeta(appPath, metadataPath, metadata) {
|
|
158
150
|
return __awaiter(this, void 0, void 0, function* () {
|
|
159
151
|
// Todo: 改为相对路径
|
|
160
|
-
yield
|
|
152
|
+
yield helper_1.fs.writeJSON(metadataPath, metadata, {
|
|
161
153
|
spaces: 2,
|
|
162
154
|
replacer(key, value) {
|
|
163
155
|
if (value instanceof Set) {
|
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/dist/utils/webpack.js
CHANGED
|
@@ -14,7 +14,7 @@ const { ConcatSource } = webpack_1.sources;
|
|
|
14
14
|
function addRequireToSource(id, modules, commonChunks) {
|
|
15
15
|
const source = new ConcatSource();
|
|
16
16
|
commonChunks.forEach(chunkItem => {
|
|
17
|
-
source.add(`require(${JSON.stringify((0, helper_1.promoteRelativePath)(path_1.default.relative(id, chunkItem.name)))});\n`);
|
|
17
|
+
source.add(`require(${JSON.stringify((0, helper_1.promoteRelativePath)(path_1.default.posix.relative(id, chunkItem.name)))});\n`);
|
|
18
18
|
});
|
|
19
19
|
source.add('\n');
|
|
20
20
|
source.add(modules);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../src/utils/webpack.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAoD;AACpD,gDAAuB;AACvB,qCAAiC;AAIjC,MAAM,EAAE,YAAY,EAAE,GAAG,iBAAO,CAAA;AAEhC;;GAEG;AACH,SAAgB,kBAAkB,CAAE,EAAU,EAAE,OAAuB,EAAE,YAA0C;IACjH,MAAM,MAAM,GAAG,IAAI,YAAY,EAAE,CAAA;IACjC,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/B,MAAM,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,IAAA,4BAAmB,EAAC,cAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../src/utils/webpack.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAoD;AACpD,gDAAuB;AACvB,qCAAiC;AAIjC,MAAM,EAAE,YAAY,EAAE,GAAG,iBAAO,CAAA;AAEhC;;GAEG;AACH,SAAgB,kBAAkB,CAAE,EAAU,EAAE,OAAuB,EAAE,YAA0C;IACjH,MAAM,MAAM,GAAG,IAAI,YAAY,EAAE,CAAA;IACjC,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/B,MAAM,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,IAAA,4BAAmB,EAAC,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IAC3G,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAChB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACnB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACf,OAAO,MAAM,CAAA;AACf,CAAC;AATD,gDASC;AAED,SAAgB,mBAAmB,CAAE,WAAwB,EAAE,KAAY;IACzE,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAA;IACzC,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAA;IAC/E,IAAI,YAAY,CAAC,MAAM,EAAE;QACvB,OAAO,YAAY,CAAC,CAAC,CAAC,CAAA;KACvB;AACH,CAAC;AAND,kDAMC;AAED,SAAgB,gBAAgB,CAAE,KAAY;IAC5C,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ,EAAE;QAChC,OAAO,KAAK,CAAC,EAAE,CAAA;KAChB;IACD,OAAO,KAAK,CAAC,IAAI,CAAA;AACnB,CAAC;AALD,4CAKC"}
|
package/dist/web.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import webpackDevServer from 'webpack-dev-server';
|
|
2
1
|
import VirtualModulesPlugin from 'webpack-virtual-modules';
|
|
3
2
|
import BasePrebundle, { IPrebundleConfig } from './prebundle';
|
|
3
|
+
import type webpackDevServer from 'webpack-dev-server';
|
|
4
4
|
import type { IPrebundle } from './prebundle';
|
|
5
5
|
export declare const VirtualModule: VirtualModulesPlugin;
|
|
6
6
|
export interface IWebPrebundleConfig extends IPrebundleConfig {
|
package/dist/web.js
CHANGED
|
@@ -38,7 +38,6 @@ exports.WebPrebundle = exports.VirtualModule = void 0;
|
|
|
38
38
|
* SOFTWARE.
|
|
39
39
|
*/
|
|
40
40
|
const helper_1 = require("@tarojs/helper");
|
|
41
|
-
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
42
41
|
const path_1 = __importDefault(require("path"));
|
|
43
42
|
const perf_hooks_1 = require("perf_hooks");
|
|
44
43
|
const webpack_virtual_modules_1 = __importDefault(require("webpack-virtual-modules"));
|
|
@@ -75,7 +74,7 @@ class WebPrebundle extends prebundle_1.default {
|
|
|
75
74
|
});
|
|
76
75
|
if (this.preMetadata.mfHash !== this.metadata.mfHash) {
|
|
77
76
|
this.isUseCache = false;
|
|
78
|
-
|
|
77
|
+
helper_1.fs.existsSync(this.remoteCacheDir) && helper_1.fs.emptyDirSync(this.remoteCacheDir);
|
|
79
78
|
for (const id of this.deps.keys()) {
|
|
80
79
|
const flatId = (0, utils_1.flattenId)(id);
|
|
81
80
|
exposes[`./${id}`] = path_1.default.join(this.prebundleCacheDir, `${flatId}.js`);
|
|
@@ -130,7 +129,7 @@ class WebPrebundle extends prebundle_1.default {
|
|
|
130
129
|
this.metadata.remoteAssets = this.preMetadata.remoteAssets;
|
|
131
130
|
}
|
|
132
131
|
if (this.mode === 'production' || ((_b = (_a = this.config.devServer) === null || _a === void 0 ? void 0 : _a.devMiddleware) === null || _b === void 0 ? void 0 : _b.writeToDisk)) {
|
|
133
|
-
|
|
132
|
+
helper_1.fs.copy(this.remoteCacheDir, mainBuildOutput.path);
|
|
134
133
|
}
|
|
135
134
|
this.measure(`Build remote ${constant_1.MF_NAME} duration`, BUILD_LIB_START);
|
|
136
135
|
});
|
package/dist/web.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.js","sourceRoot":"","sources":["../src/web.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qDAAqD;AACrD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,
|
|
1
|
+
{"version":3,"file":"web.js","sourceRoot":"","sources":["../src/web.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import ContainerPlugin from 'webpack/lib/container/ContainerPlugin';
|
|
2
2
|
declare const ContainerEntryModule: any;
|
|
3
|
-
|
|
3
|
+
type Exposes = ConstructorParameters<typeof ContainerPlugin>[0]['exposes'];
|
|
4
4
|
export default class TaroContainerEntryModule extends ContainerEntryModule {
|
|
5
5
|
constructor(name: string, exposes: Exposes, shareScope: string);
|
|
6
6
|
codeGeneration({ moduleGraph, chunkGraph, runtimeTemplate }: {
|
|
@@ -3,7 +3,7 @@ import { CollectedDeps } from '../utils/constant';
|
|
|
3
3
|
import type { PLATFORM_TYPE } from '@tarojs/shared';
|
|
4
4
|
import type { Compiler } from 'webpack';
|
|
5
5
|
import type { ContainerReferencePluginOptions } from 'webpack/types';
|
|
6
|
-
|
|
6
|
+
type MFOptions = Partial<ContainerReferencePluginOptions>;
|
|
7
7
|
interface IParams {
|
|
8
8
|
deps: CollectedDeps;
|
|
9
9
|
env: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/webpack5-prebundle",
|
|
3
|
-
"version": "3.7.0-alpha.
|
|
3
|
+
"version": "3.7.0-alpha.22",
|
|
4
4
|
"description": "Taro app webpack5 prebundle",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -20,16 +20,14 @@
|
|
|
20
20
|
},
|
|
21
21
|
"homepage": "https://github.com/NervJS/taro#readme",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@swc/core": "^1.3.23",
|
|
24
23
|
"enhanced-resolve": "^5.9.3",
|
|
25
24
|
"es-module-lexer": "^0.10.4",
|
|
26
|
-
"esbuild": "^0.14.27",
|
|
27
|
-
"fs-extra": "^8.0.1",
|
|
28
25
|
"lodash": "^4.17.21",
|
|
29
26
|
"webpack-chain": "6.5.1",
|
|
30
27
|
"webpack-virtual-modules": "^0.5.0",
|
|
31
|
-
"@tarojs/helper": "3.7.0-alpha.
|
|
32
|
-
"@tarojs/taro": "3.7.0-alpha.
|
|
28
|
+
"@tarojs/helper": "3.7.0-alpha.22",
|
|
29
|
+
"@tarojs/taro": "3.7.0-alpha.22",
|
|
30
|
+
"@tarojs/shared": "3.7.0-alpha.22"
|
|
33
31
|
},
|
|
34
32
|
"devDependencies": {
|
|
35
33
|
"jest": "^29.3.1",
|
|
@@ -38,7 +36,7 @@
|
|
|
38
36
|
"ts-jest": "^29.0.5",
|
|
39
37
|
"typescript": "^4.7.4",
|
|
40
38
|
"webpack": "5.78.0",
|
|
41
|
-
"webpack-dev-server": "4.
|
|
39
|
+
"webpack-dev-server": "4.11.1"
|
|
42
40
|
},
|
|
43
41
|
"peerDependencies": {
|
|
44
42
|
"webpack": "^5.78.0"
|
|
@@ -49,7 +47,7 @@
|
|
|
49
47
|
"prod": "tsc",
|
|
50
48
|
"clean": "rimraf dist",
|
|
51
49
|
"test": "cross-env NODE_ENV=jest jest",
|
|
52
|
-
"test:ci": "cross-env NODE_ENV=jest jest --ci -i",
|
|
50
|
+
"test:ci": "cross-env NODE_ENV=jest jest --ci -i --passWithNoTests",
|
|
53
51
|
"test:coverage": "cross-env NODE_ENV=jest jest --coverage"
|
|
54
52
|
}
|
|
55
53
|
}
|