🔥 chore(.babelrc): remove unused .babelrc file

✨ feat(.browserslistrc): add .browserslistrc file to specify supported browsers 🔧 chore(.editorconfig): update .editorconfig to include specific file extensions and indentation settings 🔧 chore(.eslintrc.js): update .eslintrc.js to use recommended eslint and vue rules, disable vue/multi-word-component-names rule 🔧 chore(.gitignore): update .gitignore to include pnpm-debug.log* and .stylelintcache files 🔥 chore(.stylelintcache): remove unused .stylelintcache file ✨ feat(.stylelintrc.json): add .stylelintrc.json file to extend stylelint-config-standard-scss 🔧 chore(functions/package.json): remove unused dependencies 🔧 chore(jest.config.js): remove babel-jest transform 🔧 chore(layouts
Doyban · Sep 14, 2023 · 7d8a60b · 7d8a60b
1 parent 7bed4db
commit 7d8a60b
Show file tree

Hide file tree

Showing 22 changed files with 129 additions and 114 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.browserslistrc b/.browserslistrc
@@ -0,0 +1,4 @@
+> 1%
+last 2 versions
+not dead
+not ie 11
diff --git a/.editorconfig b/.editorconfig
@@ -1,13 +1,5 @@
-# editorconfig.org
-root = true
-
-[*]
+[*.{js,jsx,ts,tsx,vue}]
 indent_style = space
 indent_size = 2
-end_of_line = lf
-charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,17 +1,14 @@
 module.exports = {
   root: true,
   env: {
-    browser: true,
     node: true,
   },
   extends: [
-    '@nuxtjs/eslint-config-typescript',
-    'prettier',
-    'prettier/vue',
-    'plugin:prettier/recommended',
-    'plugin:nuxt/recommended',
+    'plugin:vue/vue3-essential',
+    'eslint:recommended',
+    '@vue/eslint-config-typescript',
   ],
-  plugins: ['prettier'],
-  // add your custom rules here
-  rules: {},
+  rules: {
+    'vue/multi-word-component-names': 'off',
+  },
 }
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-debug.log*
 
 # Runtime data
 pids
@@ -91,3 +92,6 @@ sw.*
 
 # Firebase Hosting cache
 .firebase
+
+# Stylelint cache
+.stylelintcache
diff --git a/.stylelintcache b/.stylelintcache
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -0,0 +1,3 @@
+{
+  "extends": "stylelint-config-standard-scss"
+}
diff --git a/functions/package.json b/functions/package.json
@@ -14,7 +14,6 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@nuxt/typescript-runtime": "^2.0.0",
     "@nuxtjs/google-fonts": "^2.0.0",
     "@nuxtjs/pwa": "^3.0.2",
     "firebase-admin": "^11.5.0",

diff --git a/jest.config.js b/jest.config.js
@@ -8,7 +8,6 @@ module.exports = {
   moduleFileExtensions: ['ts', 'js', 'vue', 'json'],
   transform: {
     '^.+\\.ts$': 'ts-jest',
-    '^.+\\.js$': 'babel-jest',
     '.*\\.(vue)$': 'vue-jest',
   },
   collectCoverage: true,

diff --git a/layouts/default.vue b/layouts/default.vue
@@ -9,6 +9,16 @@
 </template>
 
 <style lang="scss">
+.page-enter-active,
+.page-leave-active {
+  transition: all 4s;
+}
+.page-enter-from,
+.page-leave-to {
+  opacity: 0;
+  filter: blur(1rem);
+}
+
 p {
   text-align: justify;
 }

diff --git a/layouts/error.vue b/layouts/error.vue
@@ -9,7 +9,7 @@
       </h1>
       <h2>May the force be with you.</h2>
       <NuxtLink to="/">Return to Home page.</NuxtLink>
-      <v-img :src="require('@/static/pages/404.gif')" />
+      <v-img src="pages/404.gif" />
     </v-col>
   </v-row>
 </template>

diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -1,5 +1,7 @@
 // import colors from 'vuetify/es5/util/colors'
 // import 'vuetify';
+import vuetify from 'vite-plugin-vuetify'
+
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
   // Build Configuration (https://nuxt.com/docs/api/configuration/nuxt-config#build)
@@ -305,11 +307,13 @@ export default defineNuxtConfig({
   // Plugins to run before rendering page (https://go.nuxtjs.dev/config-plugins)
   // plugins: [{ src: '~/plugins/agastya.js', ssr: false }], // "ssr: false" fixes "window is not defined".
 
-  // Auto import components (https://go.nuxtjs.dev/config-components)
-  components: true,
-
   // Modules (https://go.nuxtjs.dev/config-modules)
   modules: [
+    async (options, nuxt) => {
+      nuxt.hooks.hook('vite:extendConfig', config => config.plugins.push(
+        vuetify()
+      ))
+    },
     // https://github.com/nuxt-community/recaptcha-module
     // '@nuxtjs/recaptcha',
     // https://github.com/nuxt-community/sitemap-module
@@ -361,6 +365,7 @@ export default defineNuxtConfig({
 
   // The path to the fallback HTML file. It should be set as the error page, so that also unknown routes are rendered via Nuxt. If set to true, the filename will be 404.html. If working with statically generated pages then it is recommended to use a 404.html for error pages. Multiple services (e.g. Netlify) detect a 404.html automatically, so that's the recommended way to do so in order not to configure error handling on the server.
   generate: { fallback: true },
+  // ssr: false,
 
   // sitemap: {
   //   gzip: true,

diff --git a/package.json b/package.json
@@ -3,11 +3,12 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "build": "nuxt build",
-    "dev": "nuxt dev",
-    "generate": "nuxt generate",
+    "build": "nuxi build",
+    "dev": "nuxi dev",
+    "generate": "nuxi generate",
     "preview": "nuxt preview",
     "postinstall": "nuxt prepare",
+    "start": "nuxi preview",
     "lint:js": "eslint --ext .js,.vue --ignore-path .gitignore .",
     "lint:style": "stylelint **/*.{vue,css} --ignore-path .gitignore",
     "lint": "yarn lint:js && yarn lint:style",
@@ -45,9 +46,6 @@
     "@nuxtjs/stylelint-module": "^5.0.1",
     "@nuxtjs/vuetify": "^1.11.2",
     "@vue/test-utils": "^1.1.0",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.5.0",
     "consola": "^3.0.1",
     "eslint": "^7.10.0",
     "eslint-config-prettier": "^6.12.0",
@@ -57,11 +55,10 @@
     "jest": "^26.5.0",
     "lint-staged": "^10.4.0",
     "nuxt": "^3.7.2",
-    "prettier": "^2.1.2",
-    "stylelint": "^15.4.0",
-    "stylelint-config-prettier": "^8.0.2",
-    "stylelint-config-standard": "^20.0.0",
+    "stylelint": "^15.10.3",
+    "stylelint-config-standard-scss": "^11.0.0",
     "ts-jest": "^26.4.1",
+    "vite-plugin-vuetify": "^1.0.2",
     "vue-jest": "^3.0.4"
   }
 }
diff --git a/pages/About.vue b/pages/About.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import Event from '../interfaces/Event'
 
 const events: Event[] = [

diff --git a/pages/Contact.vue b/pages/Contact.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { ref, Ref } from 'vue'
 import Swal from 'sweetalert2'
 import Privacy from './Privacy.vue'

diff --git a/pages/Cookies.vue b/pages/Cookies.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 // TODO: Add Animate on Scroll (AOL).
 import Policy from '../interfaces/Policy'
 

diff --git a/pages/Games.vue b/pages/Games.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import Feature from '../interfaces/Feature'
 
 const features: Feature[] = [
@@ -265,8 +265,8 @@ useHead({
                 class="elevation-24 mb-2 text-center"
                 color="purple-darken-4"
                 size="64"
-                ><v-icon dark x-large v-text="feature.icon"
-              /></v-avatar>
+                ><v-icon dark x-large>{{ feature.icon }} </v-icon></v-avatar
+              >
             </v-row>
             <h2 class="my-4" v-text="feature.title" />
             <p v-text="feature.description"></p>

diff --git a/pages/Partnerships.vue b/pages/Partnerships.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 const partnerships = [
   {
     perks: [

diff --git a/pages/index.vue b/pages/index.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 const pointsAbout = [
   {
     description:

diff --git a/plugins/vuetify.ts b/plugins/vuetify.ts
@@ -1,14 +1,10 @@
-import "@mdi/font/css/materialdesignicons.css";
+import "@mdi/font/css/materialdesignicons.min.css";
 import 'vuetify/styles'
-import * as components from 'vuetify/components'
-import * as directives from 'vuetify/directives'
 import { createVuetify } from 'vuetify'
 
 export default defineNuxtPlugin(nuxtApp => {
   const vuetify = createVuetify({
     ssr: true,
-    components,
-    directives,
   })
 
   nuxtApp.vueApp.use(vuetify)

diff --git a/stylelint.config.js b/stylelint.config.js