perf: move env files

starter-collective · Dec 5, 2023 · dabfef9 · dabfef9
1 parent 858e114
commit dabfef9
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 38 deletions.
diff --git a/.vite/constants.ts b/.vite/constants.ts
diff --git a/.vite/env/.env.development → env/.env.development b/.vite/env/.env.development → env/.env.development
@@ -1,2 +1,4 @@
 VITE_ENV_MODE = development
 VITE_BASE_URL = /
+
+APP_NAME = "Opuntia"
diff --git a/.vite/env/.env.production → env/.env.production b/.vite/env/.env.production → env/.env.production
@@ -1,2 +1,4 @@
 VITE_ENV_MODE = production
 VITE_BASE_URL = /
+
+APP_NAME = "Opuntia"
diff --git a/.vite/env/.env.staging → env/.env.staging b/.vite/env/.env.staging → env/.env.staging
@@ -1,2 +1,4 @@
 VITE_ENV_MODE = staging
 VITE_BASE_URL = /
+
+APP_NAME = "Opuntia"
diff --git a/index.html b/index.html
@@ -1,13 +1,16 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.svg">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Opuntia</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
+
+<head>
+  <meta charset="UTF-8">
+  <link rel="icon" href="/favicon.svg">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Opuntia</title>
+</head>
+
+<body>
+  <div id="app" />
+  <script type="module" src="/src/main.ts"></script>
+</body>
+
 </html>
diff --git a/package.json b/package.json
@@ -13,11 +13,11 @@
     "dev": "vite",
     "build": "run-p type-check build-only",
     "preview": "vite preview",
+    "test": "vitest",
     "test:unit": "vitest",
-    "test:e2e": "start-server-and-test preview http://localhost:4173 'cypress run --e2e'",
-    "test:e2e:dev": "start-server-and-test 'vite dev --port 4173' http://localhost:4173 'cypress open --e2e'",
+    "test:e2e": "cypress open",
     "build-only": "vite build",
-    "type-check": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false"
+    "type-check": "vue-tsc --noEmit"
   },
   "dependencies": {
     "pinia": "^2.1.7",

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,12 +1,10 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.json",
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
   "compilerOptions": {
-    "composite": true,
-    "lib": ["DOM", "ESNext"],
     "baseUrl": ".",
     "paths": {
       "@/*": [
-        "./src/*"
+        "src/*"
       ]
     },
     "types": [
@@ -18,14 +16,11 @@
     "noUnusedLocals": true
   },
   "include": [
-    "env.d.ts",
+    "mock/**/*",
     "src/**/*",
-    "src/**/*.vue",
+    "types/**/*",
     "vite.config.*",
-    "vitest.config.*",
-    "cypress.config.*",
-    "nightwatch.conf.*",
-    "playwright.config.*"
+    "cypress.config.*"
   ],
   "exclude": [
     "node_modules",

diff --git a/types/env.d.ts b/types/env.d.ts
@@ -1 +1,10 @@
 /// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_ENV_MODE: string
+  readonly VITE_BASE_URL: string
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv
+}
diff --git a/vite.config.ts b/vite.config.ts
@@ -6,7 +6,7 @@ import vueJsx from '@vitejs/plugin-vue-jsx'
 export default (options: ConfigEnv) => {
   const { mode } = options
 
-  const envDir = '.vite/env/'
+  const envDir = 'env/'
 
   const env = loadEnv(mode, envDir, ['VITE_', 'APP_', 'AXIOS_'])
 

diff --git a/vitest.config.ts b/vitest.config.ts