Merge v3.5.0 (#10097)

* Update bindings.yml (#10074)

调整fork仓库

* [Optimize] Merge native workflow (#10091)

Co-authored-by: Sijie <devhacker520@hotmail.com>

Co-authored-by: shaoqiangcai <79490184+shaoqiangcai@users.noreply.github.com>
Co-authored-by: Sijie <devhacker520@hotmail.com>
This commit is contained in:
SijieWang
2022-02-14 14:44:17 +08:00
committed by GitHub
parent 66ac1230e8
commit 15165e064b
2 changed files with 185 additions and 14 deletions
+175 -13
View File
@@ -1772,7 +1772,7 @@
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-visualizer": "^4.2.0",
"semver": "^7.3.2",
"tfig": "^3.2.4",
"tfig": "^3.2.2",
"typescript": "^4.3.5",
"yargs": "^15.1.0"
},
@@ -1905,9 +1905,8 @@
"integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
"dev": true,
"requires": {
"is-core-module": "^2.8.0",
"path-parse": "^1.0.7",
"supports-preserve-symlinks-flag": "^1.0.0"
"is-core-module": "^2.2.0",
"path-parse": "^1.0.6"
}
},
"semver": {
@@ -4473,6 +4472,12 @@
"node-int64": "^0.4.0"
}
},
"buffer-crc32": {
"version": "0.2.13",
"resolved": "https://registry.npmmirror.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
"integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
"dev": true
},
"buffer-equal": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/buffer-equal/download/buffer-equal-1.0.0.tgz",
@@ -4896,6 +4901,17 @@
"semver": "^5.5.0",
"shebang-command": "^1.2.0",
"which": "^1.2.9"
},
"dependencies": {
"which": {
"version": "1.3.1",
"resolved": "https://registry.npmmirror.com/which/-/which-1.3.1.tgz",
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
"dev": true,
"requires": {
"isexe": "^2.0.0"
}
}
}
},
"cssom": {
@@ -7343,6 +7359,36 @@
}
}
},
"ftp": {
"version": "0.3.10",
"resolved": "https://registry.npmmirror.com/ftp/-/ftp-0.3.10.tgz",
"integrity": "sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ==",
"dev": true,
"requires": {
"readable-stream": "1.1.x",
"xregexp": "2.0.0"
},
"dependencies": {
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmmirror.com/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
"dev": true
},
"readable-stream": {
"version": "1.1.14",
"resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-1.1.14.tgz",
"integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.1",
"isarray": "0.0.1",
"string_decoder": "~0.10.x"
}
}
}
},
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.nlark.com/function-bind/download/function-bind-1.1.1.tgz",
@@ -7517,6 +7563,17 @@
"ini": "^1.3.4",
"is-windows": "^1.0.1",
"which": "^1.2.14"
},
"dependencies": {
"which": {
"version": "1.3.1",
"resolved": "https://registry.npmmirror.com/which/-/which-1.3.1.tgz",
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
"dev": true,
"requires": {
"isexe": "^2.0.0"
}
}
}
},
"globals": {
@@ -7671,6 +7728,49 @@
}
}
},
"gulp-sequence": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/gulp-sequence/-/gulp-sequence-1.0.0.tgz",
"integrity": "sha512-c+p+EcyBl1UCpbfFA/vUD6MuC7uxoY6Y4g2lq9lLtzOHh9o1wijAQ4o0TIRQ14C7cG6zR6Zi+bpA0cW78CFt6g==",
"dev": true,
"requires": {
"thunks": "^4.9.0"
}
},
"gulp-zip": {
"version": "5.1.0",
"resolved": "https://registry.npmmirror.com/gulp-zip/-/gulp-zip-5.1.0.tgz",
"integrity": "sha512-XZr/y91IliK/SpR74g3TkZejGkGEmK7CSDjSghT1jXshgO+dFvpLIz9w9fpuwkew6i7k4F+G24TubNgq1ISzEw==",
"dev": true,
"requires": {
"get-stream": "^5.2.0",
"plugin-error": "^1.0.1",
"through2": "^3.0.1",
"vinyl": "^2.1.0",
"yazl": "^2.5.1"
},
"dependencies": {
"get-stream": {
"version": "5.2.0",
"resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-5.2.0.tgz",
"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
"dev": true,
"requires": {
"pump": "^3.0.0"
}
},
"through2": {
"version": "3.0.2",
"resolved": "https://registry.npmmirror.com/through2/-/through2-3.0.2.tgz",
"integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
"dev": true,
"requires": {
"inherits": "^2.0.4",
"readable-stream": "2 || 3"
}
}
}
},
"gulplog": {
"version": "1.0.0",
"resolved": "https://registry.nlark.com/gulplog/download/gulplog-1.0.0.tgz",
@@ -13177,6 +13277,18 @@
}
}
},
"plugin-error": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/plugin-error/-/plugin-error-1.0.1.tgz",
"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
"dev": true,
"requires": {
"ansi-colors": "^1.0.1",
"arr-diff": "^4.0.0",
"arr-union": "^3.1.0",
"extend-shallow": "^3.0.2"
}
},
"pngjs": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-6.0.0.tgz",
@@ -14660,6 +14772,12 @@
}
}
},
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
"dev": true
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz",
@@ -14732,12 +14850,6 @@
}
}
},
"supports-preserve-symlinks-flag": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/download/supports-preserve-symlinks-flag-1.0.0.tgz",
"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
"dev": true
},
"sver-compat": {
"version": "1.5.0",
"resolved": "https://registry.npm.taobao.org/sver-compat/download/sver-compat-1.5.0.tgz",
@@ -15035,12 +15147,27 @@
"xtend": "~4.0.0"
}
},
"thunks": {
"version": "4.9.6",
"resolved": "https://registry.npmmirror.com/thunks/-/thunks-4.9.6.tgz",
"integrity": "sha512-ulXG17ZokTO8j0rTx/23YHsBuz6KAK1xdBPLH4zB1FRDUkttCQeli3DxGhhYtrrsRwzacSG+ZIebjSgLseluMw==",
"dev": true
},
"time-stamp": {
"version": "1.1.0",
"resolved": "https://registry.nlark.com/time-stamp/download/time-stamp-1.1.0.tgz",
"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
"dev": true
},
"tmp": {
"version": "0.2.1",
"resolved": "https://registry.npmmirror.com/tmp/-/tmp-0.2.1.tgz",
"integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
"dev": true,
"requires": {
"rimraf": "^3.0.0"
}
},
"tmpl": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@@ -15134,6 +15261,12 @@
"punycode": "^2.1.1"
}
},
"tree-kill": {
"version": "1.2.2",
"resolved": "https://registry.npmmirror.com/tree-kill/-/tree-kill-1.2.2.tgz",
"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
"dev": true
},
"ts-jest": {
"version": "26.5.4",
"resolved": "https://registry.npm.taobao.org/ts-jest/download/ts-jest-26.5.4.tgz",
@@ -15697,6 +15830,20 @@
"extsprintf": "^1.2.0"
}
},
"vinyl": {
"version": "2.2.1",
"resolved": "https://registry.npmmirror.com/vinyl/-/vinyl-2.2.1.tgz",
"integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
"dev": true,
"requires": {
"clone": "^2.1.1",
"clone-buffer": "^1.0.0",
"clone-stats": "^1.0.0",
"cloneable-readable": "^1.0.0",
"remove-trailing-separator": "^1.0.1",
"replace-ext": "^1.0.0"
}
},
"vinyl-fs": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
@@ -15829,9 +15976,9 @@
}
},
"which": {
"version": "1.3.1",
"resolved": "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz?cache=0&sync_timestamp=1574116720213&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwhich%2Fdownload%2Fwhich-1.3.1.tgz",
"integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=",
"version": "2.0.2",
"resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"requires": {
"isexe": "^2.0.0"
@@ -15914,6 +16061,12 @@
"integrity": "sha1-Bg/hvLf5x2/ioX24apvDq4lCEMs=",
"dev": true
},
"xregexp": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/xregexp/-/xregexp-2.0.0.tgz",
"integrity": "sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==",
"dev": true
},
"xtend": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -16082,6 +16235,15 @@
"camelcase": "^5.0.0",
"decamelize": "^1.2.0"
}
},
"yazl": {
"version": "2.5.1",
"resolved": "https://registry.npmmirror.com/yazl/-/yazl-2.5.1.tgz",
"integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
"dev": true,
"requires": {
"buffer-crc32": "~0.2.3"
}
}
}
}
+10 -1
View File
@@ -20,6 +20,7 @@
"checkout-engine-version": "node ./scripts/checkout-engine-version.js",
"varify-engine-version": "node ./scripts/varify-engine-version.js",
"fetch-ral": "node ./scripts/fetch-ral.js",
"clear-platform": "node ./native/utils/clear-platform.js",
"test": "gulp test"
},
"repository": {
@@ -38,7 +39,9 @@
"@types/yargs": "^12.0.14",
"@typescript-eslint/eslint-plugin": "^4.29.3",
"@typescript-eslint/parser": "^4.29.3",
"async": "^2.6.1",
"child_process": "^1.0.2",
"chalk": "^2.4.1",
"commander": "^2.20.3",
"dat.gui": "^0.7.5",
"del": "^6.0.0",
@@ -47,6 +50,7 @@
"eslint-plugin-import": "^2.24.1",
"fs": "^0.0.1-security",
"fs-extra": "^7.0.1",
"ftp": "0.3.10",
"gulp": "^4.0.2",
"http-server": "^0.12.3",
"jest": "^26.6.3",
@@ -56,12 +60,17 @@
"pngjs": "^6.0.0",
"spectorjs": "^0.9.15",
"stats.js": "^0.17.0",
"tmp": "^0.2.1",
"tree-kill": "^1.2.0",
"ts-jest": "^26.5.4",
"typedoc": "^0.17.7",
"typedoc-plugin-external-module-name": "^4.0.3",
"typescript": "^4.3.5",
"vconsole": "^3.3.0",
"yargs": "^12.0.5"
"yargs": "^12.0.5",
"gulp-sequence": "^1.0.0",
"gulp-zip": "^5.0.2",
"which": "^2.0.2"
},
"dependencies": {
"@cocos/box2d": "1.0.1",