@basemaps/cli 7.0.0 → 7.1.1

package/build/cli/index.d.ts

@@ -1,7 +1,5 @@
 #!/usr/bin/env node
 import { BaseCommandLine } from '@basemaps/shared/build/cli/base.js';
-import 'source-map-support/register.js';
 export declare class BasemapsConfigCommandLine extends BaseCommandLine {
     constructor();
 }
-//# sourceMappingURL=index.d.ts.map

package/build/cli/index.js

@@ -1,10 +1,7 @@
 #!/usr/bin/env node
 import { BaseCommandLine } from '@basemaps/shared/build/cli/base.js';
-import 'source-map-support/register.js';
-import { CommandCreateOverview } from './overview/action.create.overview.js';
 import { CommandBundleAssets } from './config/action.bundle.assets.js';
 import { CommandBundle } from './config/action.bundle.js';
-import { CommandImageryConfig } from './config/action.imagery.config.js';
 import { CommandImport } from './config/action.import.js';
 import { CommandServe } from './server/action.serve.js';
 export class BasemapsConfigCommandLine extends BaseCommandLine {
@@ -17,9 +14,6 @@ export class BasemapsConfigCommandLine extends BaseCommandLine {
         this.addAction(new CommandBundle());
         this.addAction(new CommandBundleAssets());
         this.addAction(new CommandImport());
-        this.addAction(new CommandImageryConfig());
-        // Argo
-        this.addAction(new CommandCreateOverview());
         // CICD - Screenshot tests
         this.addAction(new CommandServe());
     }

package/build/cli/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,OAAO,yBAA0B,SAAQ,eAAe;IAC5D;QACE,KAAK,CAAC;YACJ,YAAY,EAAE,KAAK;YACnB,eAAe,EAAE,+BAA+B;SACjD,CAAC,CAAC;QAEH,kBAAkB;QAClB,IAAI,CAAC,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;QAE3C,OAAO;QACP,IAAI,CAAC,SAAS,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC;QAE5C,0BAA0B;QAC1B,IAAI,CAAC,SAAS,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;IACrC,CAAC;CACF"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,OAAO,yBAA0B,SAAQ,eAAe;IAC5D;QACE,KAAK,CAAC;YACJ,YAAY,EAAE,KAAK;YACnB,eAAe,EAAE,+BAA+B;SACjD,CAAC,CAAC;QAEH,kBAAkB;QAClB,IAAI,CAAC,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;QAEpC,0BAA0B;QAC1B,IAAI,CAAC,SAAS,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;IACrC,CAAC;CACF"}

package/build/cli/server/action.serve.d.ts

@@ -8,4 +8,3 @@ export declare class CommandServe extends CommandLineAction {
     protected onDefineParameters(): void;
     protected onExecute(): Promise<void>;
 }
-//# sourceMappingURL=action.serve.d.ts.map

package/build/cli/server/action.serve.js

@@ -9,6 +9,30 @@ export class CommandServe extends CommandLineAction {
             summary: 'Cli tool to create sprite sheet',
             documentation: 'Create a sprite sheet from a folder of sprites',
         });
+        Object.defineProperty(this, "config", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "assets", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "port", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "noConfig", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
     }
     onDefineParameters() {
         this.config = this.defineStringParameter({
@@ -29,16 +53,15 @@ export class CommandServe extends CommandLineAction {
         });
     }
     async onExecute() {
-        var _a, _b;
         const logger = LogConfig.get();
-        const config = (_a = this.config.value) !== null && _a !== void 0 ? _a : 'dynamodb://' + Const.TileMetadata.TableName;
+        const config = this.config.value ?? 'dynamodb://' + Const.TileMetadata.TableName;
         const port = this.port.value;
         const assets = this.assets.value;
         // Force a default url base so WMTS requests know their relative url
-        const ServerUrl = (_b = Env.get(Env.PublicUrlBase)) !== null && _b !== void 0 ? _b : `http://localhost:${port}`;
+        const ServerUrl = Env.get(Env.PublicUrlBase) ?? `http://localhost:${port}`;
         process.env[Env.PublicUrlBase] = ServerUrl;
         const server = await createServer({ config, assets }, logger);
-        await server.listen({ port: port !== null && port !== void 0 ? port : DefaultPort, host: '0.0.0.0' });
+        await server.listen({ port: port ?? DefaultPort, host: '0.0.0.0' });
         logger.info({ url: ServerUrl }, 'ServerStarted');
     }
 }

package/build/cli/server/action.serve.js.map

