Skip to content

Commit e4b0732

Browse files
committed
Merge remote-tracking branch 'origin' into cesium.com
2 parents 2154f17 + fbf894e commit e4b0732

3,113 files changed

Lines changed: 30521 additions & 396368 deletions

File tree

Some content is hidden

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

.github/pull_request_template.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ To ensure your Pull Request is reviewed and accepted quickly, please refer to ou
2525

2626
<!-- Describe in detail how you tested your changes. If this fixes a bug, list the steps to reproduce the original issue. -->
2727

28-
<!-- markdownlint-disable-next-line MD025 -->
29-
30-
# Author checklist
28+
## Author checklist
3129

3230
- [ ] I have submitted a Contributor License Agreement
3331
- [ ] I have added my name to `CONTRIBUTORS.md`

.github/workflows/dev.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ jobs:
2828
run: npm run build
2929
- name: tsc
3030
run: npm run tsc
31+
- name: sg test
32+
run: npm exec --package=@ast-grep/cli --offline -- sg test
33+
- name: sg scan
34+
run: npm exec --package=@ast-grep/cli --offline -- sg scan --context 3
3135
coverage:
3236
runs-on: ubuntu-latest
3337
env:
@@ -116,18 +120,21 @@ jobs:
116120
--exclude "node_modules/*" \
117121
--exclude "scripts/*" \
118122
--exclude "Tools/*" \
119-
--delete
123+
--delete
120124
- name: set status
121125
if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
122126
run: npm run deploy-status -- --status success --message Deployed
123-
node-20:
127+
node-smoke-test:
124128
runs-on: ubuntu-latest
129+
strategy:
130+
matrix:
131+
version: [22, 24]
125132
steps:
126133
- uses: actions/checkout@v6
127-
- name: install node 20
134+
- name: install node ${{ matrix.version }}
128135
uses: actions/setup-node@v6
129136
with:
130-
node-version: '20'
137+
node-version: ${{ matrix.version }}
131138
- name: npm install
132139
run: npm install
133140
- name: release build

.github/workflows/prod.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ jobs:
3434
run: npm run build
3535
- name: tsc
3636
run: npm run tsc
37+
- name: sg test
38+
run: npm exec --package=@ast-grep/cli --offline -- sg test
39+
- name: sg scan
40+
run: npm exec --package=@ast-grep/cli --offline -- sg scan --context 3
3741

3842
deploy-archive:
3943
runs-on: ubuntu-latest

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ Thumbs.db
1010

1111
/Apps/CesiumViewer/Gallery/gallery-index.js
1212

13-
/Apps/Sandcastle/jsHintOptions.js
14-
/Apps/Sandcastle/gallery/gallery-index.js
15-
/Apps/Sandcastle/templates/bucket.css
1613
/Apps/Sandcastle2
1714

1815
/Source/Assets/

.markdownlintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/node_modules
22
packages/sandcastle/node_modules
3-
/ThirdParty
3+
**/ThirdParty
44
/Tools/**
55

66
LICENSE.md

.npmignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
/server.js
3333
/Source/copyrightHeader.js
3434
/Specs
35-
/ThirdParty
3635
/Tools
3736
/web.config
3837

.prettierignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ Apps/Sandcastle2/**
3939

4040
Specs/jasmine/**
4141

42-
Apps/Sandcastle/ThirdParty
4342
Tools/jsdoc/cesium_template/static/javascript/prism.js
4443
Tools/jsdoc/cesium_template/static/styles/prism.css
4544
**/LICENSE.md

.vscode/cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"Eigen",
6060
"emscripten",
6161
"EPSG",
62+
"equirectangular",
6263
"fxaa",
6364
"gdal",
6465
"glsl",

Apps/SampleData/TwoSats.czml

Lines changed: 1259 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)