Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

Commit

Permalink
Merge pull request #8 from CesiumGS/main
Browse files Browse the repository at this point in the history
Updating fork
  • Loading branch information
slchow authored Oct 30, 2021
2 parents 41c5e57 + 09981f0 commit 793da88
Show file tree
Hide file tree
Showing 3,386 changed files with 785,566 additions and 578,324 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
20 changes: 0 additions & 20 deletions .appveyor.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .concierge/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"contributorsPath": "CONTRIBUTORS.md",
"unitTestPath" : "Specs/",
"maxDaysSinceUpdate": 30
"maxDaysSinceUpdate": 90
}
13 changes: 7 additions & 6 deletions .concierge/templates/pullRequestOpened.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{#if askAboutContributors}}
Thank you so much for the pull request @{{ userName }}! I noticed this is your first pull request and I wanted to say welcome to the Cesium community!

The [Pull Request Guidelines](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#pull-request-guidelines) is a handy reference for making sure your PR gets accepted quickly, so make sure to skim that.
The [Pull Request Guidelines](https://github.com/CesiumGS/cesium/blob/main/CONTRIBUTING.md#pull-request-guidelines) is a handy reference for making sure your PR gets accepted quickly, so make sure to skim that.

* :x: Missing `CONTRIBUTORS.md` entry.
* Please add yourself to the [contributors]({{ contributorsUrl }}) file!
Expand All @@ -10,15 +10,17 @@ Thanks for the pull request @{{ userName }}!
{{/if}}
{{#if claEnabled}}
{{#if errorCla}}
* :grey_exclamation: There was an error checking the CLA! If this is your first contribution, please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla).
* :grey_exclamation: There was an error checking the CLA! If this is your first contribution, please send in a [Contributor License Agreement](https://github.com/CesiumGS/cesium/blob/main/CONTRIBUTING.md#contributor-license-agreement-cla).
* Maintainers, this was the error I ran into while attempting to process the CLA check. Please resolve it to continue CLA checking.
* You'll need to [manually check for a submitted CLA](https://github.com/CesiumGS/cesium/blob/main/Documentation/Contributors/CLAs/README.md)
```
{{ errorCla }}
```
{{else}}
{{#if askForCla}}
* :x: Missing CLA.
* Please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) and comment back here to let us know to check this!
* Please send in a [Contributor License Agreement](https://github.com/CesiumGS/cesium/blob/main/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) and comment back here to let us know to check this!
* Maintainers, [here's how to check](https://github.com/CesiumGS/cesium/blob/main/Documentation/Contributors/CLAs/README.md) for a submitted CLA.
{{else}}
* :heavy_check_mark: Signed CLA found.
{{/if}}
Expand All @@ -30,15 +32,14 @@ Thanks for the pull request @{{ userName }}!
{{/if}}
{{#if askAboutThirdParty}}
* :grey_question: Changes to third party files were made.
* Looks like a file in one of our ThirdParty folders (`{{ thirdPartyFolders }}`) has been added or modified. Please verify that it has a section in [LICENSE.md]({{ repository_url }}/blob/master/LICENSE.md) and that its license information is up to date with this new version.
* Looks like a file in one of our ThirdParty folders (`{{ thirdPartyFolders }}`) has been added or modified. Please verify that it has a section in [LICENSE.md]({{ repository_url }}/blob/main/LICENSE.md) and that its license information is up to date with this new version.
{{/if}}
{{#if askAboutTests}}
* :grey_question: Unit tests were not updated.
* Make sure you've [updated tests](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/Documentation/Contributors/TestingGuide) to reflect your changes, added tests for any new code, and ran the code coverage tool.
* Make sure you've [updated tests](https://github.com/CesiumGS/cesium/tree/main/Documentation/Contributors/TestingGuide) to reflect your changes, added tests for any new code, and ran the code coverage tool.
{{/if}}

Reviewers, don't forget to make sure that:

- [ ] Cesium Viewer works.
- [ ] Works in 2D/CV.
- [ ] Works (or fails gracefully) in IE11.
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ root = true

[*]
indent_style = space
indent_size = 4
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false

[package.json]
indent_size = 2
[*.glsl]
indent_size = 4
8 changes: 6 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ Apps/HelloWorld.html
Apps/Sandcastle/ThirdParty/**
Build/**
Documentation/**
Instrumented/**
Source/Scene/GltfPipeline/**
Source/Shaders/**
Source/ThirdParty/**
Source/Workers/cesiumWorkerBootstrapper.js
Source/Workers/**
!Source/Workers/transferTypedArrayTest.js
ThirdParty/**
Tools/**
Apps/Sandcastle/jsHintOptions.js
Apps/Sandcastle/gallery/gallery-index.js
Source/Core/buildModuleUrl.js
Specs/spec-main.js
index.release.html
14 changes: 9 additions & 5 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{
"extends": "./Tools/eslint-config-cesium/browser.js",
"plugins": [
"html"
"extends": [
"./Tools/eslint-config-cesium/node.js",
"prettier"
],
"rules": {
"no-unused-vars": ["error", {"vars": "all", "args": "none"}]
"env": {
"node": true,
"es6": true
},
"parserOptions": {
"ecmaVersion": 2019
}
}
18 changes: 9 additions & 9 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ about: Let us know so we can fix it!
---

<!--
Thanks for helping us improve Cesium! Please describe what the expected behavior is vs what actually happens.
Thanks for helping us improve Cesium! Please describe what the expected behavior is vs what actually happens.
Creating a Sandcastle example (https://cesiumjs.org/Cesium/Build/Apps/Sandcastle/) that reproduces the issue helps us a lot in tracking down bugs. Paste the link you get from the "Share" button in Sandcastle below.
-->
Creating a Sandcastle example (https://sandcastle.cesium.com) that reproduces the issue helps us a lot in tracking down bugs. Paste the link you get from the "Share" button in Sandcastle below.
-->

Sandcastle example:
Sandcastle example:

Browser:

Operating System:

<!--
<!--
If you can also contribute a fix, we'd absolutely appreciate it! Fixing a bug in Cesium often means fixing a bug for thousands of applications and millions of end users.
If you can also contribute a fix, we'd absolutely appreciate it! Fixing a bug in Cesium often means fixing a bug for thousands of applications and millions of end users.
Check out the contributor guide to get started:
Check out the contributor guide to get started:
https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md
https://github.com/CesiumGS/cesium/blob/main/CONTRIBUTING.md
Just let us know you're working on it and we'd be happy to provide advice and feedback.
-->
-->
12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Request a feature
about: New ideas & improvements to Cesium are always welcome.
---

<!--
Thanks for helping make Cesium better!
<!--
Thanks for helping make Cesium better!
When suggesting an idea, give examples of the intended use case. Features that benefit the wider community are more likely to be prioritized.
When suggesting an idea, give examples of the intended use case. Features that benefit the wider community are more likely to be prioritized.
The best way to get your ideas into Cesium is to help us! We love contributions and are always happy to be provide feedback and advice. Check out the contributor guide to get started:
The best way to get your ideas into Cesium is to help us! We love contributions and are always happy to be provide feedback and advice. Check out the contributor guide to get started:
https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md
-->
https://github.com/CesiumGS/cesium/blob/main/CONTRIBUTING.md
-->
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Ask a question
about: Please use the forum (https://groups.google.com/forum/#!forum/cesium-dev) for general questions about using Cesium.
about: Please use the community forum (https://community.cesium.com/) for general questions about using Cesium.
---

:exclamation: Please use the [forum](https://groups.google.com/forum/#!forum/cesium-dev) for asking questions about how to use Cesium and best practices. The core Cesium team actively monitors the forum and we love seeing what people are working on! :exclamation:
:exclamation: Please use the [community forum](https://community.cesium.com/) for asking questions about how to use Cesium and best practices. The core Cesium team actively monitors the forum and we love seeing what people are working on! :exclamation:
42 changes: 36 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/.metadata
/Build
/Instrumented
/Cesium-*.zip
/cesium-*.tgz
.directory
.DS_Store
Thumbs.db
.eslintcache
Expand All @@ -14,19 +14,49 @@ Thumbs.db
/Apps/Sandcastle/templates/bucket.css

/Source/Cesium.js

/Source/Shaders/*.js
/Source/Shaders/*/*.js
/Source/Shaders/*/*/*.js
/Source/ThirdParty/Shaders/*.js
/Source/Cesium.d.ts

/Specs/SpecList.js
/Source/Shaders/**/*.js
/Source/ThirdParty/Shaders/**/*.js
/Source/Workers/**
!/Source/Workers/cesiumWorkerBootstrapper.js
!/Source/Workers/transferTypedArrayTest.js

Source/ThirdParty/_commonjsHelpers*
Source/ThirdParty/Autolinker.js
Source/ThirdParty/bitmap-sdf.js
Source/ThirdParty/dompurify.js
Source/ThirdParty/earcut.js
Source/ThirdParty/draco_decoder.wasm
Source/ThirdParty/Workers/draco_decoder_nodejs.js
Source/ThirdParty/grapheme-splitter.js
Source/ThirdParty/jsep.js
Source/ThirdParty/kdbush.js
Source/ThirdParty/ktx-parse.js
Source/ThirdParty/lerc.js
Source/ThirdParty/mersenne-twister.js
Source/ThirdParty/meshoptimizer.js
Source/ThirdParty/nosleep.js
Source/ThirdParty/pako.js
Source/ThirdParty/protobufjs.js
Source/ThirdParty/rbush.js
Source/ThirdParty/topojson.js
Source/ThirdParty/Tween.js
Source/ThirdParty/Uri.js
Source/ThirdParty/when.js
Source/ThirdParty/zip.js
Source/ThirdParty/Workers/pako_inflate.min.js
Source/ThirdParty/Workers/pako_deflate.min.js
Source/ThirdParty/Workers/z-worker-pako.js

/node_modules
npm-debug.log
npm-debug.log.*
package-lock.json
yarn.lock

# WebStorm user-specific
.idea/workspace.xml
.idea/tasks.xml
.idea/shelf
5 changes: 5 additions & 0 deletions .gulp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"flags": {
"gulpfile": "gulpfile.cjs"
}
}
10 changes: 5 additions & 5 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
/.travis.yml
/.vscode
/Apps
/Build/Apps
/Build/Coverage
/Build/minifyShaders.state
/Build/Stubs
/Build/Documentation
/Build/Specs
/Cesium-*.zip
/Documentation
/favicon.ico
/gulpfile.js
/gulpfile.cjs
/index.html
/index.release.html
/Instrumented
/launches
/server.js
/server.cjs
/Source/copyrightHeader.js
/Source/main.js
/Specs
/ThirdParty
/Tools
Expand Down
32 changes: 32 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@

# Ignore everything
*

# Unignore directories (to all depths) and unignore code and style files in these directories
!.concierge/**/
!.github/**/
!.vscode/**/
!Apps/**/
!Documentation/**/
!Source/**/
!Specs/**/
!Tools/**/

!**/*.js
!**/*.cjs
!**/*.css
!**/*.html
!**/*.md
!**/*.ts

# Re-ignore a few things caught above
**/*.min.js
Source/Cesium.js
Source/Scene/GltfPipeline/**
Source/Shaders/**/*.js
Source/ThirdParty/**
Source/Workers/**/*
Apps/Sandcastle/ThirdParty

!Source/Workers/cesiumWorkerBootstrapper.js
!Source/Workers/transferTypedArrayTest.js
27 changes: 13 additions & 14 deletions .slackbot.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# List of Slack usernames (not GitHub) for the Cesium Concierge Slackbot to send release reminders for.
releaseSchedule:
ggetz: 2/1/2019
hpinkos: 3/1/2019
lilleyse: 4/1/2019
tfili: 5/1/2019
dbagnell: 6/3/2019
tfili: 7/1/2019
tfili: 8/1/2019

greetings:
- Happy Friday everyone!
- Can you believe Friday is already here?
- I hope you all had awesome week!
- I skipped breakfast, so I hope Gary baked something good today...
- Good morning everyone!
- gary, 1/4/2021
- ian, 2/1/2021
- kevin, 3/1/2021
- hpinkos, 4/1/2021
- mamato, 5/3/2021
- sam.vargas, 6/1/2021
- eli, 7/1/2021
- sam, 8/2/2021
- peter, 9/1/2021
- sean, 10/1/2021
- sam.suhag, 11/1/2021
- eli, 12/1/2021
21 changes: 9 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
language: node_js
node_js:
- "8"
sudo: false
- "16"
addons:
chrome: stable
firefox: latest
services:
- xvfb
before_script:
- export DISPLAY=:99.0
script:
- npm --silent run deploy-set-version -- --buildVersion $TRAVIS_BRANCH.$TRAVIS_BUILD_NUMBER
- npm --silent run deploy-status -- --status pending --message 'Waiting for build'

- npm --silent run eslint
- npm --silent run prettier-check

- npm --silent run build
- npm --silent run test -- --browsers FirefoxHeadless --webgl-stub --failTaskOnError --suppressPassed
- npm --silent run build-ts
- npm --silent run coverage -- --browsers FirefoxHeadless --webgl-stub --failTaskOnError --suppressPassed

- npm --silent run clean
- travis_wait 20 npm --silent run makeZipFile -- --concurrency 1
- npm pack &> /dev/null

Expand All @@ -27,11 +23,12 @@ script:
- npm --silent run deploy-s3 -- -b cesium-dev -d cesium/$TRAVIS_BRANCH --confirm -c 'no-cache'
- npm --silent run deploy-status -- --status success --message Deployed

- npm --silent run test -- --browsers FirefoxHeadless --failTaskOnError --webgl-stub --release --suppressPassed
- npm --silent run build-specs
- npm --silent run test -- --browsers ChromeCI --failTaskOnError --webgl-stub --release --suppressPassed

# Various Node.js smoke-screen tests
# Various Node.js smoke-screen tests
- node -e "const Cesium = require('./');"
- NODE_ENV=development node index.js
- NODE_ENV=production node index.js
- NODE_ENV=development node index.cjs
- NODE_ENV=production node index.cjs

- npm --silent run cloc
Loading

0 comments on commit 793da88

Please sign in to comment.