- Upgrade sass to newest version (with warining :( )

- Add tabler-icons 1.x for lib-vue2 to fix using vue2 instead vue3
MerginMaps · Dec 5, 2023 · ca519b4 · ca519b4
1 parent dcc67b2
commit ca519b4
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 10 deletions.
diff --git a/web-app/package.json b/web-app/package.json
@@ -33,9 +33,12 @@
     "link:unregister": "yarn workspaces run link:unregister",
     "types:libs": "yarn workspaces run build:types",
     "types:lib": "yarn workspace @mergin/lib build:types",
+    "types:lib-vue2": "yarn workspace @mergin/lib-vue2 build:types",
     "types:admin-lib": "yarn workspace @mergin/admin-lib build:types",
     "watch:lib": "yarn workspace @mergin/lib build:lib:watch",
+    "watch:lib-vue2": "yarn workspace @mergin/lib-vue2 build:lib:watch",
     "watch:lib:types": "yarn workspace @mergin/lib build:types:watch",
+    "watch:lib-vue2:types": "yarn workspace @mergin/lib-vue2 build:types:watch",
     "watch:admin-lib": "yarn workspace @mergin/admin-lib build:lib:watch",
     "watch:admin-lib:types": "yarn workspace @mergin/admin-lib build:types:watch",
     "lint:all": "yarn workspaces run lint"
@@ -77,7 +80,5 @@
     "node": ">=17"
   },
   "version": "0.0.0",
-  "dependencies": {
-    "sass": "^1.62.1"
-  }
+  "dependencies": {}
 }
diff --git a/web-app/packages/admin-app/package.json b/web-app/packages/admin-app/package.json
@@ -31,11 +31,12 @@
     "pdfjs-dist": "2.5.207",
     "pinia": "^2.1.7",
     "portal-vue": "^2.1.7",
+    "sass": "^1.69.5",
     "vue": "^2.7.14",
     "vue-i18n": "^8.28.2",
     "vue-meta": "^2.4.0",
     "vue-router": "^3.6.5",
-    "vue-tabler-icons": "~1.13.0",
+    "vue-tabler-icons": "^1.0",
     "vuetify": "^2.6.15"
   }
 }
diff --git a/web-app/packages/admin-app/vite.config.ts b/web-app/packages/admin-app/vite.config.ts
@@ -26,6 +26,14 @@ export default defineConfig(({ mode }) => ({
     })
   ],
 
+  css: {
+    preprocessorOptions: {
+      sass: {
+        quietDeps: true
+      }
+    }
+  },
+
   resolve: {
     alias: {
       '@': resolve(__dirname, './src'),

diff --git a/web-app/packages/admin-lib/vite.config.ts b/web-app/packages/admin-lib/vite.config.ts
@@ -19,6 +19,13 @@ export default defineConfig(({ mode }) => ({
     }) /*, vuetify() */
   ],
   publicDir: './src/assets',
+  css: {
+    preprocessorOptions: {
+      sass: {
+        quietDeps: true
+      }
+    }
+  },
 
   resolve: {
     alias: {

diff --git a/web-app/packages/lib-vue2/package.json b/web-app/packages/lib-vue2/package.json
@@ -47,6 +47,7 @@
     "universal-cookie": "^4.0.4",
     "vue": "^2.7.14",
     "vue-router": "^3.6.5",
+    "vue-tabler-icons": "^1.0",
     "vuetify": "^2.6.15"
   },
   "peerDependencies": {

diff --git a/web-app/packages/lib-vue2/vite.config.ts b/web-app/packages/lib-vue2/vite.config.ts
@@ -27,6 +27,13 @@ export default defineConfig(({ mode }) => ({
     })
   ],
   publicDir: './src/assets',
+  css: {
+    preprocessorOptions: {
+      scss: {
+        quietDeps: true
+      }
+    }
+  },
 
   resolve: {
     alias: {
@@ -71,7 +78,7 @@ export default defineConfig(({ mode }) => ({
     }
   },
   optimizeDeps: {
-    exclude: ['vue', '@mergin'],
+    exclude: ['vue', '@mergin', 'vue-demi'],
     esbuildOptions: {
       define: {
         global: 'globalThis'

diff --git a/web-app/yarn.lock b/web-app/yarn.lock
@@ -3054,7 +3054,7 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.62.1:
+sass@^1.69.5:
   version "1.69.5"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde"
   integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==
@@ -3526,10 +3526,10 @@ vue-router@^4.1.6:
   dependencies:
     "@vue/devtools-api" "^6.5.0"
 
-vue-tabler-icons@~1.13.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/vue-tabler-icons/-/vue-tabler-icons-1.13.0.tgz#ff8a67975e891d4ae677c43a4d63fc64d01b770f"
-  integrity sha512-e4pYD4XqWvuOvvGGiR3kPCLMggEr780jdgnhGF8QNaK52pQgtS2GW/iXYzKV+bka+Yy2+SmCgyp3xduWW64/Kg==
+vue-tabler-icons@^1.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/vue-tabler-icons/-/vue-tabler-icons-1.14.0.tgz#df0027906f225c1501c2d1cfa9d844f8d50bc428"
+  integrity sha512-ZFYo5RWXhp9/Ky8CFWUQ65x2oZy0YkwdfB4b2+tT/hPqGdieQfa303UiiFeNMHFYrNSGouDAN1LvpDxaN/4X2g==
 
 vue-tabler-icons@~2.20.0:
   version "2.20.0"