From cddb81cb13415357fd37b9eb6a5fb9121d80723a Mon Sep 17 00:00:00 2001 From: Terje Karlsen Date: Tue, 4 Mar 2025 11:24:44 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Fikser=20feil=20i=20kopiering=20av=20env-fi?= =?UTF-8?q?ler=20ved=20lokal=20kj=C3=B8ring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/nextjs/.env.development => .env.development | 0 package.json | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename packages/nextjs/.env.development => .env.development (100%) diff --git a/packages/nextjs/.env.development b/.env.development similarity index 100% rename from packages/nextjs/.env.development rename to .env.development diff --git a/package.json b/package.json index 315773dfd..15bdd7516 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "start": "npm run start --workspace packages/server", "start-in-docker": "node -r dotenv/config server/.dist/server.cjs dotenv_config_path=./.env", "storybook": "npm run storybook --workspace packages/nextjs", - "dev": "npm run copy-env-development && npm run build && npm run start", + "dev": "npm run copy-env-development && rm -fr packages/nextjs/.next && npm run build:server && npm run start", "dev-custom": "npm run copy-env-development-custom && npm run build && npm run start", "dev-server": "npm run copy-env-prod-local && npm run dev --workspace packages/server", "build-local": "npm run copy-env-prod-local && npm run build", @@ -27,9 +27,9 @@ "test:client": "npm run test --workspace packages/nextjs", "test:server": "npm run test --workspace packages/server", "prepare": "husky || true", - "copy-env-prod-local": "cp packages/nextjs/.env.prod-local packages/nextjs/.env", - "copy-env-development": "cp packages/nextjs/.env.development packages/nextjs/.env", - "copy-env-development-custom": "cp packages/nextjs/.env.development.local packages/nextjs/.env" + "copy-env-prod-local": "cp .env.prod-local packages/nextjs/.env && cp .env.prod-local packages/server/.env", + "copy-env-development": "cp .env.development packages/nextjs/.env && cp .env.development packages/server/.env", + "copy-env-development-custom": "cp .env.development.local packages/nextjs/.env && cp .env.development.local packages/server/.env" }, "workspaces": [ "packages/*" From cedbf16805d33418dcd84e08bd1307bf353062db Mon Sep 17 00:00:00 2001 From: Terje Karlsen Date: Tue, 4 Mar 2025 11:35:39 +0100 Subject: [PATCH 2/2] Flytter .env.prod-local til rot igjen --- packages/nextjs/.env.prod-local => .env.prod-local | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/nextjs/.env.prod-local => .env.prod-local (100%) diff --git a/packages/nextjs/.env.prod-local b/.env.prod-local similarity index 100% rename from packages/nextjs/.env.prod-local rename to .env.prod-local