Revert "refactor: move project config into src"

This reverts commit 3b1acc9.
haoranpb · Mar 31, 2021 · 1a3b990 · 1a3b990
1 parent 3b1acc9
commit 1a3b990
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 20 deletions.
diff --git a/src/index.html → index.html b/src/index.html → index.html
@@ -13,6 +13,6 @@
   </head>
   <body>
     <div id="app"></div>
-    <script type="module" src="/main.js"></script>
+    <script type="module" src="/src/main.js"></script>
   </body>
 </html>
diff --git a/package.json b/package.json
@@ -9,16 +9,21 @@
   ],
   "scripts": {
     "ci": "yarn install --frozen-lockfile --ignore-engines",
-    "dev": "yarn workspace @oflatmate/src dev",
-    "build": "yarn workspace @oflatmate/src build",
-    "serve": "yarn workspace @oflatmate/src preview",
+    "dev": "vite",
+    "build": "vite build",
+    "serve": "vite preview --port=3000",
     "lint": "eslint src/**/*.{js,vue} felafel/*.{js,vue} functions/*.js utils/*.js *.js --fix",
     "emulate": "firebase emulators:start --import=./tmp-data --export-on-exit",
     "deploy:func": "firebase deploy --only functions",
     "env": "yarn env:unset && yarn env:set",
     "env:set": "firebase functions:config:set env=\"$(cat functions/env.json)\"",
     "env:unset": "firebase functions:config:unset env"
   },
+  "dependencies": {
+    "@vitejs/plugin-vue": "^1.1.5",
+    "@vue/compiler-sfc": "^3.0.7",
+    "vite": "^2.0.5"
+  },
   "devDependencies": {
     "eslint": "^6.7.2",
     "eslint-plugin-prettier": "^3.3.0",

diff --git a/src/postcss.config.js → postcss.config.js b/src/postcss.config.js → postcss.config.js
diff --git a/src/public/favicon.ico → public/favicon.ico b/src/public/favicon.ico → public/favicon.ico
diff --git a/src/public/user-circle-solid.svg → public/user-circle-solid.svg b/src/public/user-circle-solid.svg → public/user-circle-solid.svg
diff --git a/src/package.json b/src/package.json
@@ -6,11 +6,6 @@
   "author": "Haoran",
   "license": "MIT",
   "private": true,
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "serve": "vite preview --port=3000"
-  },
   "dependencies": {
     "vue": "^3.0.7",
     "vuex": "^4.0.0",
@@ -26,9 +21,6 @@
   },
   "devDependencies": {
     "autoprefixer": "^10.2.4",
-    "postcss": "^8.2.6",
-    "@vitejs/plugin-vue": "^1.1.5",
-    "@vue/compiler-sfc": "^3.0.7",
-    "vite": "^2.0.5"
+    "postcss": "^8.2.6"
   }
 }
diff --git a/src/tailwind.config.js → tailwind.config.js b/src/tailwind.config.js → tailwind.config.js
@@ -1,7 +1,7 @@
 const colors = require('tailwindcss/colors')
 
 module.exports = {
-  purge: ['./index.html', './**/*.{vue,js}', '../felafel/*.{vue,js}'],
+  purge: ['./index.html', './src/**/*.{vue,js}', './felafel/*.{vue,js}'],
   darkMode: 'class',
   theme: {
     extend: {

diff --git a/src/vite.config.js → vite.config.js b/src/vite.config.js → vite.config.js
@@ -6,11 +6,7 @@ export default defineConfig({
   plugins: [vue()],
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, './'),
+      '@': path.resolve(__dirname, './src'),
     },
   },
-  build: {
-    outDir: '../dist',
-    emptyOutDir: true,
-  },
 })
diff --git a/yarn.lock b/yarn.lock
@@ -1513,7 +1513,7 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-dompurify@^2.2.7:
+dompurify@^2.2.6, dompurify@^2.2.7:
   version "2.2.7"
   resolved "https://registry.npmjs.org/dompurify/-/dompurify-2.2.7.tgz#a5f055a2a471638680e779bd08fc334962d11fd8"
   integrity sha512-jdtDffdGNY+C76jvodNTu9jt5yYj59vuTUyx+wXdzcSwAGTYZDAQkQ7Iwx9zcGrA4ixC1syU4H3RZROqRxokxg==