Replace asset require() in lib with import.

Author: na9da

lib/Core/loadBlob.ts

@@ -41,29 +41,6 @@ export function isZip(uri: string) {
 
 /** Get zipjs ZipReader for given Blob */
 function getZipReader(blob: Blob): any {
-  // const zWorkerPakoUrl = require("file-loader!terriajs-cesium/Source/ThirdParty/Workers/z-worker-pako.js");
-  // const inflateUrl = require("file-loader!terriajs-cesium/Source/ThirdParty/Workers/pako_inflate.min.js");
-  // const deflateUrl = require("file-loader!terriajs-cesium/Source/ThirdParty/Workers/pako_deflate.min.js");
-
-  // zip annoyingly requires the inflateUrl and deflateUrl to be relative to the zWorkerPakoUrl.
-  // To do that, we need to go via absolute URLs
-  // const absoluteBase = new URI(zWorkerPakoUrl)
-  //   .absoluteTo(location.href)
-  //   .toString();
-  // const relativeInflateUri = new URI(deflateUrl)
-  //   .absoluteTo(location.href)
-  //   .relativeTo(absoluteBase);
-  // const relativeDeflateUri = new URI(inflateUrl)
-  //   .absoluteTo(location.href)
-  //   .relativeTo(absoluteBase);
-
-  // zip.configure({
-  //   workerScripts: {
-  //     deflate: [zWorkerPakoUrl, relativeInflateUri.toString()],
-  //     inflate: [zWorkerPakoUrl, relativeDeflateUri.toString()]
-  //   }
-  // });
-
   return new ZipReader(new ZipBlobReader(blob));
 }
 

lib/Models/Catalog/Ows/CswCatalogGroup.ts

@@ -1,39 +1,39 @@
 import i18next from "i18next";
 import { flatten } from "lodash-es";
-import { action, computed, runInAction, makeObservable } from "mobx";
+import { action, computed, makeObservable, runInAction } from "mobx";
 import URI from "urijs";
+import TerriaError, { networkRequestError } from "../../../Core/TerriaError";
 import filterOutUndefined from "../../../Core/filterOutUndefined";
 import isDefined from "../../../Core/isDefined";
 import loadWithXhr from "../../../Core/loadWithXhr";
 import loadXML from "../../../Core/loadXML";
 import runLater from "../../../Core/runLater";
-import TerriaError, { networkRequestError } from "../../../Core/TerriaError";
 import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";
 import GroupMixin from "../../../ModelMixins/GroupMixin";
 import UrlMixin from "../../../ModelMixins/UrlMixin";
 import xml2json from "../../../ThirdParty/xml2json";
+import ModelReference from "../../../Traits/ModelReference";
 import { InfoSectionTraits } from "../../../Traits/TraitsClasses/CatalogMemberTraits";
 import CswCatalogGroupTraits, {
   QueryPropertyName
 } from "../../../Traits/TraitsClasses/CswCatalogGroupTraits";
-import ModelReference from "../../../Traits/ModelReference";
-import ArcGisMapServerCatalogItem from "../Esri/ArcGisMapServerCatalogItem";
-import CatalogGroup from "../CatalogGroup";
 import CommonStrata from "../../Definition/CommonStrata";
 import CreateModel from "../../Definition/CreateModel";
+import LoadableStratum from "../../Definition/LoadableStratum";
+import { BaseModel, ModelConstructor } from "../../Definition/Model";
+import StratumOrder from "../../Definition/StratumOrder";
+import CatalogGroup from "../CatalogGroup";
 import CsvCatalogItem from "../CatalogItems/CsvCatalogItem";
 import GeoJsonCatalogItem from "../CatalogItems/GeoJsonCatalogItem";
 import KmlCatalogItem from "../CatalogItems/KmlCatalogItem";
-import LoadableStratum from "../../Definition/LoadableStratum";
-import { BaseModel, ModelConstructor } from "../../Definition/Model";
-import { BoundingBox } from "./OwsInterfaces";
+import ArcGisMapServerCatalogItem from "../Esri/ArcGisMapServerCatalogItem";
+import defaultGetRecordsTemplate from "../Ows/CswGetRecordsTemplate.xml";
 import proxyCatalogItemUrl from "../proxyCatalogItemUrl";
-import StratumOrder from "../../Definition/StratumOrder";
+import { BoundingBox } from "./OwsInterfaces";
 import WebMapServiceCatalogItem from "./WebMapServiceCatalogItem";
 
-const defaultGetRecordsTemplate = require("../Ows/CswGetRecordsTemplate.xml");
 // WPS is disabled until wps-group support
-// const wpsGetRecordsTemplate = require("./CswGetRecordsWPSTemplate.xml");
+// import wpsGetRecordsTemplate from "./CswGetRecordsWPSTemplate.xml";
 
 type ArrayOrPrimitive<T> = T | T[];
 function toArray<T>(val: ArrayOrPrimitive<T>): T[];

lib/Models/Catalog/Ows/SensorObservationServiceCatalogItem.ts

@@ -3,10 +3,10 @@ import { action, computed, makeObservable, override, runInAction } from "mobx";
 import Mustache from "mustache";
 import DeveloperError from "terriajs-cesium/Source/Core/DeveloperError";
 import JulianDate from "terriajs-cesium/Source/Core/JulianDate";
+import TerriaError from "../../../Core/TerriaError";
 import filterOutUndefined from "../../../Core/filterOutUndefined";
 import isDefined from "../../../Core/isDefined";
 import loadWithXhr from "../../../Core/loadWithXhr";
-import TerriaError from "../../../Core/TerriaError";
 import TableMixin from "../../../ModelMixins/TableMixin";
 import TableAutomaticStylesStratum from "../../../Table/TableAutomaticStylesStratum";
 import TableColumnType from "../../../Table/TableColumnType";
@@ -19,13 +19,14 @@ import TablePointSizeStyleTraits from "../../../Traits/TraitsClasses/Table/Point
 import TableStyleTraits from "../../../Traits/TraitsClasses/Table/StyleTraits";
 import CommonStrata from "../../Definition/CommonStrata";
 import CreateModel from "../../Definition/CreateModel";
-import createStratumInstance from "../../Definition/createStratumInstance";
 import { BaseModel } from "../../Definition/Model";
 import StratumFromTraits from "../../Definition/StratumFromTraits";
 import StratumOrder from "../../Definition/StratumOrder";
+import createStratumInstance from "../../Definition/createStratumInstance";
 import { SelectableDimension } from "../../SelectableDimensions/SelectableDimensions";
 import Terria from "../../Terria";
 import proxyCatalogItemUrl from "../proxyCatalogItemUrl";
+import defaultRequestTemplate from "./SensorObservationServiceRequestTemplate.xml";
 
 interface GetFeatureOfInterestResponse {
   featureMember?: FeatureMember[] | FeatureMember;
@@ -312,7 +313,7 @@ export default class SensorObservationServiceCatalogItem extends TableMixin(
   CreateModel(SensorObservationServiceCatalogItemTraits)
 ) {
   static readonly type = "sos";
-  static defaultRequestTemplate = require("./SensorObservationServiceRequestTemplate.xml");
+  static defaultRequestTemplate = defaultRequestTemplate;
 
   constructor(
     id: string | undefined,

lib/Models/Catalog/Ows/WebProcessingServiceCatalogFunctionJob.ts

@@ -34,8 +34,7 @@ import upsertModelFromJson from "../../Definition/upsertModelFromJson";
 import GeoJsonCatalogItem from "../CatalogItems/GeoJsonCatalogItem";
 import CatalogMemberFactory from "../CatalogMemberFactory";
 import proxyCatalogItemUrl from "../proxyCatalogItemUrl";
-
-const executeWpsTemplate = require("./ExecuteWpsTemplate.xml");
+import executeWpsTemplate from "./ExecuteWpsTemplate.xml";
 
 class WpsLoadableStratum extends LoadableStratum(
   WebProcessingServiceCatalogFunctionJobTraits