diff --git a/.gitignore b/.gitignore index b803840d09e5..3184a481591e 100644 --- a/.gitignore +++ b/.gitignore @@ -23,29 +23,11 @@ Thumbs.db /Source/Workers/** !/Source/Workers/cesiumWorkerBootstrapper.js !/Source/Workers/transferTypedArrayTest.js +!/Source/Workers/package.json 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/zip.js Source/ThirdParty/Workers/pako_inflate.min.js Source/ThirdParty/Workers/pako_deflate.min.js Source/ThirdParty/Workers/z-worker-pako.js diff --git a/.travis.yml b/.travis.yml index fb79557cca9b..25eb5951a094 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,14 +12,14 @@ script: - npm --silent run markdownlint - npm --silent run prettier-check - - npm --silent run build + - npm --silent run build -- --node + - npm --silent run coverage -- --browsers FirefoxHeadless --webgl-stub --failTaskOnError --suppressPassed - travis_wait 20 npm --silent run makeZipFile -- --concurrency 1 - npm pack &> /dev/null - npm --silent run buildApps - - npm --silent run build-specs - 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 @@ -28,7 +28,7 @@ script: # Various Node.js smoke-screen tests - node -e "const Cesium = require('./');" - - NODE_ENV=development node index.cjs - - NODE_ENV=production node index.cjs + - NODE_ENV=development node Specs/test.cjs + - NODE_ENV=production node Specs/test.cjs - npm --silent run cloc diff --git a/Apps/CesiumViewer/CesiumViewer.js b/Apps/CesiumViewer/CesiumViewer.js index f642804ffc94..2226c85e8fa2 100644 --- a/Apps/CesiumViewer/CesiumViewer.js +++ b/Apps/CesiumViewer/CesiumViewer.js @@ -1,4 +1,6 @@ -window.CESIUM_BASE_URL = "../../Source/"; +if (window.CESIUM_BASE_URL === undefined) { + window.CESIUM_BASE_URL = "../../Build/CesiumUnminified/"; +} import { Cartesian3, @@ -16,7 +18,7 @@ import { Viewer, viewerCesiumInspectorMixin, viewerDragDropMixin, -} from "../../Source/Cesium.js"; +} from "../../Build/CesiumUnminified/index.js"; function main() { /* diff --git a/Apps/CesiumViewer/index.js b/Apps/CesiumViewer/index.js new file mode 100644 index 000000000000..f4e3e3d56f26 --- /dev/null +++ b/Apps/CesiumViewer/index.js @@ -0,0 +1 @@ +window.CESIUM_BASE_URL = "."; diff --git a/Apps/Sandcastle/load-cesium-es6.js b/Apps/Sandcastle/load-cesium-es6.js index 8a55b25b6f41..b751b26f1e88 100644 --- a/Apps/Sandcastle/load-cesium-es6.js +++ b/Apps/Sandcastle/load-cesium-es6.js @@ -1,7 +1,7 @@ // This file loads the unbuilt ES6 version of Cesium // into the global scope during local developmnet -window.CESIUM_BASE_URL = "../../../Source/"; -import * as Cesium from "../../Source/Cesium.js"; +window.CESIUM_BASE_URL = "../../../Build/CesiumUnminified/"; +import * as Cesium from "../../Build/CesiumUnminified/index.js"; window.Cesium = Cesium; // Since ES6 modules have no guaranteed load order, diff --git a/Apps/Sandcastle/standalone.html b/Apps/Sandcastle/standalone.html index 33b837e24fdb..54e348a6c6ec 100644 --- a/Apps/Sandcastle/standalone.html +++ b/Apps/Sandcastle/standalone.html @@ -11,11 +11,6 @@ -