From 51eaa9944149935db0f5be4768fbc13006fce1f0 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sun, 18 Dec 2022 00:15:19 +0000
Subject: [PATCH] chore: explicitly use development flag

---
 config/pwa.ts  | 6 +++---
 nuxt.config.ts | 4 ++--
 package.json   | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/config/pwa.ts b/config/pwa.ts
index f6a83810..b159d14b 100644
--- a/config/pwa.ts
+++ b/config/pwa.ts
@@ -1,12 +1,12 @@
-import { isCI } from 'std-env'
+import { isCI, isDevelopment } from 'std-env'
 import type { VitePWANuxtOptions } from '../modules/pwa/types'
 
 const isPreview = process.env.PULL_REQUEST === 'true'
 
 const pwa: VitePWANuxtOptions = {
   mode: isCI ? 'production' : 'development',
-  // disabled PWA only on production
-  disable: !isCI && process.env.VITE_DEV_PWA !== 'true',
+  // disable PWA only in development
+  disable: isDevelopment && process.env.VITE_DEV_PWA !== 'true',
   scope: '/',
   srcDir: './service-worker',
   filename: 'sw.ts',
diff --git a/nuxt.config.ts b/nuxt.config.ts
index a28dae25..28b6c1dc 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,6 +1,6 @@
 import { fileURLToPath } from 'node:url'
 import Inspect from 'vite-plugin-inspect'
-import { isCI } from 'std-env'
+import { isCI, isDevelopment } from 'std-env'
 import { i18n } from './config/i18n'
 import { pwa } from './config/pwa'
 
@@ -73,7 +73,7 @@ export default defineNuxtConfig({
     },
     public: {
       env: isCI ? isPreview ? 'staging' : 'production' : 'local',
-      pwaEnabled: isCI || process.env.VITE_DEV_PWA === 'true',
+      pwaEnabled: !isDevelopment || process.env.VITE_DEV_PWA === 'true',
       translateApi: '',
       // Masto uses Mastodon version checks to see what features are enabled.
       // Mastodon alternatives like GoToSocial will always fail these checks, so
diff --git a/package.json b/package.json
index 35800927..396b7643 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,6 @@
   "homepage": "https://elk.zone/",
   "scripts": {
     "build": "nuxi build",
-    "build:pwa": "VITE_DEV_PWA=true nuxi build",
-    "build:netlify:pwa": "VITE_DEV_PWA=true NITRO_PRESET=netlify nuxi build",
     "dev": "nuxi dev --port 5314",
     "dev:pwa": "VITE_DEV_PWA=true nuxi dev --port 5314",
     "dev:mocked": "nuxi dev --port 5314 --dotenv .env.mock",