All propeller changes in a single commit

types

Author: chris-cooper

.github/dependabot.yml

@@ -0,0 +1,24 @@
+# Dependabot config file. Enables updates for internal packages and schedules checks outside of office hours.
+# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
+
+version: 2
+registries:
+  npm-npmjs: # Define registry for private access
+    type: npm-registry
+    url: https://registry.npmjs.org
+    token: ${{secrets.NPM_TOKEN}}
+
+updates:
+  # Keep npm dependencies up to date
+  - package-ecosystem: "npm"
+    directory: "/"
+    # Allow version updates for dependencies in these registries
+    registries:
+      - npm-npmjs
+    # Check the npm registry for updates on Sunday 7pm UTC / Monday 5am AEST. This should be out of
+    # office hours so as to not block CI but not too long before people wake up, in case the updates
+    # cause issues.
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+      time: "19:00"

.github/workflows/dependabot-auto-merge.yml

@@ -0,0 +1,32 @@
+# Automatically merge dependabot PRs that upgrade to patch or minor versions. Adapted from:
+# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/automating-dependabot-with-github-actions#enable-auto-merge-on-a-pull-request
+name: dependabot-auto-merge
+on: pull_request
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  auto-merge-dependabot-pr:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Get Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.3
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Approve PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+      - name: Auto-merge Dependabot PR
+        if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/production-release-pr.yml

@@ -0,0 +1,23 @@
+# Automatically creates a Product Release PR when anything is committed to main.
+name: production-release-pr
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  create-draft-release-pr:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: auto-create-pr-action
+        uses: PropellerAero/auto-create-pr-action@master
+        env:
+          BRANCH_PREFIX: "main"
+          BASE_BRANCH: "main"
+          PULL_REQUEST_TITLE: "[Production Release]"
+          PULL_REQUEST_DRAFT: "false"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -7,6 +7,7 @@
 .DS_Store
 Thumbs.db
 .eslintcache
+.env
 
 /Apps/CesiumViewer/Gallery/gallery-index.js
 
@@ -27,12 +28,19 @@ Thumbs.db
 /Tools/jsdoc/cesium_template/static/styles/prism.css
 
 /node_modules
+/engine/node_modules/
+/widgets/node_modules/
+/packages/engine/node_modules
+/packages/widgets/node_modules
 npm-debug.log
 npm-debug.log.*
 package-lock.json
-yarn.lock
 
 # WebStorm user-specific
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/shelf
+
+# Codeship
+deployment/secrets
+*.aes

.npmignore

@@ -36,5 +36,5 @@
 /ThirdParty
 /Tools
 /web.config
-
+/deployment
 Thumbs.db

README-PROPELLER.md

