TerriaJS · na9da · Dec 8, 2024 · Nov 14, 2024 · Nov 14, 2024 · Nov 14, 2024
diff --git a/buildprocess/ci-deploy.sh b/buildprocess/ci-deploy.sh
@@ -23,7 +23,7 @@ yarn add -W request@2.83.0
 
 # Clone and build TerriaMap, using this version of TerriaJS
 TERRIAJS_COMMIT_HASH=$(git rev-parse HEAD)
-git clone -b main https://github.com/TerriaJS/TerriaMap.git
+git clone -b cjs-to-esm https://github.com/TerriaJS/TerriaMap.git
 cd TerriaMap
 TERRIAMAP_COMMIT_HASH=$(git rev-parse HEAD)
 sed -i -e 's@"terriajs": ".*"@"terriajs": "'$GITHUB_REPOSITORY'#'${GITHUB_BRANCH}'"@g' package.json

diff --git a/lib/CopyrightModule.js b/lib/CopyrightModule.js
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright(c) 2012-2014 National ICT Australia Limited (NICTA).
+ * Copyright(c) 2014-2024 Terria Pty Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
  * limitations under the License.
  *
  */
-module.exports = {};
+export default {};
diff --git a/lib/Core/ConsoleAnalytics.js b/lib/Core/ConsoleAnalytics.js
@@ -1,7 +1,7 @@
-var defined = require("terriajs-cesium/Source/Core/defined").default;
-const i18next = require("i18next").default;
+import defined from "terriajs-cesium/Source/Core/defined";
+import i18next from "i18next";
 
-var ConsoleAnalytics = function () {
+const ConsoleAnalytics = function () {
   // either set enableConsoleAnalytics here to true,
   // or pass true in `configParameters.enableConsoleAnalytics` for verbose app analytics
   this.enableConsoleAnalytics = false;

diff --git a/lib/Core/GoogleAnalytics.ts b/lib/Core/GoogleAnalytics.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import i18next from "i18next";
 import ReactGA from "react-ga4";
 import { Analytics, ConfigParameters } from "../Models/Terria";

diff --git a/lib/Core/ServerConfig.js b/lib/Core/ServerConfig.js
@@ -1,8 +1,8 @@
-const i18next = require("i18next").default;
-var defaultValue = require("terriajs-cesium/Source/Core/defaultValue").default;
-var loadJson = require("./loadJson").default;
+import i18next from "i18next";
+import defaultValue from "terriajs-cesium/Source/Core/defaultValue";
+import loadJson from "./loadJson";
 
-var DEFAULT_URL = "serverconfig/";
+const DEFAULT_URL = "serverconfig/";
 /**
  * Provides information about the configuration of the Terria server, by querying /serverconfig
  */

diff --git a/lib/Core/TerriaError.ts b/lib/Core/TerriaError.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import i18next from "i18next";
 import { observable, makeObservable } from "mobx";
 import RequestErrorEvent from "terriajs-cesium/Source/Core/RequestErrorEvent";

diff --git a/lib/Core/arrayProduct.js b/lib/Core/arrayProduct.js
diff --git a/lib/Core/closeWhenEscapeIsPressed.js b/lib/Core/closeWhenEscapeIsPressed.js
diff --git a/lib/Core/combineData.js b/lib/Core/combineData.js
diff --git a/lib/Core/combineFilters.js b/lib/Core/combineFilters.js
diff --git a/lib/Core/createFragmentFromTemplate.js b/lib/Core/createFragmentFromTemplate.js
diff --git a/lib/Core/flatten.ts b/lib/Core/flatten.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 /**
  * Flattens an array of arrays, into an array, eg. [[0, 1], [2, 3], [4, 5]] => [0, 1, 2, 3, 4, 5].
  * Based on the example at

diff --git a/lib/Core/flattenNested.ts b/lib/Core/flattenNested.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 type NestedArray<T> = NestedArray<T>[] | T[];
 
 /**

diff --git a/lib/Core/inherit.js b/lib/Core/inherit.js
diff --git a/lib/Core/isBrowserCompatible.js b/lib/Core/isBrowserCompatible.js
diff --git a/lib/Core/isCommonMobilePlatform.js b/lib/Core/isCommonMobilePlatform.js
diff --git a/lib/Core/loadWithXhr.js b/lib/Core/loadWithXhr.js
@@ -1,6 +1,5 @@
-const defaultValue =
-  require("terriajs-cesium/Source/Core/defaultValue").default;
-const Resource = require("terriajs-cesium/Source/Core/Resource").default;
+import defaultValue from "terriajs-cesium/Source/Core/defaultValue";
+import Resource from "terriajs-cesium/Source/Core/Resource";
 
 function loadWithXhr(options) {
   // Take advantage that most parameters are the same

diff --git a/lib/Core/polyfill.js b/lib/Core/polyfill.js
@@ -8,4 +8,4 @@ function polyfill(callback) {
   callback();
 }
 
-module.exports = polyfill;
+export default polyfill;