Merge branch 'main' of https://github.com/CesiumGS/cesium into workspaces

Author: sanjeetsuhag

CHANGES.md

@@ -4,12 +4,17 @@
 
 #### Major Announcements :loudspeaker:
 
-- CesiumJS is now published alongside two smaller packages `@cesium/engine` and `@cesium/widgets` [#10824](https://github.com/CesiumGS/cesium/pull/10824):
-  - The source code has been paritioned into two npm workspaces: `packages/engine` and `packages/widgets`.
+- Starting with version 1.100, CesiumJS will be published alongside two smaller packages `@cesium/engine` and `@cesium/widgets` [#10824](https://github.com/CesiumGS/cesium/pull/10824):
+  - The source code will been paritioned into two folders: `packages/engine` and `packages/widgets`.
   - These workspaces packages will follow semantic versioning.
   - These workspaces packages will be published as ES modules with TypeScript definitions.
-  - The combined CesiumJS release will continue to be published, however, only the `Assets`, `ThirdParty` and `Widgets` (with CSS files only) are available in the root level `Source` folder.
-  - The ability to import modules and TypeScript definitinons from individual modules has been removed.
+  - The combined CesiumJS release will continue to be published, however, the `Source` folder will only contain the following:
+    - `Cesium.js`
+    - `Cesium.d.ts`
+    - `Assets`
+    - `ThirdParty`
+    - `Widgets`(CSS files only)
+  - The ability to import modules and TypeScript definitions from individual files will been removed. Any imports should originate from the `cesium` module (`import { Cartesian3 } from "cesium";`) or the combined `Cesium.js` file (`import { Cartesian3 } from "Source/Cesium.js";`);
 
 ##### Additions :tada:
 

ThirdParty.json

@@ -45,7 +45,7 @@
     "license": [
       "Apache-2.0"
     ],
-    "version": "1.5.3",
+    "version": "1.5.5",
     "url": "https://www.npmjs.com/package/draco3d"
   },
   {

build.js

@@ -346,22 +346,26 @@ function rollupWarning(message) {
  */
 export async function bundleCombinedWorkers(options) {
   // Bundle non ES6 workers.
-
-  const workers = await globby([
-    `packages/engine/Source/Workers/**`,
-    `packages/engine/Source/ThirdParty/Workers/**`,
-  ]);
-
-  const esBuildConfig = defaultESBuildOptions();
-  esBuildConfig.bundle = false;
-  esBuildConfig.entryPoints = workers;
-  esBuildConfig.outdir = options.path;
-  esBuildConfig.minify = options.minify;
-  esBuildConfig.banner = {
-    js: combinedCopyrightHeader,
+  const workers = await globby(["Source/Workers/**"]);
+  const workerConfig = defaultESBuildOptions();
+  workerConfig.bundle = false;
+  workerConfig.banner = {
+    js: options.copyrightHeader,
   };
+  workerConfig.entryPoints = workers;
+  workerConfig.outdir = options.path;
+  workerConfig.minify = options.minify;
+  await esbuild.build(workerConfig);
+
+  // Copy ThirdParty workers
+  const thirdPartyWorkers = await globby(["Source/ThirdParty/Workers/**"]);
 
-  await esbuild.build(esBuildConfig);
+  const thirdPartyWorkerConfig = defaultESBuildOptions();
+  thirdPartyWorkerConfig.bundle = false;
+  thirdPartyWorkerConfig.entryPoints = thirdPartyWorkers;
+  thirdPartyWorkerConfig.outdir = options.path;
+  thirdPartyWorkerConfig.minify = options.minify;
+  await esbuild.build(thirdPartyWorkerConfig);
 
   // Bundle ES6 workers.
 
@@ -422,6 +426,18 @@ export async function bundleWorkers(options) {
   workerConfig.minify = options.minify;
   await esbuild.build(workerConfig);
 
+  // Copy ThirdParty workers
+  const thirdPartyWorkers = await globby(["Source/ThirdParty/Workers/**"]);
+
+  const thirdPartyWorkerConfig = defaultESBuildOptions();
+  thirdPartyWorkerConfig.entryPoints = thirdPartyWorkers;
+  thirdPartyWorkerConfig.outdir = options.path;
+  thirdPartyWorkerConfig.outbase = `packages/engine/Source`; // Maintain existing file paths
+  thirdPartyWorkerConfig.minify = options.minify;
+  // We don't want the CesiumJS copyright banner added to the ThirdParty worker files.
+  thirdPartyWorkerConfig.banner = undefined;
+  await esbuild.build(thirdPartyWorkerConfig);
+
   // Use rollup to build the workers:
   // 1) They can be built as AMD style modules
   // 2) They can be built using code-splitting, resulting in smaller modules

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cesium",
-  "version": "1.98.1",
+  "version": "1.99.0",
   "description": "CesiumJS is a JavaScript library for creating 3D globes and 2D maps in a web browser without a plugin.",
   "homepage": "http://cesium.com/cesiumjs/",
   "license": "Apache-2.0",

packages/engine/Source/Core/Ion.js

@@ -4,7 +4,7 @@ import Resource from "./Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0NTkyNGVkMi04YTg1LTQ4YzktYTI3MS05NTNiZWM3MTg2ZGEiLCJpZCI6MjU5LCJpYXQiOjE2NjQ4MTQyODl9.mGZTN2DeKa-mQnQr6BInj8GzOK6wq3dZMwcyU0iwInA";
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI4NTFhZTUzYy1iMDY1LTQ3OGMtYmUzMS0zZjkzYzA1OTcwMzgiLCJpZCI6MjU5LCJpYXQiOjE2NjczMDg2OTN9.19evjYn4YZyB1OoUV_77qL2JOJr-Zc1Mqjp3wYisCzM";
 
 /**
  * Default settings for accessing the Cesium ion API.