Merge pull request #215 from BizziQuest/16-Users-should-be-able-to-sp…

…ecify-dependencies-for-lists 16 users should be able to specify dependencies for lists
BizziQuest · Sep 15, 2023 · 11e6403 · 11e6403
2 parents c353b99 + ddee86b
commit 11e6403
Show file tree

Hide file tree

Showing 20 changed files with 3,226 additions and 1,212 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -23,6 +23,7 @@ module.exports = {
     'plugin:vue/vue3-recommended',
     '@vue/airbnb',
     'plugin:vue/vue3-essential',
+    "prettier"
   ],
 
   rules: {

diff --git a/.prettierrc b/.prettierrc
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,6 @@
+{
+  "printWidth": 120,
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "tabWidth": 2
+}
diff --git a/cypress.config.js b/cypress.config.js
@@ -4,7 +4,9 @@ module.exports = defineConfig({
   fixturesFolder: 'tests/e2e/fixtures',
   screenshotsFolder: 'tests/e2e/screenshots',
   videosFolder: 'tests/e2e/videos',
-
+  experimentalMemoryManagement: true,
+  experimentalStudio: true,
+  experimentalInteractiveRunEvents: true,
   e2e: {
     // We've imported your old cypress plugins here.
     // You may want to clean this up later by importing these.
@@ -13,12 +15,17 @@ module.exports = defineConfig({
     },
     specPattern: 'tests/e2e/specs/**/*.cy.{js,jsx,ts,tsx}',
     supportFile: 'tests/e2e/support/index.js',
-  },
+    experimentalStudio: true,
+    experimentalInteractiveRunEvents: true,
+    },
 
   component: {
     devServer: {
       framework: 'vue',
       bundler: 'vite',
     },
+    experimentalMemoryManagement: true,
+    // experimentalStudio: true,
+    experimentalInteractiveRunEvents: true,
   },
 });
diff --git a/index.html b/index.html
@@ -2,6 +2,13 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
+    <!-- Google Tag Manager -->
+    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+    'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','GTM-WMG3PNX');</script>
+    <!-- End Google Tag Manager -->
     <!-- <meta name="theme-color" content="#fff176"> -->
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -14,6 +21,10 @@
     <script type="module" src="/src/main.js"></script>
   </head>
   <body>
+    <!-- Google Tag Manager (noscript) -->
+    <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WMG3PNX"
+    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+    <!-- End Google Tag Manager (noscript) -->
     <noscript>
       <strong>We're sorry but QuestLists doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>

diff --git a/jest.config.js → jest.config.cjs b/jest.config.js → jest.config.cjs
@@ -1,21 +1,22 @@
 module.exports = {
-  preset: '@vue/cli-plugin-unit-jest',
+  // preset: '@vue/cli-plugin-unit-jest',
   // some says to put it inside package.json
   // testEnvironment: '<rootDir>/tests/firebaseWorkaround.js',
-  moduleFileExtensions: ['js', 'json', 'vue'],
+  moduleFileExtensions: ['js', 'ts', 'json', 'vue'],
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/src/$1',
   },
+
   modulePaths: [
     '<rootDir>/src',
     '<rootDir>/node_modules',
   ],
   transform: {
-    '^.+\\.js$': 'babel-jest',
-    '^.+\\.vue$': 'vue-jest',
+    '^.+\\.ts$': 'ts-jest',
+    '^.+\\.vue$': '@vue/vue3-jest',
   },
   collectCoverage: false,
-  collectCoverageFrom: ['**/*.{js,vue}', '!**/node_modules/**'],
+  collectCoverageFrom: ['**/*.{js,vue,ts}', '!**/node_modules/**'],
   setupFiles: ['<rootDir>tests/setupJest.js'],
   snapshotSerializers: ['jest-serializer-vue'],
 };
diff --git a/package.json b/package.json
@@ -1,21 +1,26 @@
 {
   "name": "questlistsfb",
   "version": "0.1.0",
+  "license": "MIT",
+  "main": "src/main.js",
   "private": true,
   "scripts": {
     "serve": "vite --mode development",
     "build": "vite build --mode production",
     "test:unit": "vue-cli-service test:unit --mode=development",
     "test:e2e": "vue-cli-service test:e2e",
-    "lint": "vue-cli-service lint",
+    "lint": "eslint --ext .js,.vue --ignore-path .gitignore src",
+    "lint:fix": "eslint --ext .js,.vue --ignore-path .gitignore --fix src",
+    "format": "prettier --ignore-path .gitignore --check .",
+    "format:save": "prettier --ignore-path .gitignore --write .",
     "build-storybook": "build-storybook",
     "ci": "CI=true firebase emulators:exec --only firestore,auth 'CI=true yarn test:e2e --headless && yarn test:unit'",
     "ci:e2e": "firebase emulators:exec --only firestore,auth 'yarn test:e2e --headless --mode=development'",
     "ci:e2e:clean": "firebase emulators:exec --only firestore,auth 'yarn test:e2e'",
     "ci:unit": "firebase emulators:exec --only firestore,auth 'yarn test:unit --detectOpenHandles --forceExit'",
     "container": "yarn fb:emulate; yarn serve",
     "dev": "firebase emulators:exec --only firestore,auth --ui 'pnpm serve'",
-    "fb:cypress": "firebase emulators:exec --only firestore,auth 'npx cypress open'",
+    "fb:cypress": "firebase emulators:exec --only firestore,auth 'pnpm cypress open'",
     "fb:deploy": "firebase deploy",
     "fb:dev": "firebase emulators:exec --only firestore,auth --ui --import tests/data 'pnpm serve --open'",
     "fb:dev:clean": "firebase emulators:exec --only firestore,auth 'yarn serve --open'",
@@ -51,11 +56,11 @@
     "slugify": "^1.6.6",
     "storybook": "^7.0.2",
     "vite-plugin-pwa": "^0.14.7",
-    "vue": "^3.2.47",
+    "vue": "^3.3.1",
     "vue-i18n": "^9.2.2",
     "vue-instantsearch": "^4.8.9",
     "vue-router": "^4.1.6",
-    "vuetify": "^3.1.13",
+    "vuetify": "^3.3.5",
     "vuex": "^4.1.0",
     "webpack": "^5.78.0",
     "yorkie": "^2.0.0"
@@ -73,22 +78,22 @@
     "@vue/test-utils": "^2.3.2",
     "@vue/vue3-jest": "^29.2.3",
     "css-loader": "^6.7.3",
-    "cypress": "^12.9.0",
+    "cypress": "^12.10.0",
     "cypress-dotenv": "^2.0.0",
     "eslint": "^8.37.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-vue": "^9.10.0",
     "eslint-plugin-vuejs-accessibility": "^2.1.0",
     "firebase-admin": "^11.6.0",
     "firebase-functions": "^4.2.1",
-    "firebase-tools": "^11.25.3",
+    "firebase-tools": "^12.4.2",
     "flush-promises": "^1.0.2",
     "jest-environment-node": "^29.5.0",
+    "ts-jest": "^29.1.0",
     "vite": "^4.2.1",
     "vite-plugin-vuetify": "^1.0.2",
-    "vitest": "^0.29.8",
-    "vue-cli-plugin-vuetify": "~2.5.8"
-  },
-  "license": "MIT"
+    "vitest": "^0.29.8"
+  }
 }