mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-19 14:52:40 +08:00
@cocos/build-engine now accepts the loose option (#7601)
This commit is contained in:
committed by
GitHub
parent
983b994e43
commit
9b4afb2983
+2
-1
@@ -4,7 +4,8 @@ module.exports = (api) => {
|
|||||||
return {
|
return {
|
||||||
presets: [
|
presets: [
|
||||||
[require('@babel/preset-env'), {
|
[require('@babel/preset-env'), {
|
||||||
targets: { node: 'current', }
|
targets: { node: 'current', },
|
||||||
|
loose: true,
|
||||||
}],
|
}],
|
||||||
[require('@cocos/babel-preset-cc'), {
|
[require('@cocos/babel-preset-cc'), {
|
||||||
allowDeclareFields: true,
|
allowDeclareFields: true,
|
||||||
|
|||||||
Generated
+4
-4
@@ -1322,9 +1322,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@cocos/build-engine": {
|
"@cocos/build-engine": {
|
||||||
"version": "4.0.0-jsb.alpha.9",
|
"version": "4.0.0-jsb.alpha.10",
|
||||||
"resolved": "https://registry.npm.taobao.org/@cocos/build-engine/download/@cocos/build-engine-4.0.0-jsb.alpha.9.tgz",
|
"resolved": "https://registry.npm.taobao.org/@cocos/build-engine/download/@cocos/build-engine-4.0.0-jsb.alpha.10.tgz",
|
||||||
"integrity": "sha1-fbKTR0306qfnMHG4eqrezUNUA9c=",
|
"integrity": "sha1-kkiFaxS2pQBHnduxymALUqWB7PI=",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"@babel/core": "^7.9.0",
|
"@babel/core": "^7.9.0",
|
||||||
@@ -1494,7 +1494,7 @@
|
|||||||
},
|
},
|
||||||
"y18n": {
|
"y18n": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.0",
|
||||||
"resolved": "https://registry.npm.taobao.org/y18n/download/y18n-4.0.0.tgz",
|
"resolved": "https://registry.npm.taobao.org/y18n/download/y18n-4.0.0.tgz?cache=0&sync_timestamp=1603639294538&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fy18n%2Fdownload%2Fy18n-4.0.0.tgz",
|
||||||
"integrity": "sha1-le+U+F7MgdAHwmThkKEg8KPIVms=",
|
"integrity": "sha1-le+U+F7MgdAHwmThkKEg8KPIVms=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
|||||||
+1
-1
@@ -26,7 +26,7 @@
|
|||||||
"@babel/core": "^7.9.0",
|
"@babel/core": "^7.9.0",
|
||||||
"@babel/preset-env": "7.8.7",
|
"@babel/preset-env": "7.8.7",
|
||||||
"@cocos/babel-preset-cc": "2.1.0",
|
"@cocos/babel-preset-cc": "2.1.0",
|
||||||
"@cocos/build-engine": "4.0.0-jsb.alpha.9",
|
"@cocos/build-engine": "4.0.0-jsb.alpha.10",
|
||||||
"@cocos/typedoc-plugin-internal-external": "^1.0.1",
|
"@cocos/typedoc-plugin-internal-external": "^1.0.1",
|
||||||
"@cocos/typedoc-plugin-localization": "^1.0.0",
|
"@cocos/typedoc-plugin-localization": "^1.0.0",
|
||||||
"@types/fs-extra": "^5.0.4",
|
"@types/fs-extra": "^5.0.4",
|
||||||
|
|||||||
Generated
+7
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@cocos/build-engine",
|
"name": "@cocos/build-engine",
|
||||||
"version": "4.0.0-jsb.alpha.9",
|
"version": "4.0.0-jsb.alpha.10",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -1234,6 +1234,12 @@
|
|||||||
"@babel/types": "^7.0.0"
|
"@babel/types": "^7.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"@types/babel__preset-env": {
|
||||||
|
"version": "7.9.1",
|
||||||
|
"resolved": "https://registry.npm.taobao.org/@types/babel__preset-env/download/@types/babel__preset-env-7.9.1.tgz",
|
||||||
|
"integrity": "sha1-umvHO/qiBQylRZI1+3PhRtD2aqY=",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"@types/babel__template": {
|
"@types/babel__template": {
|
||||||
"version": "7.0.2",
|
"version": "7.0.2",
|
||||||
"resolved": "https://registry.npm.taobao.org/@types/babel__template/download/@types/babel__template-7.0.2.tgz",
|
"resolved": "https://registry.npm.taobao.org/@types/babel__template/download/@types/babel__template-7.0.2.tgz",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@cocos/build-engine",
|
"name": "@cocos/build-engine",
|
||||||
"version": "4.0.0-jsb.alpha.9",
|
"version": "4.0.0-jsb.alpha.10",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -24,6 +24,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/babel__core": "^7.1.3",
|
"@types/babel__core": "^7.1.3",
|
||||||
|
"@types/babel__preset-env": "^7.9.1",
|
||||||
"@types/fs-extra": "^8.0.1",
|
"@types/fs-extra": "^8.0.1",
|
||||||
"@types/json5": "0.0.30",
|
"@types/json5": "0.0.30",
|
||||||
"@types/node": "^13.1.7",
|
"@types/node": "^13.1.7",
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ import json from '@rollup/plugin-json';
|
|||||||
import resolve from '@rollup/plugin-node-resolve';
|
import resolve from '@rollup/plugin-node-resolve';
|
||||||
import commonjs from '@rollup/plugin-commonjs';
|
import commonjs from '@rollup/plugin-commonjs';
|
||||||
import { terser as rpTerser } from 'rollup-plugin-terser';
|
import { terser as rpTerser } from 'rollup-plugin-terser';
|
||||||
// @ts-ignore
|
|
||||||
import babelPresetEnv from '@babel/preset-env';
|
import babelPresetEnv from '@babel/preset-env';
|
||||||
|
import type { Options as babelPresetEnvOptions } from '@babel/preset-env';
|
||||||
import babelPresetCc from '@cocos/babel-preset-cc';
|
import babelPresetCc from '@cocos/babel-preset-cc';
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
import babelPluginTransformForOf from '@babel/plugin-transform-for-of';
|
import babelPluginTransformForOf from '@babel/plugin-transform-for-of';
|
||||||
@@ -117,10 +117,15 @@ namespace build {
|
|||||||
progress?: boolean;
|
progress?: boolean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* `options.targets` of @babel/preset-env.
|
* BrowsersList targets.
|
||||||
*/
|
*/
|
||||||
targets?: string | string[] | Record<string, string>;
|
targets?: string | string[] | Record<string, string>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable loose compilation.
|
||||||
|
*/
|
||||||
|
loose?: boolean;
|
||||||
|
|
||||||
visualize?: boolean | {
|
visualize?: boolean | {
|
||||||
file?: string;
|
file?: string;
|
||||||
};
|
};
|
||||||
@@ -245,7 +250,9 @@ async function _doBuild ({
|
|||||||
console.debug(`Module source "cc":\n${rpVirtualOptions['cc']}`);
|
console.debug(`Module source "cc":\n${rpVirtualOptions['cc']}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const presetEnvOptions: any = {};
|
const presetEnvOptions: babelPresetEnvOptions = {
|
||||||
|
loose: options.loose ?? true,
|
||||||
|
};
|
||||||
if (options.targets !== undefined) {
|
if (options.targets !== undefined) {
|
||||||
presetEnvOptions.targets = options.targets;
|
presetEnvOptions.targets = options.targets;
|
||||||
}
|
}
|
||||||
@@ -261,8 +268,6 @@ async function _doBuild ({
|
|||||||
babelHelpers: 'bundled',
|
babelHelpers: 'bundled',
|
||||||
extensions: ['.js', '.ts'],
|
extensions: ['.js', '.ts'],
|
||||||
highlightCode: true,
|
highlightCode: true,
|
||||||
exclude: [
|
|
||||||
],
|
|
||||||
plugins: babelPlugins,
|
plugins: babelPlugins,
|
||||||
presets: [
|
presets: [
|
||||||
[babelPresetEnv, presetEnvOptions],
|
[babelPresetEnv, presetEnvOptions],
|
||||||
|
|||||||
@@ -8,11 +8,11 @@ export function generateCCSource (moduleRequests: string[]) {
|
|||||||
return moduleRequests.map(moduleRequest => `export * from '${moduleRequest}';`).join('\n');
|
return moduleRequests.map(moduleRequest => `export * from '${moduleRequest}';`).join('\n');
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function generateCCSourceTransformed (moduleRequests: string[], moduleOption: ModuleOption) {
|
export async function generateCCSourceTransformed (moduleRequests: string[], moduleOption: ModuleOption, loose?: boolean) {
|
||||||
const babelFormat = moduleOptionsToBabelEnvModules(moduleOption);
|
const babelFormat = moduleOptionsToBabelEnvModules(moduleOption);
|
||||||
const source = generateCCSource(moduleRequests);
|
const source = generateCCSource(moduleRequests);
|
||||||
const babelFileResult = await babel.transformAsync(source, {
|
const babelFileResult = await babel.transformAsync(source, {
|
||||||
presets: [[babelPresetEnv, {modules: babelFormat }]],
|
presets: [[babelPresetEnv, { modules: babelFormat, loose: loose ?? true }]],
|
||||||
});
|
});
|
||||||
if (!babelFileResult || !babelFileResult.code) {
|
if (!babelFileResult || !babelFileResult.code) {
|
||||||
throw new Error(`Failed to transform!`);
|
throw new Error(`Failed to transform!`);
|
||||||
|
|||||||
Reference in New Issue
Block a user