diff --git a/cocos/core/data/deserialize-dynamic-empty.ts b/cocos/core/data/deserialize-dynamic-empty.ts new file mode 100644 index 0000000000..d1381ecb94 --- /dev/null +++ b/cocos/core/data/deserialize-dynamic-empty.ts @@ -0,0 +1,4 @@ + +export function deserializeDynamic() { + throw new Error(`Should not called`); +} diff --git a/gulpfile.js b/gulpfile.js index 2fc0f356a5..e08f8dc348 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2013-2016 Chukong Technologies Inc. Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. @@ -45,7 +45,7 @@ gulp.task('build-code', gulp.series('build-debug-infos', () => { `--engine=${__dirname}`, '--module=system', '--sourcemap', - '--buildmode=universal', + '--build-mode=BUILD', '--platform=HTML5', '--physics=cannon', '--out=./bin/dev/cc', @@ -64,7 +64,7 @@ gulp.task('build-code-minified', gulp.series('build-debug-infos', () => { '--module=system', '--compress', '--sourcemap', - '--buildmode=universal', + '--build-mode=BUILD', '--platform=HTML5', '--physics=cannon', '--out=./bin/dev/cc-min', diff --git a/package-lock.json b/package-lock.json index fd235c1a85..9cda316ba7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1412,7 +1412,7 @@ }, "@cocos/babel-plugin-dynamic-import-vars": { "version": "1.0.2", - "resolved": "https://registry.npm.taobao.org/@cocos/babel-plugin-dynamic-import-vars/download/@cocos/babel-plugin-dynamic-import-vars-1.0.2.tgz?cache=0&sync_timestamp=1604048375532&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40cocos%2Fbabel-plugin-dynamic-import-vars%2Fdownload%2F%40cocos%2Fbabel-plugin-dynamic-import-vars-1.0.2.tgz", + "resolved": "https://registry.npm.taobao.org/@cocos/babel-plugin-dynamic-import-vars/download/@cocos/babel-plugin-dynamic-import-vars-1.0.2.tgz", "integrity": "sha1-chaboK/r3jjHTS02cU95rWZBT5g=", "dev": true, "requires": { @@ -1444,9 +1444,9 @@ } }, "@cocos/build-engine": { - "version": "4.0.1", - "resolved": "https://registry.npm.taobao.org/@cocos/build-engine/download/@cocos/build-engine-4.0.1.tgz?cache=0&sync_timestamp=1605755224372&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40cocos%2Fbuild-engine%2Fdownload%2F%40cocos%2Fbuild-engine-4.0.1.tgz", - "integrity": "sha1-1BwuvJWf3ZZ/m69udssMIKIKWVk=", + "version": "4.0.3", + "resolved": "https://registry.npm.taobao.org/@cocos/build-engine/download/@cocos/build-engine-4.0.3.tgz?cache=0&sync_timestamp=1607320313103&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40cocos%2Fbuild-engine%2Fdownload%2F%40cocos%2Fbuild-engine-4.0.3.tgz", + "integrity": "sha1-3oCfR/wurX1zm0Fg0geVY7/iwU8=", "dev": true, "requires": { "@babel/core": "^7.9.0", @@ -1479,7 +1479,7 @@ }, "ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1601839226460&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", + "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1606792371412&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", "dev": true, "requires": { @@ -1536,9 +1536,9 @@ "dev": true }, "is-core-module": { - "version": "2.1.0", - "resolved": "https://registry.npm.taobao.org/is-core-module/download/is-core-module-2.1.0.tgz?cache=0&sync_timestamp=1604519290792&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-core-module%2Fdownload%2Fis-core-module-2.1.0.tgz", - "integrity": "sha1-pMwDHZsaymPuy9GKZQ4Ty07quUY=", + "version": "2.2.0", + "resolved": "https://registry.npm.taobao.org/is-core-module/download/is-core-module-2.2.0.tgz?cache=0&sync_timestamp=1606411666495&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-core-module%2Fdownload%2Fis-core-module-2.2.0.tgz", + "integrity": "sha1-lwN+89UiJNhRY/VZeytj2a/tmBo=", "dev": true, "requires": { "has": "^1.0.3" @@ -1576,10 +1576,13 @@ } }, "semver": { - "version": "7.3.2", - "resolved": "https://registry.npm.taobao.org/semver/download/semver-7.3.2.tgz", - "integrity": "sha1-YElisFK4HtB4aq6EOJ/7pw/9OTg=", - "dev": true + "version": "7.3.4", + "resolved": "https://registry.npm.taobao.org/semver/download/semver-7.3.4.tgz?cache=0&sync_timestamp=1606853731020&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-7.3.4.tgz", + "integrity": "sha1-J6qn0uTKdkUvmNOt0JOnLJQ+3Jc=", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } }, "string-width": { "version": "4.2.0", @@ -1619,14 +1622,14 @@ } }, "y18n": { - "version": "4.0.0", - "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=", + "version": "4.0.1", + "resolved": "https://registry.npm.taobao.org/y18n/download/y18n-4.0.1.tgz?cache=0&sync_timestamp=1606778028917&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fy18n%2Fdownload%2Fy18n-4.0.1.tgz", + "integrity": "sha1-jbK4PDHF11CZu4kLI/MJSJHiR9Q=", "dev": true }, "yargs": { "version": "15.4.1", - "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-15.4.1.tgz?cache=0&sync_timestamp=1605465911528&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-15.4.1.tgz", + "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-15.4.1.tgz?cache=0&sync_timestamp=1607207963779&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-15.4.1.tgz", "integrity": "sha1-DYehbeAa7p2L7Cv7909nhRcw9Pg=", "dev": true, "requires": { @@ -2048,9 +2051,9 @@ } }, "@rollup/plugin-babel": { - "version": "5.2.1", - "resolved": "https://registry.npm.taobao.org/@rollup/plugin-babel/download/@rollup/plugin-babel-5.2.1.tgz", - "integrity": "sha1-IPyPiGTcDqocVXhAhFlgaAj3KSQ=", + "version": "5.2.2", + "resolved": "https://registry.npm.taobao.org/@rollup/plugin-babel/download/@rollup/plugin-babel-5.2.2.tgz", + "integrity": "sha1-5WI6Ad2ON+AEuofy3iGMYRcn2bI=", "dev": true, "requires": { "@babel/helper-module-imports": "^7.10.4", @@ -2073,9 +2076,9 @@ "dev": true }, "@babel/types": { - "version": "7.12.6", - "resolved": "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.12.6.tgz?cache=0&sync_timestamp=1604486339981&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Ftypes%2Fdownload%2F%40babel%2Ftypes-7.12.6.tgz", - "integrity": "sha1-rg5V7xzOH7yIHNJvgjTrPmV+3JY=", + "version": "7.12.7", + "resolved": "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.12.7.tgz?cache=0&sync_timestamp=1605904888635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Ftypes%2Fdownload%2F%40babel%2Ftypes-7.12.7.tgz", + "integrity": "sha1-YDn/HiQmQKKUUsmuVyFi7JqPXRM=", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -2108,7 +2111,7 @@ }, "@rollup/plugin-json": { "version": "4.1.0", - "resolved": "https://registry.npm.taobao.org/@rollup/plugin-json/download/@rollup/plugin-json-4.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40rollup%2Fplugin-json%2Fdownload%2F%40rollup%2Fplugin-json-4.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/@rollup/plugin-json/download/@rollup/plugin-json-4.1.0.tgz", "integrity": "sha1-VOCYZ65pY8WThE2L16nHGClElvM=", "dev": true, "requires": { @@ -2117,7 +2120,7 @@ }, "@rollup/plugin-node-resolve": { "version": "7.1.3", - "resolved": "https://registry.npm.taobao.org/@rollup/plugin-node-resolve/download/@rollup/plugin-node-resolve-7.1.3.tgz?cache=0&sync_timestamp=1603765888985&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40rollup%2Fplugin-node-resolve%2Fdownload%2F%40rollup%2Fplugin-node-resolve-7.1.3.tgz", + "resolved": "https://registry.npm.taobao.org/@rollup/plugin-node-resolve/download/@rollup/plugin-node-resolve-7.1.3.tgz?cache=0&sync_timestamp=1606766485874&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40rollup%2Fplugin-node-resolve%2Fdownload%2F%40rollup%2Fplugin-node-resolve-7.1.3.tgz", "integrity": "sha1-gN44Tt+9e/yRARZJEPhgeBUaPso=", "dev": true, "requires": { @@ -2267,7 +2270,7 @@ }, "@types/resolve": { "version": "0.0.8", - "resolved": "https://registry.npm.taobao.org/@types/resolve/download/@types/resolve-0.0.8.tgz?cache=0&sync_timestamp=1596840738717&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fresolve%2Fdownload%2F%40types%2Fresolve-0.0.8.tgz", + "resolved": "https://registry.npm.taobao.org/@types/resolve/download/@types/resolve-0.0.8.tgz", "integrity": "sha1-8mB00jjgJlnjI84aE9BB7uKA4ZQ=", "dev": true, "requires": { @@ -8199,6 +8202,15 @@ "js-tokens": "^3.0.0 || ^4.0.0" } }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz", + "integrity": "sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ=", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "lunr": { "version": "2.3.8", "resolved": "https://registry.npm.taobao.org/lunr/download/lunr-2.3.8.tgz", @@ -8479,9 +8491,9 @@ "optional": true }, "nanoid": { - "version": "3.1.16", - "resolved": "https://registry.npm.taobao.org/nanoid/download/nanoid-3.1.16.tgz?cache=0&sync_timestamp=1603674706627&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnanoid%2Fdownload%2Fnanoid-3.1.16.tgz", - "integrity": "sha1-sh8KfQMRlvr3UxTXxl02NSvu72Q=", + "version": "3.1.20", + "resolved": "https://registry.npm.taobao.org/nanoid/download/nanoid-3.1.20.tgz?cache=0&sync_timestamp=1606833976706&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnanoid%2Fdownload%2Fnanoid-3.1.20.tgz", + "integrity": "sha1-utwmPGsdzxS3HvqoX2q0wdbPx4g=", "dev": true, "optional": true }, @@ -9894,7 +9906,7 @@ }, "rollup": { "version": "2.26.6", - "resolved": "https://registry.npm.taobao.org/rollup/download/rollup-2.26.6.tgz", + "resolved": "https://registry.npm.taobao.org/rollup/download/rollup-2.26.6.tgz?cache=0&sync_timestamp=1607231848363&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frollup%2Fdownload%2Frollup-2.26.6.tgz", "integrity": "sha1-C0YMHaIkxq8SoelIooxROqEfK5M=", "dev": true, "requires": { @@ -9921,7 +9933,7 @@ }, "rollup-plugin-terser": { "version": "5.3.1", - "resolved": "https://registry.npm.taobao.org/rollup-plugin-terser/download/rollup-plugin-terser-5.3.1.tgz?cache=0&sync_timestamp=1599267952414&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frollup-plugin-terser%2Fdownload%2Frollup-plugin-terser-5.3.1.tgz", + "resolved": "https://registry.npm.taobao.org/rollup-plugin-terser/download/rollup-plugin-terser-5.3.1.tgz?cache=0&sync_timestamp=1600350654805&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frollup-plugin-terser%2Fdownload%2Frollup-plugin-terser-5.3.1.tgz", "integrity": "sha1-jGUAYsIqhCbGQmhUiVdGO/mBtBM=", "dev": true, "requires": { @@ -9954,7 +9966,7 @@ }, "ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1601839226460&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", + "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1606792371412&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", "dev": true, "optional": true, @@ -10055,15 +10067,15 @@ }, "y18n": { "version": "5.0.5", - "resolved": "https://registry.npm.taobao.org/y18n/download/y18n-5.0.5.tgz?cache=0&sync_timestamp=1603639294538&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fy18n%2Fdownload%2Fy18n-5.0.5.tgz", + "resolved": "https://registry.npm.taobao.org/y18n/download/y18n-5.0.5.tgz?cache=0&sync_timestamp=1606778028917&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fy18n%2Fdownload%2Fy18n-5.0.5.tgz", "integrity": "sha1-h2nsCNA7HqLfJQCs71YXQ7u5qxg=", "dev": true, "optional": true }, "yargs": { - "version": "16.1.1", - "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-16.1.1.tgz?cache=0&sync_timestamp=1605465911528&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-16.1.1.tgz", - "integrity": "sha1-WkoJW9HKgGsKUNDANhHTgDTSGaE=", + "version": "16.2.0", + "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-16.2.0.tgz?cache=0&sync_timestamp=1607207963779&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-16.2.0.tgz", + "integrity": "sha1-HIK/D2tqZur85+8w43b0mhJHf2Y=", "dev": true, "optional": true, "requires": { @@ -10909,7 +10921,7 @@ }, "terser": { "version": "4.8.0", - "resolved": "https://registry.npm.taobao.org/terser/download/terser-4.8.0.tgz?cache=0&sync_timestamp=1603374108186&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser%2Fdownload%2Fterser-4.8.0.tgz", + "resolved": "https://registry.npm.taobao.org/terser/download/terser-4.8.0.tgz?cache=0&sync_timestamp=1606494026148&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser%2Fdownload%2Fterser-4.8.0.tgz", "integrity": "sha1-YwVjQ9fHC7KfOvZlhlpG/gOg3xc=", "dev": true, "requires": { @@ -12299,6 +12311,12 @@ "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", "dev": true }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-4.0.0.tgz", + "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI=", + "dev": true + }, "yargs": { "version": "12.0.5", "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-12.0.5.tgz?cache=0&sync_timestamp=1583129847322&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-12.0.5.tgz", diff --git a/package.json b/package.json index fcca709b42..fdacfeae51 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@babel/core": "^7.9.0", "@babel/preset-env": "7.8.7", "@cocos/babel-preset-cc": "2.2.0", - "@cocos/build-engine": "4.0.1", + "@cocos/build-engine": "4.0.3", "@cocos/typedoc-plugin-internal-external": "^1.0.1", "@cocos/typedoc-plugin-localization": "^1.0.0", "@types/fs-extra": "^5.0.4", diff --git a/scripts/build-engine/package-lock.json b/scripts/build-engine/package-lock.json index 34822297cc..da68cb95d7 100644 --- a/scripts/build-engine/package-lock.json +++ b/scripts/build-engine/package-lock.json @@ -1,6 +1,6 @@ { "name": "@cocos/build-engine", - "version": "4.0.1-wechat-wasm", + "version": "4.0.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/scripts/build-engine/package.json b/scripts/build-engine/package.json index 6f04eeca5a..9f329582a3 100644 --- a/scripts/build-engine/package.json +++ b/scripts/build-engine/package.json @@ -1,6 +1,6 @@ { "name": "@cocos/build-engine", - "version": "4.0.1-wechat-wasm", + "version": "4.0.3", "description": "", "repository": { "type": "git", diff --git a/scripts/build-engine/src/index.ts b/scripts/build-engine/src/index.ts index 40a8f5cf97..8779b616de 100644 --- a/scripts/build-engine/src/index.ts +++ b/scripts/build-engine/src/index.ts @@ -320,15 +320,25 @@ async function _doBuild ({ }; const moduleRedirects: Record = {}; + const addModuleOverrides = (moduleOverrides: Record) => { + for (const [source, override] of Object.entries(moduleOverrides)) { + const normalizedSource = makePathEqualityKey(ps.resolve(engineRoot, source)); + const normalizedOverride = ps.resolve(engineRoot, override); + moduleRedirects[normalizedSource] = normalizedOverride; + } + }; + + if (options.buildTimeConstants.BUILD) { + addModuleOverrides({ + 'cocos/core/data/deserialize-dynamic.ts': 'cocos/core/data/deserialize-dynamic-empty.ts', + }); + } + const platformConstant = getPlatformConstantNames().find((name) => options.buildTimeConstants[name] === true); if (platformConstant) { const moduleOverrides = ccConfig.platforms?.[platformConstant]?.moduleOverrides; if (moduleOverrides) { - for (const [source, override] of Object.entries(moduleOverrides)) { - const normalizedSource = makePathEqualityKey(ps.resolve(engineRoot, source)); - const normalizedOverride = ps.resolve(engineRoot, override); - moduleRedirects[normalizedSource] = normalizedOverride; - } + addModuleOverrides(moduleOverrides); } } diff --git a/scripts/build-engine/src/remove-deprecated-features.ts b/scripts/build-engine/src/remove-deprecated-features.ts index 4f091b6cb0..762b139d3b 100644 --- a/scripts/build-engine/src/remove-deprecated-features.ts +++ b/scripts/build-engine/src/remove-deprecated-features.ts @@ -7,7 +7,7 @@ export default function removeDeprecatedFeatures (range?: string): rollup.Plugin return { name: '@cocos/build-engine | remove-deprecated-features', - load: function (this, id: string) { + load (this, id: string) { if (!ps.isAbsolute(id)) { return null; } @@ -25,7 +25,7 @@ export default function removeDeprecatedFeatures (range?: string): rollup.Plugin console.debug(`${id} looks like a deprecated module, but it contains an invalid version.`); return null; } - + if (versionRange && !semver.satisfies(parsedVersion, versionRange)) { return null; }