From 0f248c2bb9f7877f900ba0e5405745db94f14cd7 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Mon, 9 Jan 2023 15:53:54 +0100 Subject: [PATCH] Run vue-demi-fix before any vite invocation --- package.json | 7 ++++--- pnpm-lock.yaml | 21 +++++++++++++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a3a78dfc7c9..ad967f99646 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "license": "AGPL-3.0", "author": "ownCloud GmbH ", "scripts": { - "build": "pnpm build:tokens && pnpm vite build", + "build": "vue-demi-fix && pnpm build:tokens && pnpm vite build", "build:w": "pnpm build --watch", "build:tokens": "pnpm --filter @ownclouders/design-system tokens", "depcheck": "depcheck", @@ -16,7 +16,7 @@ "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL' --excludePackages '@ownclouders/babel-preset;@ownclouders/eslint-config;@ownclouders/prettier-config;@ownclouders/tsconfig;@ownclouders/web-client;@ownclouders/web-pkg,draw-io;external;web-app-files;text-editor;preview;@ownclouders/design-system;pdf-viewer;web-app-search;admin-settings;web-runtime'", "licenses:csv": "license-checker-rseidelsohn --relativeLicensePath --csv --out ./third-party-licenses/third-party-licenses.csv", "licenses:save": "license-checker-rseidelsohn --relativeLicensePath --out /dev/null --files ./third-party-licenses/third-party-licenses", - "vite": "pnpm vite:ocis", + "vite": "vue-demi-fix && pnpm vite:ocis", "vite:ocis": "vite", "vite:oc10": "OCIS=false vite" }, @@ -44,7 +44,8 @@ "peerDependencies": { "caf": "*", "portal-vue": "*", - "uuid": "*" + "uuid": "*", + "vue-demi": "*" }, "devDependencies": { "@babel/core": "7.20.12", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8ade51827b2..854dcba0b73 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -98,6 +98,7 @@ importers: vite-plugin-static-copy: ^0.12.0 vite-plugin-treat-umd-as-commonjs: 0.1.3 vue: 3.2.45 + vue-demi: '*' vue-gettext: 2.1.12 vue-tsc: 1.0.20 wait-for-expect: 3.0.2 @@ -114,6 +115,7 @@ importers: vite-plugin-static-copy: 0.12.0_vite@4.0.4 vite-plugin-treat-umd-as-commonjs: 0.1.3_vite@4.0.4 vue: 3.2.45 + vue-demi: 0.13.11_vue@3.2.45 devDependencies: '@babel/core': 7.20.12 '@babel/polyfill': 7.12.1 @@ -1643,7 +1645,7 @@ packages: dependencies: '@babel/core': 7.17.5 '@babel/helper-create-class-features-plugin': 7.19.0_@babel+core@7.17.5 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.19.0 transitivePeerDependencies: - supports-color dev: true @@ -1669,7 +1671,7 @@ packages: dependencies: '@babel/core': 7.20.12 '@babel/helper-create-class-features-plugin': 7.19.0_@babel+core@7.20.12 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.19.0 transitivePeerDependencies: - supports-color dev: true @@ -22106,6 +22108,21 @@ packages: optional: true dev: true + /vue-demi/0.13.11_vue@3.2.45: + resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==} + 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.45 + dev: false + /vue-docgen-api/4.56.0_vue@3.2.45: resolution: {integrity: sha512-ab/Scb0DCjm4YVLf+AFa/R7XMFl8TVwUsvh26fFT5iaURih1m2hdd5Y8NveA7NQDcycpWavkFZj9eVbQdp2VGQ==} dependencies: