Skip to content

Commit 9de37b0

Browse files
pandamicropandamicro
authored
Merge pull request #192 from cocos-creator/v3.3
Merge v3.3
2 parents c4308cd + a9e3714 commit 9de37b0

File tree

763 files changed

+51340
-37337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

763 files changed

+51340
-37337
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,5 @@ quick_gen_project_*_autogen.sh.meta
6666
#//////////////////////////
6767

6868
.vscode/
69+
70+
npm-case/assets/Scripts/AutoGen/

‎npm-case/Tools/auto-gen-scripts.js

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
const fs = require('fs-extra');
2+
const ps = require('path');
3+
for (let i = 0; i < 1000; ++i) {
4+
const code = `
5+
import { _decorator, Component, Node } from 'cc';
6+
const { ccclass, property } = _decorator;
7+
@ccclass('AutoGenMod${i}')
8+
export class AutoGenMod${i} extends Component { }
9+
`;
10+
const file = ps.join(__dirname, '..', 'assets', 'Scripts', 'AutoGen', `Mod-${i}.ts`);
11+
fs.outputFileSync(file, code, { encoding: 'utf8' });
12+
}

‎npm-case/assets/Scripts/Bar.ts

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { warn } from "cc";
2+
3+
export function bar () {
4+
warn(`I'm Bar`);
5+
}

‎npm-case/assets/Scripts/Bar.ts.meta

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"ver": "4.0.22",
3+
"importer": "typescript",
4+
"imported": true,
5+
"uuid": "760a05cd-c96d-40c3-8375-68103b6fbb39",
6+
"files": [],
7+
"subMetas": {},
8+
"userData": {}
9+
}

‎npm-case/assets/Scripts/BarMapped.ts

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { warn } from "cc";
2+
3+
export function bar () {
4+
warn(`I'm BarMapped`);
5+
}

‎npm-case/assets/Scripts/BarMapped.ts.meta

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"ver": "4.0.22",
3+
"importer": "typescript",
4+
"imported": true,
5+
"uuid": "9606981d-5d27-4be5-a24c-7159920e0f21",
6+
"files": [],
7+
"subMetas": {},
8+
"userData": {}
9+
}

‎npm-case/assets/Scripts/Foo.ts

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { warn } from "cc";
2+
3+
export function foo () {
4+
warn(`I'm Foo`);
5+
}

‎npm-case/assets/Scripts/Foo.ts.meta

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"ver": "4.0.22",
3+
"importer": "typescript",
4+
"imported": true,
5+
"uuid": "e0d8ac4c-114e-439d-98b0-9a81ca3ca516",
6+
"files": [],
7+
"subMetas": {},
8+
"userData": {}
9+
}

‎npm-case/assets/Scripts/Test.ts

+4
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ chai.expect(typeof protobufTsRuntime.base64decode).to.equal('function');
3636
import jsZip from 'jszip/dist/jszip.min.js';
3737
chai.expect(jsZip.version).to.equal('3.5.0');
3838

39+
// Another Node.js package
40+
import colyseus from 'colyseus.js';
41+
chai.expect(typeof colyseus.Protocol).to.equal('object');
42+
3943
// import { hideBin } from 'yargs/helpers'
4044
// chai.expect(typeof hideBin).to.equal('string');
4145

‎npm-case/assets/Scripts/Test.ts.meta

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
2-
"ver": "4.0.21",
2+
"ver": "4.0.22",
33
"importer": "typescript",
44
"imported": true,
55
"uuid": "d236db88-ee84-4660-ad51-91230e5b65b8",
66
"files": [],
77
"subMetas": {},
8-
"userData": {}
8+
"userData": {
9+
"simulateGlobals": []
10+
}
911
}

‎npm-case/assets/Scripts/TestImportMap.ts

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { foo } from 'foo';
2+
import { bar } from './Bar';
3+
4+
foo();
5+
6+
bar();

‎npm-case/assets/Scripts/TestImportMap.ts.meta

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"ver": "4.0.22",
3+
"importer": "typescript",
4+
"imported": true,
5+
"uuid": "281fdfed-4ab9-4e63-8b6d-766a567b5985",
6+
"files": [],
7+
"subMetas": {},
8+
"userData": {}
9+
}

‎npm-case/assets/Scripts/dir/index.ts.meta

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
2-
"ver": "4.0.21",
2+
"ver": "4.0.22",
33
"importer": "typescript",
44
"imported": true,
55
"uuid": "190b2663-6343-4e31-8aad-8b4ce1d21a17",
66
"files": [],
77
"subMetas": {},
8-
"userData": {}
8+
"userData": {
9+
"simulateGlobals": []
10+
}
911
}

