Rebase patch1.70.1

.concierge/templates/pullRequestOpened.hbs

@@ -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/master/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!
@@ -10,15 +10,15 @@ 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/master/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.
     ```
     {{ 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/master/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) and comment back here to let us know to check this!
 {{else}}
 * :heavy_check_mark: Signed CLA found.
 {{/if}}
@@ -34,7 +34,7 @@ Thanks for the pull request @{{ userName }}!
 {{/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/master/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:

.editorconfig

@@ -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

.eslintrc.json

@@ -1,5 +1,5 @@
 {
-    "extends": "./Tools/eslint-config-cesium/browser.js",
+    "extends": ["./Tools/eslint-config-cesium/browser.js", "prettier"],
     "plugins": [
         "html"
     ],
@@ -9,8 +9,8 @@
     "overrides": [
         {
             "files": [
-                "index.js",
-                "server.js",
+                "index.cjs",
+                "server.cjs",
                 "gulpfile.js",
                 "Source/Workers/transferTypedArrayTest.js"
             ],

.github/ISSUE_TEMPLATE/bug_report.md

@@ -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.
---> 
+-->
 
-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/master/CONTRIBUTING.md
 
 Just let us know you're working on it and we'd be happy to provide advice and feedback.
 
--->
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -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/master/CONTRIBUTING.md
+-->

.github/ISSUE_TEMPLATE/question.md

@@ -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:

.gitignore

@@ -2,6 +2,7 @@
 /Build
 /Cesium-*.zip
 /cesium-*.tgz
+.directory
 .DS_Store
 Thumbs.db
 .eslintcache
@@ -13,6 +14,7 @@ Thumbs.db
 /Apps/Sandcastle/templates/bucket.css
 
 /Source/Cesium.js
+/Source/Cesium.d.ts
 
 /Specs/SpecList.js
 /Source/Shaders/**/*.js
@@ -33,4 +35,4 @@ yarn.lock
 
 # Codeship
 deployment/secrets
-deployment/*.aes
+deployment/*.aes

.gulp.json

@@ -0,0 +1,5 @@
+{
+    "flags": {
+        "gulpfile": "gulpfile.cjs"
+    }
+}

.npmignore

@@ -23,12 +23,11 @@
 /index.html
 /index.release.html
 /launches
-/server.js
+/server.cjs
 /Source/copyrightHeader.js
 /Specs
 /ThirdParty
 /Tools
 /web.config
 /deployment
-
 Thumbs.db

.npmrc

@@ -1 +1 @@
-package-lock=false
+//registry.npmjs.org/:_authToken=${NPM_TOKEN}

.prettierignore

@@ -0,0 +1,31 @@
+
+# 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/Shaders/**/*.js
+Source/ThirdParty/**
+Source/Workers/**/*
+Apps/Sandcastle/ThirdParty
+
+!Source/Workers/cesiumWorkerBootstrapper.js
+!Source/Workers/transferTypedArrayTest.js

.slackbot.yml

@@ -1,15 +1,12 @@
+# List of Slack usernames (not GitHub) for the Cesium Concierge Slackbot to send release reminders for.
 releaseSchedule:
-  OmarShehata: 9/2/2019
-  mramato: 10/1/2019
-  hpinkos: 11/1/2019
-  lilleyse: 12/1/2019
-  kring: 1/6/2020
-  lilleyse: 2/3/2020
-  mramato: 3/2/2020
-
-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!
+  mamato: 3/2/2020
+  oshehata: 4/1/2020
+  lilleyse: 5/1/2020
+  ian: 6/1/2020
+  sam.suhag: 7/1/2020
+  sam.vargas: 8/3/2020
+  kevin: 9/1/2020
+  mamato: 10/1/2020
+  oshehata: 11/2/2020
+  lilleyse: 12/1/2020

.travis.yml

@@ -9,8 +9,10 @@ script:
   - 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 build-ts
   - npm --silent run coverage -- --browsers FirefoxHeadless --webgl-stub --failTaskOnError --suppressPassed
 
   - travis_wait 20 npm --silent run makeZipFile -- --concurrency 1
@@ -24,9 +26,9 @@ script:
   - 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

.vscode/extensions.json

@@ -1,6 +1,7 @@
 {
     "recommendations": [
         "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
         "slevesque.shader",
         "cesium.gltf-vscode"
     ]

.vscode/launch.json

@@ -1,5 +1,5 @@
 {
-    // Use IntelliSense to learn about possible Node.js debug attributes.
+    // Use IntelliSense to learn about possible attributes.
     // Hover to view descriptions of existing attributes.
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
@@ -8,14 +8,10 @@
             "type": "node",
             "request": "launch",
             "name": "Launch Program",
-            "program": "${workspaceRoot}\\server.js",
-            "cwd": "${workspaceRoot}"
-        },
-        {
-            "type": "node",
-            "request": "attach",
-            "name": "Attach to Process",
-            "port": 5858
+            "cwd": "${workspaceFolder}",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": ["run-script", "start"],
+            "noDebug": true
         }
     ]
-}
+}

.vscode/settings.json

@@ -19,11 +19,6 @@
     "files.associations": {
         "*.czml": "json"
     },
-    "files.trimTrailingWhitespace": true,
-    "files.insertFinalNewline": true,
-    "editor.insertSpaces": true,
-    "editor.tabSize": 4,
-    "editor.detectIndentation": false,
     "eslint.enable": true,
     "javascript.format.insertSpaceAfterCommaDelimiter": true,
     "javascript.format.insertSpaceAfterSemicolonInForStatements": true,
@@ -34,5 +29,5 @@
     "javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
     "javascript.format.placeOpenBraceOnNewLineForFunctions": false,
     "javascript.format.placeOpenBraceOnNewLineForControlBlocks": false,
-    "editor.formatOnSave": false
+    "glTF.defaultV2Engine": "Cesium"
 }

Apps/.jshintrc

@@ -21,7 +21,6 @@
   "boss": false,
   "debug": false,
   "eqnull": false,
-  "esnext": false,
   "moz": false,
   "evil": false,
   "expr": false,