@@ -1 +1 @@
-{"version":3,"file":"action.serve.js","sourceRoot":"","sources":["../../../src/cli/server/action.serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EACL,iBAAiB,GAIlB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,MAAM,OAAO,YAAa,SAAQ,iBAAiB;IAMjD;QACE,KAAK,CAAC;YACJ,UAAU,EAAE,OAAO;YACnB,OAAO,EAAE,iCAAiC;YAC1C,aAAa,EAAE,gDAAgD;SAChE,CAAC,CAAC;IACL,CAAC;IAES,kBAAkB;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,6BAA6B;SAC3C,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,+CAA+C;SAC7D,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC;YACtC,YAAY,EAAE,MAAM;YACpB,iBAAiB,EAAE,QAAQ;YAC3B,WAAW,EAAE,aAAa;YAC1B,YAAY,EAAE,WAAW;SAC1B,CAAC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,SAAS;;QACvB,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAE/B,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,mCAAI,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC;QACjF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QAEjC,oEAAoE;QACpE,MAAM,SAAS,GAAG,MAAA,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,mCAAI,oBAAoB,IAAI,EAAE,CAAC;QAC3E,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;QAE3C,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;QAC9D,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACpE,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,eAAe,CAAC,CAAC;IACnD,CAAC;CACF"}
+{"version":3,"file":"action.serve.js","sourceRoot":"","sources":["../../../src/cli/server/action.serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EACL,iBAAiB,GAIlB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,MAAM,OAAO,YAAa,SAAQ,iBAAiB;IAMjD;QACE,KAAK,CAAC;YACJ,UAAU,EAAE,OAAO;YACnB,OAAO,EAAE,iCAAiC;YAC1C,aAAa,EAAE,gDAAgD;SAChE,CAAC,CAAC;QAVL;;;;;WAAoC;QACpC;;;;;WAAoC;QACpC;;;;;WAAmC;QACnC;;;;;WAAoC;IAQpC,CAAC;IAES,kBAAkB;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,6BAA6B;SAC3C,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,+CAA+C;SAC7D,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC;YACtC,YAAY,EAAE,MAAM;YACpB,iBAAiB,EAAE,QAAQ;YAC3B,WAAW,EAAE,aAAa;YAC1B,YAAY,EAAE,WAAW;SAC1B,CAAC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,SAAS;QACvB,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAE/B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC;QACjF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QAEjC,oEAAoE;QACpE,MAAM,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,oBAAoB,IAAI,EAAE,CAAC;QAC3E,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;QAE3C,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;QAC9D,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACpE,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,eAAe,CAAC,CAAC;IACnD,CAAC;CACF"}

package/build/cli/util.d.ts

@@ -1,3 +1,4 @@
+export declare function isRecord<T = unknown>(value: unknown): value is Record<string, T>;
 /**
  * Invalidate the cloudfront distribution cache when updating imagery sets
  */
@@ -13,11 +14,10 @@ export declare function getStaticBucket(): Promise<string>;
  * @param cacheControl cache control headers @example 'public, max-age=604800, immutable'
  * @returns whether the item was updated
  */
-export declare function uploadStaticFile(filePath: string, target: string, contentType: string, cacheControl: string): Promise<boolean>;
+export declare function uploadStaticFile(filePath: URL, target: string, contentType: string, cacheControl: string): Promise<boolean>;
 /**
  * Make a tile imagery title as imagery name
  * @example
  *  'Tasman rural 2018-19 0.3m' => 'tasman_rural_2018-19_0-3m'
  */
 export declare function nameImageryTitle(title: string): string;
-//# sourceMappingURL=util.d.ts.map

package/build/cli/util.js

@@ -1,32 +1,36 @@
+import { CloudFormationClient, DescribeStacksCommand } from '@aws-sdk/client-cloudformation';
+import { CloudFrontClient, CreateInvalidationCommand, ListDistributionsCommand } from '@aws-sdk/client-cloudfront';
+import { HeadObjectCommand, PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { fsa, LogConfig } from '@basemaps/shared';
-import CloudFormation from 'aws-sdk/clients/cloudformation.js';
-import CloudFront from 'aws-sdk/clients/cloudfront.js';
-import S3 from 'aws-sdk/clients/s3.js';
 import { CliId } from '@basemaps/shared/build/cli/info.js';
 import crypto from 'crypto';
 import path from 'path';
-import { gzip } from 'zlib';
-import { promisify } from 'util';
 import slugify from 'slugify';
+import { promisify } from 'util';
+import { gzip } from 'zlib';
 // Cloudfront has to be defined in us-east-1
-const cloudFormation = new CloudFormation({ region: 'us-east-1' });
-const cloudFront = new CloudFront({ region: 'us-east-1' });
-const s3 = new S3({ region: 'us-east-1' });
+const cloudFormationClient = new CloudFormationClient({ region: 'us-east-1' });
+const cloudFrontClient = new CloudFrontClient({ region: 'us-east-1' });
+const s3Client = new S3Client({ region: 'us-east-1' });
 /** cloudfront invalidation references need to be unique */
 let InvalidationId = 0;
+export function isRecord(value) {
+    return typeof value === 'object' && value !== null;
+}
 /**
  * Invalidate the cloudfront distribution cache when updating imagery sets
  */
 export async function invalidateCache(path, commit = false) {
-    var _a, _b, _c;
-    const stackInfo = await cloudFormation.describeStacks({ StackName: 'Edge' }).promise();
-    if (((_a = stackInfo.Stacks) === null || _a === void 0 ? void 0 : _a[0].Outputs) == null) {
+    const command = new DescribeStacksCommand({ StackName: 'Edge' });
+    const response = await cloudFormationClient.send(command);
+    if (response.Stacks?.[0].Outputs == null) {
         LogConfig.get().warn('Unable to find cloud front distribution');
         return;
     }
-    const cloudFrontDomain = stackInfo.Stacks[0].Outputs.find((f) => f.OutputKey === 'CloudFrontDomain');
-    const cloudFrontDistributions = await cloudFront.listDistributions().promise();
-    const cf = (_c = (_b = cloudFrontDistributions.DistributionList) === null || _b === void 0 ? void 0 : _b.Items) === null || _c === void 0 ? void 0 : _c.find((f) => f.DomainName === (cloudFrontDomain === null || cloudFrontDomain === void 0 ? void 0 : cloudFrontDomain.OutputValue));
+    const cloudFrontDomain = response.Stacks[0].Outputs.find((f) => f.OutputKey === 'CloudFrontDomain');
+    const listDistributionCommand = new ListDistributionsCommand({});
+    const cloudFrontDistributions = await cloudFrontClient.send(listDistributionCommand);
+    const cf = cloudFrontDistributions.DistributionList?.Items?.find((f) => f.DomainName === cloudFrontDomain?.OutputValue);
     if (cloudFrontDomain == null || cf == null) {
         LogConfig.get().warn('Unable to find cloud front distribution');
         return;
@@ -34,29 +38,28 @@ export async function invalidateCache(path, commit = false) {
     LogConfig.get().info({ path, cfId: cf.Id }, 'Invalidating');
     const Items = Array.isArray(path) ? path : [path];
     if (commit) {
-        await cloudFront
-            .createInvalidation({
+        const invalidationCommand = new CreateInvalidationCommand({
             DistributionId: cf.Id,
             InvalidationBatch: {
                 Paths: { Quantity: Items.length, Items },
                 CallerReference: `${CliId}-${InvalidationId++}`,
             },
-        })
-            .promise();
+        });
+        await cloudFrontClient.send(invalidationCommand);
     }
 }
 export const HashKey = 'linz-hash';
 export async function getHash(Bucket, Key) {
-    var _a, _b;
     try {
-        const obj = await s3.headObject({ Bucket, Key }).promise();
-        return (_b = (_a = obj.Metadata) === null || _a === void 0 ? void 0 : _a[HashKey]) !== null && _b !== void 0 ? _b : null;
+        const command = new HeadObjectCommand({ Bucket, Key });
+        const obj = await s3Client.send(command);
+        return obj.Metadata?.[HashKey] ?? null;
     }
     catch (e) {
-        if (e.code === 'NoSuchKey')
-            return null;
-        if (e.code === 'NotFound')
-            return null;
+        if (isRecord(e) && isRecord(e['$metadata']) && typeof e['$metadata']['httpStatusCode'] === 'number') {
+            if (e['$metadata']['httpStatusCode'] === 404)
+                return null;
+        }
         throw e;
     }
 }
@@ -68,12 +71,9 @@ let staticBucket;
 export function getStaticBucket() {
     if (staticBucket == null) {
         // Since the bucket is generated inside of CDK lets look up the bucket name
-        staticBucket = cloudFormation
-            .describeStacks({ StackName: 'Edge' })
-            .promise()
-            .then((stackInfo) => {
-            var _a, _b, _c, _d;
-            const val = (_d = (_c = (_b = (_a = stackInfo.Stacks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.Outputs) === null || _c === void 0 ? void 0 : _c.find((f) => f.OutputKey === 'CloudFrontBucket')) === null || _d === void 0 ? void 0 : _d.OutputValue;
+        const command = new DescribeStacksCommand({ StackName: 'Edge' });
+        staticBucket = cloudFormationClient.send(command).then((stackInfo) => {
+            const val = stackInfo.Stacks?.[0]?.Outputs?.find((f) => f.OutputKey === 'CloudFrontBucket')?.OutputValue;
             if (val == null)
                 throw new Error('Failed to find EdgeBucket');
             return val;
@@ -107,8 +107,7 @@ export async function uploadStaticFile(filePath, target, contentType, cacheContr
     // Should we compress the file before uploading
     const ext = path.extname(target);
     const contentEncoding = CompressExt.has(ext) ? 'gzip' : undefined;
-    await s3
-        .putObject({
+    const command = new PutObjectCommand({
         Bucket: bucket,
         Key: target,
         Body: contentEncoding === 'gzip' ? await gzipPromise(fileData, { level: 9 }) : fileData,
@@ -116,8 +115,8 @@ export async function uploadStaticFile(filePath, target, contentType, cacheContr
         ContentType: contentType,
         CacheControl: cacheControl,
         ContentEncoding: contentEncoding,
-    })
-        .promise();
+    });
+    await s3Client.send(command);
     return true;
 }
 /**
@@ -126,10 +125,12 @@ export async function uploadStaticFile(filePath, target, contentType, cacheContr
  *  'Tasman rural 2018-19 0.3m' => 'tasman_rural_2018-19_0-3m'
  */
 export function nameImageryTitle(title) {
-    return slugify(title.replace(/\.+/g, '-'), {
+    return slugify
+        .default(title.replace(/\.+/g, '-'), {
         replacement: '_',
         lower: true,
         trim: true,
-    }).replace(/[^\w-_]/gi, '');
+    })
+        .replace(/[^\w-_]/gi, '');
 }
 //# sourceMappingURL=util.js.map

package/build/cli/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/cli",
-  "version": "7.0.0",
+  "version": "7.1.1",
   "private": false,
   "repository": {
     "type": "git",
@@ -20,8 +20,8 @@
   },
   "scripts": {
     "build": "tsc",
-    "bundle": "../../scripts/bundle.js package.json",
-    "test": "ospec --globs 'build/**/*.test.js'"
+    "bundle": "../../scripts/bundle.mjs package.json",
+    "test": "node --test"
   },
   "bundle": [
     {
@@ -36,21 +36,20 @@
   ],
   "type": "module",
   "engines": {
-    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+    "node": ">=16.0.0"
   },
   "dependencies": {
-    "@basemaps/config": "^7.0.0",
-    "@basemaps/geo": "^7.0.0",
-    "@basemaps/server": "^7.0.0",
-    "@basemaps/shared": "^7.0.0",
-    "@basemaps/tiler": "^7.0.0",
-    "@basemaps/tiler-sharp": "^7.0.0",
-    "@chunkd/fs": "^10.0.2",
-    "@chunkd/source-aws-v2": "^9.3.1",
-    "@cogeotiff/core": "^7.2.0",
-    "@cotar/core": "^5.4.0",
-    "@cotar/tar": "^5.4.1",
-    "@linzjs/geojson": "^7.0.0",
+    "@basemaps/config": "^7.1.0",
+    "@basemaps/config-loader": "^7.1.0",
+    "@basemaps/geo": "^7.1.0",
+    "@basemaps/server": "^7.1.1",
+    "@basemaps/shared": "^7.1.0",
+    "@basemaps/tiler": "^7.1.0",
+    "@basemaps/tiler-sharp": "^7.1.0",
+    "@chunkd/source-memory": "^11.0.2",
+    "@cotar/builder": "^6.0.1",
+    "@cotar/tar": "^6.0.1",
+    "@linzjs/geojson": "^7.1.0",
     "@rushstack/ts-command-line": "^4.3.13",
     "ansi-colors": "^4.1.1",
     "deep-diff": "^1.0.2",
@@ -61,8 +60,10 @@
     "zod": "^3.17.3"
   },
   "devDependencies": {
-    "@types/deep-diff": "^1.0.1",
-    "@types/sharp": "^0.32.0"
+    "@aws-sdk/client-cloudformation": "^3.470.0",
+    "@aws-sdk/client-cloudfront": "^3.470.0",
+    "@aws-sdk/client-s3": "^3.470.0",
+    "@types/deep-diff": "^1.0.1"
   },
   "publishConfig": {
     "access": "public"
@@ -70,5 +71,5 @@
   "files": [
     "build/"
   ],
-  "gitHead": "82d9e6d431240133f4e4d783dd0b4138c2d1f66a"
+  "gitHead": "7c06286cc5f042dd211043ca0352575d1b27d205"
 }