From 4478917dcedb6e33e6748ceb14a9f917d60dd677 Mon Sep 17 00:00:00 2001 From: Wentao Kuang Date: Fri, 27 Sep 2024 11:35:44 +1200 Subject: [PATCH 1/6] Add lerc external into server package. --- packages/server/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/server/package.json b/packages/server/package.json index c1942f5060..5a033c4c8c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -35,7 +35,8 @@ "executable": true, "external": [ "pino-pretty", - "sharp" + "sharp", + "lerc" ] } ], From 8f3212a39c63bc8e968aa5b2fe3ee8103a80158a Mon Sep 17 00:00:00 2001 From: Wentao Kuang Date: Fri, 27 Sep 2024 11:44:14 +1200 Subject: [PATCH 2/6] Add lerc into cli package --- packages/cli/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 348715ddd2..9833b02d06 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -30,7 +30,8 @@ "outfile": "dist/index.cjs", "external": [ "sharp", - "pino-pretty" + "pino-pretty", + "lerc" ] } ], From e2295871fa2f3702188bbd67b2352c8b8dc19f52 Mon Sep 17 00:00:00 2001 From: Wentao Kuang Date: Fri, 27 Sep 2024 14:27:33 +1200 Subject: [PATCH 3/6] Install lerc into container --- packages/cli/Dockerfile | 2 +- packages/server/Dockerfile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/cli/Dockerfile b/packages/cli/Dockerfile index 3ba8ea493b..8852a0962e 100644 --- a/packages/cli/Dockerfile +++ b/packages/cli/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update RUN apt-get install -y nodejs # Install sharp TODO update this when we change sharp versions -RUN npm install sharp@0.33.0 +RUN npm install sharp@0.33.0 lerc@^4.0.4 # Install the landing assets COPY ./basemaps-landing*.tgz /app/ diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile index 97bf4cb9cf..c748f8df8c 100644 --- a/packages/server/Dockerfile +++ b/packages/server/Dockerfile @@ -12,6 +12,8 @@ WORKDIR /app/basemaps COPY ./basemaps-landing*.tgz /app/basemaps/ COPY ./basemaps-server*.tgz /app/basemaps/ +RUN npm install lerc@^4.0.4 + RUN npm install ./basemaps-landing*.tgz RUN npm install ./basemaps-server*.tgz From c06cfe2c30c967509650d6cd8bdc7f798afbec2c Mon Sep 17 00:00:00 2001 From: Wentao Kuang Date: Fri, 27 Sep 2024 16:23:40 +1200 Subject: [PATCH 4/6] Install lerc as dependecies for server --- package-lock.json | 1 + packages/cli/Dockerfile | 2 +- packages/server/Dockerfile | 2 -- packages/server/package.json | 3 ++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1aa54f9633..87244dbadc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19637,6 +19637,7 @@ "version": "7.10.0", "license": "MIT", "dependencies": { + "lerc": "^4.0.4", "sharp": "^0.33.0" }, "bin": { diff --git a/packages/cli/Dockerfile b/packages/cli/Dockerfile index 8852a0962e..3ba8ea493b 100644 --- a/packages/cli/Dockerfile +++ b/packages/cli/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update RUN apt-get install -y nodejs # Install sharp TODO update this when we change sharp versions -RUN npm install sharp@0.33.0 lerc@^4.0.4 +RUN npm install sharp@0.33.0 # Install the landing assets COPY ./basemaps-landing*.tgz /app/ diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile index c748f8df8c..97bf4cb9cf 100644 --- a/packages/server/Dockerfile +++ b/packages/server/Dockerfile @@ -12,8 +12,6 @@ WORKDIR /app/basemaps COPY ./basemaps-landing*.tgz /app/basemaps/ COPY ./basemaps-server*.tgz /app/basemaps/ -RUN npm install lerc@^4.0.4 - RUN npm install ./basemaps-landing*.tgz RUN npm install ./basemaps-server*.tgz diff --git a/packages/server/package.json b/packages/server/package.json index 5a033c4c8c..c71297a0ff 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -48,7 +48,8 @@ "@basemaps/landing": "^7.0.0" }, "dependencies": { - "sharp": "^0.33.0" + "sharp": "^0.33.0", + "lerc": "^4.0.4" }, "devDependencies": { "@basemaps/config": "^7.7.0", From 646c04fa8caf7b2813072727adeb18e2f2d200ac Mon Sep 17 00:00:00 2001 From: Wentao Kuang Date: Mon, 30 Sep 2024 09:30:41 +1300 Subject: [PATCH 5/6] Add note to deprecate server in the cli container --- packages/cli/src/cli/server/action.serve.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cli/src/cli/server/action.serve.ts b/packages/cli/src/cli/server/action.serve.ts index 7baf3c0eed..12e18c88d1 100644 --- a/packages/cli/src/cli/server/action.serve.ts +++ b/packages/cli/src/cli/server/action.serve.ts @@ -9,6 +9,7 @@ import { const DefaultPort = 5000; +//TO DEPRECATE: We should use the server container directly now, and deprecate this later. export class CommandServe extends CommandLineAction { config!: CommandLineStringParameter; assets!: CommandLineStringParameter; From d1d602f5e4b3e41161dbef2feffe48b1b299bba0 Mon Sep 17 00:00:00 2001 From: Wentao Kuang Date: Mon, 30 Sep 2024 09:53:45 +1300 Subject: [PATCH 6/6] Update packages/cli/src/cli/server/action.serve.ts Co-authored-by: Blayne Chard --- packages/cli/src/cli/server/action.serve.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/cli/server/action.serve.ts b/packages/cli/src/cli/server/action.serve.ts index 12e18c88d1..7d11f68943 100644 --- a/packages/cli/src/cli/server/action.serve.ts +++ b/packages/cli/src/cli/server/action.serve.ts @@ -9,7 +9,7 @@ import { const DefaultPort = 5000; -//TO DEPRECATE: We should use the server container directly now, and deprecate this later. +/** @deprecated 2024-09 Use the basemaps/server container directly now, and deprecate this later. */ export class CommandServe extends CommandLineAction { config!: CommandLineStringParameter; assets!: CommandLineStringParameter;