From d0b15fecb5085469241bdd1a36d8b04ba3754150 Mon Sep 17 00:00:00 2001 From: Eduardo San Martin Morote Date: Tue, 26 Apr 2022 08:50:03 +0200 Subject: [PATCH] build: unify vue dependency --- package.json | 3 + packages/pinia/package.json | 5 +- packages/pinia/src/store.ts | 1 + packages/playground/package.json | 2 - pnpm-lock.yaml | 139 ++++++++++--------------------- tsconfig.json | 2 +- 6 files changed, 51 insertions(+), 101 deletions(-) diff --git a/package.json b/package.json index 775a46a5..58ddd12f 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,8 @@ "@types/jest": "^27.4.1", "@types/lodash.kebabcase": "^4.1.7", "@types/node": "^16.11.29", + "@vue/compiler-sfc": "^3.2.33", + "@vue/server-renderer": "^3.2.33", "chalk": "^4.1.2", "conventional-changelog-cli": "^2.2.2", "enquirer": "^2.3.6", @@ -50,6 +52,7 @@ "typedoc": "^0.22.15", "typedoc-plugin-markdown": "^3.12.1", "typescript": "^4.6.3", + "vue": "^3.2.33", "yorkie": "^2.0.0" }, "gitHooks": { diff --git a/packages/pinia/package.json b/packages/pinia/package.json index ae018dee..515325b3 100644 --- a/packages/pinia/package.json +++ b/packages/pinia/package.json @@ -69,10 +69,7 @@ "license": "MIT", "devDependencies": { "@microsoft/api-extractor": "7.19.2", - "@vue/compiler-sfc": "^3.2.33", - "@vue/server-renderer": "^3.2.33", - "@vue/test-utils": "^2.0.0-rc.21", - "vue": "^3.2.33" + "@vue/test-utils": "^2.0.0-rc.21" }, "dependencies": { "@vue/devtools-api": "^6.1.4", diff --git a/packages/pinia/src/store.ts b/packages/pinia/src/store.ts index 5aad26e8..3d5f3db9 100644 --- a/packages/pinia/src/store.ts +++ b/packages/pinia/src/store.ts @@ -200,6 +200,7 @@ function createSetupStore< ) /* istanbul ignore if */ + // @ts-expect-error: active is an internal property if (__DEV__ && !pinia._e.active) { throw new Error('Pinia destroyed') } diff --git a/packages/playground/package.json b/packages/playground/package.json index 76a297cb..cb207fca 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -12,12 +12,10 @@ "vite": "^2.8.1" }, "dependencies": { - "@vue/compiler-sfc": "^3.2.30", "@vueuse/core": "^7.6.1", "mande": "^1.0.0", "pinia": "^2.0.0-rc.4", "swrv": "^1.0.0-beta.8", - "vue": "^3.2.30", "vue-promised": "^2.2.0", "vue-router": "^4.0.12" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ed019766..bf4ee768 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,6 +12,8 @@ importers: '@types/jest': ^27.4.1 '@types/lodash.kebabcase': ^4.1.7 '@types/node': ^16.11.29 + '@vue/compiler-sfc': ^3.2.33 + '@vue/server-renderer': ^3.2.33 chalk: ^4.1.2 conventional-changelog-cli: ^2.2.2 enquirer: ^2.3.6 @@ -34,6 +36,7 @@ importers: typedoc: ^0.22.15 typedoc-plugin-markdown: ^3.12.1 typescript: ^4.6.3 + vue: ^3.2.33 yorkie: ^2.0.0 devDependencies: '@rollup/plugin-alias': 3.1.9_rollup@2.70.2 @@ -44,6 +47,8 @@ importers: '@types/jest': 27.4.1 '@types/lodash.kebabcase': 4.1.7 '@types/node': 16.11.29 + '@vue/compiler-sfc': 3.2.33 + '@vue/server-renderer': 3.2.33_vue@3.2.33 chalk: 4.1.2 conventional-changelog-cli: 2.2.2 enquirer: 2.3.6 @@ -66,6 +71,7 @@ importers: typedoc: 0.22.15_typescript@4.6.3 typedoc-plugin-markdown: 3.12.1_typedoc@0.22.15 typescript: 4.6.3 + vue: 3.2.33 yorkie: 2.0.0 packages/docs: @@ -74,7 +80,7 @@ importers: pinia: ^2.0.0 vitepress: ^0.22.2 dependencies: - '@vueuse/core': 7.7.1 + '@vueuse/core': 7.7.1_vue@3.2.33 pinia: link:../pinia vitepress: 0.22.3 @@ -85,7 +91,7 @@ importers: unbuild: ^0.7.4 vue-demi: '*' dependencies: - vue-demi: 0.12.5 + vue-demi: 0.12.5_vue@3.2.33 devDependencies: '@nuxt/types': 2.15.8 pinia: link:../pinia @@ -94,45 +100,35 @@ importers: packages/pinia: specifiers: '@microsoft/api-extractor': 7.19.2 - '@vue/compiler-sfc': ^3.2.33 '@vue/devtools-api': ^6.1.4 - '@vue/server-renderer': ^3.2.33 '@vue/test-utils': ^2.0.0-rc.21 - vue: ^3.2.33 vue-demi: '*' dependencies: '@vue/devtools-api': 6.1.4 vue-demi: 0.12.5_vue@3.2.33 devDependencies: '@microsoft/api-extractor': 7.19.2 - '@vue/compiler-sfc': 3.2.33 - '@vue/server-renderer': 3.2.33_vue@3.2.33 '@vue/test-utils': 2.0.0-rc.21_vue@3.2.33 - vue: 3.2.33 packages/playground: specifiers: '@vitejs/plugin-vue': ^2.2.0 - '@vue/compiler-sfc': ^3.2.30 '@vueuse/core': ^7.6.1 mande: ^1.0.0 pinia: ^2.0.0-rc.4 swrv: ^1.0.0-beta.8 vite: ^2.8.1 - vue: ^3.2.30 vue-promised: ^2.2.0 vue-router: ^4.0.12 dependencies: - '@vue/compiler-sfc': 3.2.31 - '@vueuse/core': 7.7.1_vue@3.2.31 + '@vueuse/core': 7.7.1_vue@3.2.33 mande: 1.0.1 pinia: link:../pinia - swrv: 1.0.0-beta.8_vue@3.2.31 - vue: 3.2.31 - vue-promised: 2.2.0_vue@3.2.31 - vue-router: 4.0.14_vue@3.2.31 + swrv: 1.0.0-beta.8_vue@3.2.33 + vue-promised: 2.2.0_vue@3.2.33 + vue-router: 4.0.14_vue@3.2.33 devDependencies: - '@vitejs/plugin-vue': 2.3.1_vite@2.9.0+vue@3.2.31 + '@vitejs/plugin-vue': 2.3.1_vite@2.9.0+vue@3.2.33 vite: 2.9.0 packages/size-check: @@ -152,7 +148,7 @@ importers: siroc: ^0.16.0 vue-demi: '*' dependencies: - vue-demi: 0.12.5 + vue-demi: 0.12.5_vue@3.2.33 devDependencies: pinia: link:../pinia siroc: 0.16.0 @@ -1225,7 +1221,7 @@ packages: /@types/babel__template/7.4.1: resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==} dependencies: - '@babel/parser': 7.17.8 + '@babel/parser': 7.17.9 '@babel/types': 7.17.0 dev: true @@ -1547,6 +1543,18 @@ packages: dependencies: vite: 2.9.0 vue: 3.2.31 + dev: false + + /@vitejs/plugin-vue/2.3.1_vite@2.9.0+vue@3.2.33: + resolution: {integrity: sha512-YNzBt8+jt6bSwpt7LP890U1UcTOIZZxfpE5WOJ638PNxSEKOqAi0+FSKS0nVeukfdZ0Ai/H7AFd6k3hayfGZqQ==} + engines: {node: '>=12.0.0'} + peerDependencies: + vite: ^2.5.10 + vue: ^3.2.25 + dependencies: + vite: 2.9.0 + vue: 3.2.33 + dev: true /@vue/compiler-core/3.2.31: resolution: {integrity: sha512-aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ==} @@ -1560,7 +1568,7 @@ packages: /@vue/compiler-core/3.2.33: resolution: {integrity: sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw==} dependencies: - '@babel/parser': 7.17.8 + '@babel/parser': 7.17.9 '@vue/shared': 3.2.33 estree-walker: 2.0.2 source-map: 0.6.1 @@ -1598,7 +1606,7 @@ packages: /@vue/compiler-sfc/3.2.33: resolution: {integrity: sha512-H8D0WqagCr295pQjUYyO8P3IejM3vEzeCO1apzByAEaAR/WimhMYczHfZVvlCE/9yBaEu/eu9RdiWr0kF8b71Q==} dependencies: - '@babel/parser': 7.17.8 + '@babel/parser': 7.17.9 '@vue/compiler-core': 3.2.33 '@vue/compiler-dom': 3.2.33 '@vue/compiler-ssr': 3.2.33 @@ -1641,7 +1649,7 @@ packages: /@vue/reactivity-transform/3.2.33: resolution: {integrity: sha512-4UL5KOIvSQb254aqenW4q34qMXbfZcmEsV/yVidLUgvwYQQ/D21bGX3DlgPUGI3c4C+iOnNmDCkIxkILoX/Pyw==} dependencies: - '@babel/parser': 7.17.8 + '@babel/parser': 7.17.9 '@vue/compiler-core': 3.2.33 '@vue/shared': 3.2.33 estree-walker: 2.0.2 @@ -1726,7 +1734,7 @@ packages: vue: 3.2.33 dev: true - /@vueuse/core/7.7.1: + /@vueuse/core/7.7.1_vue@3.2.33: resolution: {integrity: sha512-PRRgbATMpoeUmkCEBtUeJgOwtew8s+4UsEd+Pm7MhkjL2ihCNrSqxNVtM6NFE4uP2sWnkGcZpCjPuNSxowJ1Ow==} peerDependencies: '@vue/composition-api': ^1.1.0 @@ -1737,41 +1745,12 @@ packages: vue: optional: true dependencies: - '@vueuse/shared': 7.7.1 - vue-demi: 0.12.5 - dev: false - - /@vueuse/core/7.7.1_vue@3.2.31: - resolution: {integrity: sha512-PRRgbATMpoeUmkCEBtUeJgOwtew8s+4UsEd+Pm7MhkjL2ihCNrSqxNVtM6NFE4uP2sWnkGcZpCjPuNSxowJ1Ow==} - peerDependencies: - '@vue/composition-api': ^1.1.0 - vue: ^2.6.0 || ^3.2.0 - peerDependenciesMeta: - '@vue/composition-api': - optional: true - vue: - optional: true - dependencies: - '@vueuse/shared': 7.7.1_vue@3.2.31 - vue: 3.2.31 - vue-demi: 0.12.5_vue@3.2.31 - dev: false - - /@vueuse/shared/7.7.1: - resolution: {integrity: sha512-rN2qd22AUl7VdBxihagWyhUNHCyVk9IpvBTTfHoLH9G7rGE552X1f+zeCfehuno0zXif13jPw+icW/wn2a0rnQ==} - peerDependencies: - '@vue/composition-api': ^1.1.0 - vue: ^2.6.0 || ^3.2.0 - peerDependenciesMeta: - '@vue/composition-api': - optional: true - vue: - optional: true - dependencies: - vue-demi: 0.12.5 + '@vueuse/shared': 7.7.1_vue@3.2.33 + vue: 3.2.33 + vue-demi: 0.12.5_vue@3.2.33 dev: false - /@vueuse/shared/7.7.1_vue@3.2.31: + /@vueuse/shared/7.7.1_vue@3.2.33: resolution: {integrity: sha512-rN2qd22AUl7VdBxihagWyhUNHCyVk9IpvBTTfHoLH9G7rGE552X1f+zeCfehuno0zXif13jPw+icW/wn2a0rnQ==} peerDependencies: '@vue/composition-api': ^1.1.0 @@ -1782,8 +1761,8 @@ packages: vue: optional: true dependencies: - vue: 3.2.31 - vue-demi: 0.12.5_vue@3.2.31 + vue: 3.2.33 + vue-demi: 0.12.5_vue@3.2.33 dev: false /@yarn-tool/resolve-package/1.0.46_@types+node@16.11.29: @@ -4528,7 +4507,7 @@ packages: /jsonfile/4.0.0: resolution: {integrity: sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=} optionalDependencies: - graceful-fs: 4.2.9 + graceful-fs: 4.2.10 dev: true /jsonfile/6.1.0: @@ -6014,12 +5993,12 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - /swrv/1.0.0-beta.8_vue@3.2.31: + /swrv/1.0.0-beta.8_vue@3.2.33: resolution: {integrity: sha512-MsjaMOvZODfM0cess/HhbSrNbAotYinv4vzipLckKYBo/QmrvjNUPGZSRSqByXy/9AjrMRFWo0YanaVPbqADPQ==} peerDependencies: vue: ^3.0.0 dependencies: - vue: 3.2.31 + vue: 3.2.33 dev: false /symbol-tree/3.2.4: @@ -6412,34 +6391,6 @@ packages: resolution: {integrity: sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==} dev: true - /vue-demi/0.12.5: - resolution: {integrity: sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - peerDependencies: - '@vue/composition-api': ^1.0.0-rc.1 - vue: ^3.0.0-0 || ^2.6.0 - peerDependenciesMeta: - '@vue/composition-api': - optional: true - dev: false - - /vue-demi/0.12.5_vue@3.2.31: - resolution: {integrity: sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - peerDependencies: - '@vue/composition-api': ^1.0.0-rc.1 - vue: ^3.0.0-0 || ^2.6.0 - peerDependenciesMeta: - '@vue/composition-api': - optional: true - dependencies: - vue: 3.2.31 - dev: false - /vue-demi/0.12.5_vue@3.2.33: resolution: {integrity: sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==} engines: {node: '>=12'} @@ -6455,7 +6406,7 @@ packages: vue: 3.2.33 dev: false - /vue-promised/2.2.0_vue@3.2.31: + /vue-promised/2.2.0_vue@3.2.33: resolution: {integrity: sha512-qjJOEs8MQSYIRcKiQhC7wzyy9uja/NNXS4ZeftXU6BpIQ6Ao24Gmx2mY9exmPLagv9PdrO9zUQ3yIXnoVaag4g==} peerDependencies: '@vue/composition-api': ^1.0.0 @@ -6464,17 +6415,17 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.2.31 - vue-demi: 0.12.5_vue@3.2.31 + vue: 3.2.33 + vue-demi: 0.12.5_vue@3.2.33 dev: false - /vue-router/4.0.14_vue@3.2.31: + /vue-router/4.0.14_vue@3.2.33: resolution: {integrity: sha512-wAO6zF9zxA3u+7AkMPqw9LjoUCjSxfFvINQj3E/DceTt6uEz1XZLraDhdg2EYmvVwTBSGlLYsUw8bDmx0754Mw==} peerDependencies: vue: ^3.2.0 dependencies: '@vue/devtools-api': 6.1.4 - vue: 3.2.31 + vue: 3.2.33 dev: false /vue/3.2.31: diff --git a/tsconfig.json b/tsconfig.json index e048de4f..d850a35e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,7 @@ "packages/*/src/**/*.ts", "packages/*/__tests__/**/*.ts" ], - "exclude": ["packages/test-vue-2", "packages/pinia/__tests__/test-utils.ts"], + "exclude": ["packages/test-vue-2", "packages/pinia/__tests__/test-utils.ts", "packages/pinia/test-dts"], "compilerOptions": { "baseUrl": ".", "rootDir": ".", -- 2.47.3