‎npm-case/assets/Scripts/single'quote'.ts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
import { log } from 'cc';
3+
4+
log(`I'm..in a module whose name contains single quote(s).`);

‎npm-case/assets/Scripts/single'quote'.ts.meta

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"ver": "4.0.22",
3+
"importer": "typescript",
4+
"imported": true,
5+
"uuid": "bfd86a05-447d-4cd4-8ba3-9b63155de13b",
6+
"files": [],
7+
"subMetas": {},
8+
"userData": {}
9+
}

‎npm-case/import-map.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"imports": {
3+
"foo": "./assets/Scripts/Foo",
4+
"./assets/Scripts/Bar": "./assets/Scripts/BarMapped"
5+
}
6+
}

‎npm-case/package-lock.json

+37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎npm-case/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"dependencies": {
1212
"@protobuf-ts/runtime": "^1.0.12",
1313
"chai": "^4.2.0",
14+
"colyseus.js": "^0.14.12",
1415
"jszip": "^3.5.0",
1516
"protobufjs": "^6.10.2"
1617
},

‎npm-case/settings/v2/packages/engine.json

+114-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,116 @@
11
{
2-
"__version__": "1.0.5"
2+
"__version__": "1.0.5",
3+
"modules": {
4+
"includeModules": [
5+
"base",
6+
"gfx-webgl",
7+
"profiler",
8+
"3d",
9+
"2d",
10+
"ui"
11+
],
12+
"flags": {
13+
"2d": {
14+
"UI_GPU_DRIVEN": false
15+
}
16+
},
17+
"cache": {
18+
"base": {
19+
"_value": true
20+
},
21+
"graphcis": {
22+
"_value": true
23+
},
24+
"gfx-webgl": {
25+
"_value": true
26+
},
27+
"gfx-webgl2": {
28+
"_value": false
29+
},
30+
"3d": {
31+
"_value": true
32+
},
33+
"2d": {
34+
"_value": true,
35+
"flags": {
36+
"UI_GPU_DRIVEN": false
37+
}
38+
},
39+
"ui": {
40+
"_value": true
41+
},
42+
"particle": {
43+
"_value": false
44+
},
45+
"physics": {
46+
"_value": false,
47+
"_option": "physics-ammo"
48+
},
49+
"physics-ammo": {
50+
"_value": false
51+
},
52+
"physics-cannon": {
53+
"_value": false
54+
},
55+
"physics-physx": {
56+
"_value": false
57+
},
58+
"physics-builtin": {
59+
"_value": false
60+
},
61+
"physics-2d": {
62+
"_value": false,
63+
"_option": "physics-2d-box2d"
64+
},
65+
"physics-2d-box2d": {
66+
"_value": false
67+
},
68+
"physics-2d-builtin": {
69+
"_value": false
70+
},
71+
"intersection-2d": {
72+
"_value": false
73+
},
74+
"primitive": {
75+
"_value": false
76+
},
77+
"profiler": {
78+
"_value": true
79+
},
80+
"particle-2d": {
81+
"_value": false
82+
},
83+
"audio": {
84+
"_value": false
85+
},
86+
"video": {
87+
"_value": false
88+
},
89+
"webview": {
90+
"_value": false
91+
},
92+
"tween": {
93+
"_value": false
94+
},
95+
"terrain": {
96+
"_value": false
97+
},
98+
"tiled-map": {
99+
"_value": false
100+
},
101+
"spine": {
102+
"_value": false
103+
},
104+
"dragon-bones": {
105+
"_value": false
106+
},
107+
"marionette": {
108+
"_value": false
109+
}
110+
},
111+
"noDeprecatedFeatures": {
112+
"value": false,
113+
"version": ""
114+
}
115+
}
3116
}

‎npm-case/settings/v2/packages/project.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"__version__": "1.0.1"
2+
"__version__": "1.0.1",
3+
"script": {
4+
"importMap": "project://import-map.json"
5+
}
36
}

‎npm-case/tsconfig.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
"compilerOptions": {
66
"allowSyntheticDefaultImports": true,
7-
"skipLibCheck": true
7+
"skipLibCheck": true,
8+
"paths": {
9+
"foo": ["./assets/Scripts/Foo"]
10+
}
811
}
912
}

‎physics-3d/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ temp/
66
local/
77
build/
88
profiles/
9+
native/
910

1011
#//////////////////////////
1112
# NPM

0 commit comments

Comments
 (0)