@@ -0,0 +1,44 @@
+git add # Updating the Propeller fork of Cesium
+
+"The best way in my eyes is, to rebase because that fetches the latest changes of the upstream branch and replay your work on top of that." - [Stefan Bauer](https://stefanbauer.me/articles/how-to-keep-your-git-fork-up-to-date)
+
+The ideal git history should have all Propeller modifications in a single most recent commit, followed by the full history from upstream CesiumGS.
+
+e.g.
+
+```
+commit c6fc9cb205e387781c5269b95e350f61a8815d08
+Author: Chris Cooper <chris@propelleraero.com>
+Date:   Mon Sep 21 15:19:02 2020 +1000
+
+    All the Propeller mods in a single commit
+
+commit da4ddc58830606d89f762dc7d79b3dfe4103c6d1
+Merge: 9c61508 6c0a0f8
+Author: Kevin Ring <kevin@kotachrome.com>
+Date:   Tue Sep 1 15:47:38 2020 +1000
+
+    Updates for 1.73 release
+
+...
+```
+
+To maintain this going forward, use a `git rebase`.
+
+```
+# Make sure your main branch is up to date
+git checkout main
+git pull
+
+# Fetch the upstream tags
+git fetch upstream --tags
+
+# Interactive rebase to the CesiumGS release tag
+# Squash all propeller commits into a single commit
+git rebase -i 1.74
+
+# Fix all the broken stuff :)
+
+# You've just re-written the history so you'll have to force
+git push origin main --force
+```

Specs/BadGeometry.js

@@ -1,4 +1,4 @@
-import { queryToObject, RuntimeError } from "@cesium/engine";
+import { queryToObject, RuntimeError } from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function BadGeometry() {
   this._workerName = "../../Specs/TestWorkers/createBadGeometry";

Specs/Cesium3DTilesTester.js

@@ -7,7 +7,7 @@ import {
   Cesium3DTileContentFactory,
   Cesium3DTileset,
   TileBoundingSphere,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 import pollToPromise from "./pollToPromise.js";
 

Specs/DomEventSimulator.js

@@ -1,4 +1,4 @@
-import { defaultValue, FeatureDetection } from "@cesium/engine";
+import { defaultValue, FeatureDetection } from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function createMouseEvent(type, options) {
   options = defaultValue(options, defaultValue.EMPTY_OBJECT);

Specs/ImplicitTilingTester.js

@@ -1,4 +1,4 @@
-import { defined, defaultValue } from "@cesium/engine";
+import { defined, defaultValue } from "@propelleraero/cesium-engine"; // PROPELLER HACK
 import concatTypedArrays from "./concatTypedArrays.js";
 import MetadataTester from "./MetadataTester.js";
 

Specs/MetadataTester.js

@@ -9,7 +9,7 @@ import {
   MetadataEnum,
   MetadataTable,
   MetadataType,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function MetadataTester() {}
 

Specs/MockDataSource.js

@@ -1,4 +1,8 @@
-import { Event, EntityCluster, EntityCollection } from "@cesium/engine";
+import {
+  Event,
+  EntityCluster,
+  EntityCollection,
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function MockDataSource() {
   //Values to be fiddled with by the test

Specs/MockImageryProvider.js

@@ -5,7 +5,7 @@ import {
   GeographicTilingScheme,
   Resource,
   RuntimeError,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function MockImageryProvider() {
   this.tilingScheme = new GeographicTilingScheme();

Specs/MockTerrainProvider.js

@@ -7,7 +7,7 @@ import {
   HeightmapTerrainData,
   RuntimeError,
   TerrainProvider,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function MockTerrainProvider() {
   this.tilingScheme = new GeographicTilingScheme();

Specs/TerrainTileProcessor.js

@@ -4,7 +4,7 @@ import {
   GlobeSurfaceTile,
   TerrainState,
   Texture,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function TerrainTileProcessor(
   frameState,

Specs/TypeScript/index.ts

@@ -99,7 +99,8 @@ import {
   WebMapServiceImageryProvider,
   WebMapTileServiceImageryProvider,
   writeTextToCanvas,
-} from "cesium";
+} from "@propelleraero/cesium-engine";
+//PROPELLER HACK
 
 // Verify ImageryProvider instances conform to the expected interface
 let imageryProvider: ImageryProvider;

Specs/ViewportPrimitive.js

@@ -1,4 +1,9 @@
-import { defined, destroyObject, Pass, RenderState } from "@cesium/engine";
+import {
+  defined,
+  destroyObject,
+  Pass,
+  RenderState,
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 const ViewportPrimitive = function (fragmentShader) {
   this._fs = fragmentShader;

Specs/addDefaultMatchers.js

@@ -12,7 +12,7 @@ import {
   ShaderProgram,
   VertexArray,
   Math as CesiumMath,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 import equals from "./equals.js";
 
 function createMissingFunctionMessageFunction(

Specs/createCamera.js

@@ -5,7 +5,7 @@ import {
   GeographicProjection,
   Matrix4,
   Camera,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function MockScene(canvas) {
   canvas = defaultValue(canvas, {

Specs/createCanvas.js

@@ -1,4 +1,4 @@
-import { defaultValue } from "@cesium/engine";
+import { defaultValue } from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 let canvasCount = 0;
 

Specs/createContext.js

@@ -1,4 +1,4 @@
-import { clone, defaultValue, Context } from "@cesium/engine";
+import { clone, defaultValue, Context } from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 import createCanvas from "./createCanvas.js";
 import createFrameState from "./createFrameState.js";

Specs/createDynamicGeometryUpdaterSpecs.js

@@ -5,7 +5,7 @@ import {
   EllipsoidGeometryUpdater,
   PrimitiveCollection,
   Math as CesiumMath,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 import createDynamicProperty from "./createDynamicProperty.js";
 import pollToPromise from "./pollToPromise.js";

Specs/createDynamicProperty.js

@@ -1,4 +1,4 @@
-import { ConstantProperty } from "@cesium/engine";
+import { ConstantProperty } from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function createDynamicProperty(value) {
   const property = new ConstantProperty(value);

Specs/createFrameState.js

@@ -6,7 +6,7 @@ import {
   CreditDisplay,
   FrameState,
   JobScheduler,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function createFrameState(context, camera, frameNumber, time) {
   // Mock frame-state for testing.

Specs/createGeometryUpdaterGroundGeometrySpecs.js

@@ -9,7 +9,7 @@ import {
   GroundPrimitive,
   HeightReference,
   PrimitiveCollection,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function createGeometryUpdaterGroundGeometrySpecs(
   Updater,

Specs/createGeometryUpdaterSpecs.js

@@ -14,7 +14,7 @@ import {
   SampledProperty,
   TimeIntervalCollectionProperty,
   ShadowMode,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function createGeometryUpdaterSpecs(
   Updater,

Specs/createGlobe.js

@@ -1,4 +1,4 @@
-import { defaultValue, Ellipsoid, Event } from "@cesium/engine";
+import { defaultValue, Ellipsoid, Event } from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function createGlobe(ellipsoid) {
   ellipsoid = defaultValue(ellipsoid, Ellipsoid.WGS84);

Specs/createPackableArraySpecs.js

@@ -1,4 +1,4 @@
-import { defaultValue } from "@cesium/engine";
+import { defaultValue } from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function createPackableArraySpecs(
   packable,

Specs/createPackableSpecs.js

@@ -1,4 +1,8 @@
-import { defaultValue, defined, Math as CesiumMath } from "@cesium/engine";
+import {
+  defaultValue,
+  defined,
+  Math as CesiumMath,
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function createPackableSpecs(packable, instance, packedInstance, namePrefix) {
   namePrefix = defaultValue(namePrefix, "");

Specs/createScene.js

@@ -4,7 +4,7 @@ import {
   defaultValue,
   defined,
   Scene,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 import createCanvas from "./createCanvas.js";
 import getWebGLStub from "./getWebGLStub.js";

Specs/createTileKey.js

@@ -1,4 +1,4 @@
-import { defined, DeveloperError } from "@cesium/engine";
+import { defined, DeveloperError } from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function createTileKey(xOrTile, y, level) {
   if (!defined(xOrTile)) {

Specs/equals.js

@@ -1,4 +1,4 @@
-import { FeatureDetection } from "@cesium/engine";
+import { FeatureDetection } from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function isTypedArray(o) {
   return FeatureDetection.typedArrayTypes.some(function (type) {

Specs/equalsMethodEqualityTester.js

@@ -1,4 +1,4 @@
-import { defined } from "@cesium/engine";
+import { defined } from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function equalsMethodEqualityTester(a, b) {
   let to_run;

Specs/generateJsonBuffer.js

@@ -1,4 +1,4 @@
-import { defaultValue } from "@cesium/engine";
+import { defaultValue } from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function generateJsonBuffer(json, byteOffset, boundary) {
   let i;

Specs/getWebGLStub.js

@@ -4,7 +4,7 @@ import {
   defined,
   DeveloperError,
   WebGLConstants,
-} from "@cesium/engine";
+} from "@propelleraero/cesium-engine"; // PROPELLER HACK
 
 function getWebGLStub(canvas, options) {
   const stub = clone(WebGLConstants);