From c3a5205d8e9755de0f4a945c359eafedb59a45a7 Mon Sep 17 00:00:00 2001 From: Marshall Polaris Date: Sat, 28 May 2022 13:21:05 -0700 Subject: [PATCH] Use cross-env for things that set environment variables (#359) --- web/package.json | 7 ++++--- yarn.lock | 9 ++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/web/package.json b/web/package.json index c427557e..3e638906 100644 --- a/web/package.json +++ b/web/package.json @@ -4,10 +4,10 @@ "private": true, "scripts": { "dev": "concurrently -n NEXT,TS -c magenta,cyan \"next dev -p 3000\" \"yarn ts --watch\"", - "devdev": "NEXT_PUBLIC_FIREBASE_ENV=DEV concurrently -n NEXT,TS -c magenta,cyan \"FIREBASE_ENV=DEV next dev -p 3000\" \"FIREBASE_ENV=DEV yarn ts --watch\" # see https://github.com/vercel/next.js/discussions/33634", + "devdev": "cross-env NEXT_PUBLIC_FIREBASE_ENV=DEV concurrently -n NEXT,TS -c magenta,cyan \"cross-env FIREBASE_ENV=DEV next dev -p 3000\" \"cross-env FIREBASE_ENV=DEV yarn ts --watch\"", "dev:dev": "yarn devdev", - "dev:the": "NEXT_PUBLIC_FIREBASE_ENV=THEOREMONE concurrently -n NEXT,TS -c magenta,cyan \"FIREBASE_ENV=THEOREMONE next dev -p 3000\" \"FIREBASE_ENV=THEOREMONE yarn ts --watch\"", - "dev:emulate": "NEXT_PUBLIC_FIREBASE_EMULATE=TRUE yarn devdev", + "dev:the": "cross-env NEXT_PUBLIC_FIREBASE_ENV=THEOREMONE concurrently -n NEXT,TS -c magenta,cyan \"cross-env FIREBASE_ENV=THEOREMONE next dev -p 3000\" \"cross-env FIREBASE_ENV=THEOREMONE yarn ts --watch\"", + "dev:emulate": "cross-env NEXT_PUBLIC_FIREBASE_EMULATE=TRUE yarn devdev", "ts": "tsc --noEmit --incremental --preserveWatchOutput --pretty", "build": "next build", "start": "next start", @@ -48,6 +48,7 @@ "autoprefixer": "10.2.6", "concurrently": "6.5.1", "critters": "0.0.16", + "cross-env": "^7.0.3", "eslint-config-next": "12.1.6", "next-sitemap": "^2.5.14", "postcss": "8.3.5", diff --git a/yarn.lock b/yarn.lock index 982cd49a..cda4d6b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1828,7 +1828,14 @@ critters@0.0.16: postcss "^8.3.7" pretty-bytes "^5.3.0" -cross-spawn@^7.0.2: +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + +cross-spawn@^7.0.1, cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==