From 514601aea21a028c68a0ca6132500c2d38d71a00 Mon Sep 17 00:00:00 2001 From: wouter-adriaens Date: Thu, 9 Jan 2025 15:47:50 +0100 Subject: [PATCH 1/2] Fix dependency issues --- package.json | 11 +++++++---- vite.config.ts | 7 +------ yarn.lock | 10 +++++----- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 7e9f3f2..0160059 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,7 @@ "./dist/scss/main.scss": { "import": "./dist/scss/main.scss", "require": "./dist/scss/main.scss" - } - , + }, "./eslint": { "import": "./dist/eslint.config.js", "require": "./dist/eslint.config.js" @@ -77,16 +76,18 @@ "ol": "^7.4.0", "ol-contextmenu": "^5.2.1", "ol-ext": "^4.0.10", - "pinia": "^2.1.7", "proj4": "^2.9.0", "pyoes": "https://gitpkg.now.sh/OnroerendErfgoed/pyoes/npm-packages/pyoes?0.21.1", "quill-html-edit-button": "^3.0.0", "quill-toggle-fullscreen-button": "^0.1.3", "uuid": "^9.0.0", - "vue": "^3.5.12", "vue-i18n": "9", "vue-quilly": "^1.0.5" }, + "peerDependencies": { + "pinia": "^2.3.0", + "vue": "^3.5.13" + }, "devDependencies": { "@intlify/unplugin-vue-i18n": "^0.10.0", "@rushstack/eslint-patch": "^1.2.0", @@ -119,6 +120,7 @@ "eslint-plugin-vue": "^9.32.0", "npm-run-all": "^4.1.5", "path": "^0.12.7", + "pinia": "^2.3.0", "prettier": "^2.8.4", "react": "^19.0.0", "react-dom": "^19.0.0", @@ -131,6 +133,7 @@ "typescript": "^5.7.2", "vite": "^5.4.10", "vite-plugin-static-copy": "^1.0.6", + "vue": "^3.5.13", "vue-eslint-parser": "^9.1.1", "vue-tsc": "^2.2.0" } diff --git a/vite.config.ts b/vite.config.ts index 3770159..da359f5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,6 +1,5 @@ import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'; import vue from '@vitejs/plugin-vue'; -import { builtinModules } from 'module'; import { resolve } from 'path'; import { visualizer } from 'rollup-plugin-visualizer'; import { defineConfig } from 'vite'; @@ -18,11 +17,7 @@ export default defineConfig({ }, sourcemap: true, rollupOptions: { - external: (id) => { - const externalModules = ['vue', 'pinia']; - // Exclude specific external modules, all node_modules, and built-in modules - return externalModules.includes(id) || id.includes('node_modules') || builtinModules.includes(id); - }, + external: ['vue', 'pinia'], output: { exports: 'named', assetFileNames: (assetInfo) => { diff --git a/yarn.lock b/yarn.lock index fd36eae..8a7afad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5873,7 +5873,7 @@ pify@^3.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== -pinia@^2.1.7: +pinia@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.3.0.tgz#b81f4ac7da1031af8d8f7007686c4b2799a55b9f" integrity sha512-ohZj3jla0LL0OH5PlLTDMzqKiVw2XARmC1XYLdLWIPBMdhDW/123ZWr4zVAhtJm+aoSkFa13pYXskAvAscIkhQ== @@ -7357,9 +7357,9 @@ typescript-eslint@^8.18.1: "@typescript-eslint/utils" "8.19.1" typescript@^5.0.0, typescript@^5.7.2: - version "5.7.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6" - integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg== + version "5.7.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.3.tgz#919b44a7dbb8583a9b856d162be24a54bf80073e" + integrity sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw== uglify-js@^3.1.4: version "3.19.3" @@ -7668,7 +7668,7 @@ vue@^2.5.16: "@vue/compiler-sfc" "2.7.16" csstype "^3.1.0" -vue@^3.0.0, vue@^3.5.12, vue@^3.5.13: +vue@^3.0.0, vue@^3.5.13: version "3.5.13" resolved "https://registry.yarnpkg.com/vue/-/vue-3.5.13.tgz#9f760a1a982b09c0c04a867903fc339c9f29ec0a" integrity sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ== From 86a49b5e9b510b0243f1e6f1ec7c2b6a27e1e10c Mon Sep 17 00:00:00 2001 From: wouter-adriaens Date: Thu, 9 Jan 2025 16:11:54 +0100 Subject: [PATCH 2/2] Set patch release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0160059..8c273c2 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "main": "./dist/vue-components.umd.js", "module": "./dist/vue-components.es.js", "typings": "./dist/src/main.d.ts", - "version": "2.0.0", + "version": "2.0.1", "exports": { ".": { "import": "./dist/vue-components.es.js",