From 06d4c8e6f1897759b9edc921e453944c4c1d1dbf Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Fri, 26 Feb 2021 13:03:45 -0500 Subject: [PATCH 1/3] fix(vue): account for event name changes in vue 3.0.6+ --- core/package-lock.json | 41 ++++- core/package.json | 2 +- core/stencil.config.ts | 6 +- packages/vue/package-lock.json | 180 ++++++++++++-------- packages/vue/package.json | 1 + packages/vue/src/ionic-vue.ts | 39 +++-- packages/vue/src/proxies.ts | 60 +++++-- packages/vue/src/vue-component-lib/utils.ts | 29 ++-- 8 files changed, 239 insertions(+), 119 deletions(-) diff --git a/core/package-lock.json b/core/package-lock.json index 23746d6997..177725af1d 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -18,7 +18,7 @@ "@rollup/plugin-node-resolve": "^8.4.0", "@rollup/plugin-virtual": "^2.0.3", "@stencil/sass": "1.3.2", - "@stencil/vue-output-target": "0.3.0", + "@stencil/vue-output-target": "^0.4.1", "@types/jest": "^26.0.20", "@types/node": "^14.6.0", "@types/puppeteer": "5.4.3", @@ -1013,10 +1013,37 @@ "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==", "dev": true, "dependencies": { +<<<<<<< HEAD "@jest/console": "^26.6.2", "@jest/types": "^26.6.2", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" +======= + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^26.3.0", + "@jest/test-result": "^26.3.0", + "@jest/transform": "^26.3.0", + "@jest/types": "^26.3.0", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.2", + "graceful-fs": "^4.2.4", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^4.0.3", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "jest-haste-map": "^26.3.0", + "jest-resolve": "^26.4.0", + "jest-util": "^26.3.0", + "jest-worker": "^26.3.0", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^4.0.1", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^5.0.1" +>>>>>>> 594be7db7... fix(vue): account for event name changes in vue 3.0.6+ (#22980) }, "engines": { "node": ">= 10.14.2" @@ -1336,9 +1363,9 @@ "dev": true }, "node_modules/@stencil/vue-output-target": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@stencil/vue-output-target/-/vue-output-target-0.3.0.tgz", - "integrity": "sha512-uiBe+o7M+NU0gMRgJfrlepxLPBXK0lX4TL2jIPwhBfxYw++pbtg7BLRO2HxE69GR0nxw+7Uf3uJzOGbMsl+ZUQ==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@stencil/vue-output-target/-/vue-output-target-0.4.1.tgz", + "integrity": "sha512-B4urIlIb+I95NkKeCt3Ygpor1D0x5RMezuFyCFp6DYXshUaT1TbiJcW1FgA+gfwlquNzT1AMvEbi96YLnsOg3w==", "dev": true, "peerDependencies": { "@stencil/core": ">=1.8.0" @@ -14845,9 +14872,9 @@ "dev": true }, "@stencil/vue-output-target": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@stencil/vue-output-target/-/vue-output-target-0.3.0.tgz", - "integrity": "sha512-uiBe+o7M+NU0gMRgJfrlepxLPBXK0lX4TL2jIPwhBfxYw++pbtg7BLRO2HxE69GR0nxw+7Uf3uJzOGbMsl+ZUQ==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@stencil/vue-output-target/-/vue-output-target-0.4.1.tgz", + "integrity": "sha512-B4urIlIb+I95NkKeCt3Ygpor1D0x5RMezuFyCFp6DYXshUaT1TbiJcW1FgA+gfwlquNzT1AMvEbi96YLnsOg3w==", "dev": true }, "@stylelint/postcss-css-in-js": { diff --git a/core/package.json b/core/package.json index 85bd531dd0..37bf8a346b 100644 --- a/core/package.json +++ b/core/package.json @@ -40,7 +40,7 @@ "@rollup/plugin-node-resolve": "^8.4.0", "@rollup/plugin-virtual": "^2.0.3", "@stencil/sass": "1.3.2", - "@stencil/vue-output-target": "0.3.0", + "@stencil/vue-output-target": "^0.4.1", "@types/jest": "^26.0.20", "@types/node": "^14.6.0", "@types/puppeteer": "5.4.3", diff --git a/core/stencil.config.ts b/core/stencil.config.ts index d0b5159a70..c44e94a3b9 100644 --- a/core/stencil.config.ts +++ b/core/stencil.config.ts @@ -91,13 +91,15 @@ export const config: Config = { { elements: ['ion-checkbox', 'ion-toggle'], targetAttr: 'checked', - event: 'v-ionChange', + // TODO Ionic v6 remove in favor of v-ion-change + event: ['v-ionChange', 'v-ion-change'], externalEvent: 'ionChange' }, { elements: ['ion-datetime', 'ion-input', 'ion-radio-group', 'ion-radio', 'ion-range', 'ion-searchbar', 'ion-segment', 'ion-segment-button', 'ion-select', 'ion-textarea'], targetAttr: 'value', - event: 'v-ionChange', + // TODO Ionic v6 remove in favor of v-ion-change + event: ['v-ionChange', 'v-ion-change'], externalEvent: 'ionChange' } ], diff --git a/packages/vue/package-lock.json b/packages/vue/package-lock.json index 17b7ef4d4b..dcf65638b0 100644 --- a/packages/vue/package-lock.json +++ b/packages/vue/package-lock.json @@ -9,12 +9,13 @@ "version": "5.5.4", "license": "MIT", "dependencies": { - "@ionic/core": "file:../../core", + "@ionic/core": "5.5.4", "ionicons": "^5.1.2" }, "devDependencies": { "@stencil/core": "^1.17.0", "change-case": "^4.1.1", + "fs-extra": "^9.1.0", "rimraf": "^3.0.2", "rollup": "^2.32.1", "typescript": "^4.0.5", @@ -22,43 +23,6 @@ "vue-router": "^4.0.0-rc.4" } }, - "../../core": { - "version": "5.5.3", - "license": "MIT", - "dependencies": { - "ionicons": "^5.1.2", - "tslib": "^1.10.0" - }, - "devDependencies": { - "@rollup/plugin-node-resolve": "^8.4.0", - "@rollup/plugin-virtual": "^2.0.3", - "@stencil/core": "2.1.2", - "@stencil/sass": "1.3.2", - "@stencil/vue-output-target": "0.3.0", - "@types/jest": "^26.0.10", - "@types/node": "^14.6.0", - "@types/puppeteer": "3.0.1", - "@types/swiper": "5.4.0", - "aws-sdk": "^2.738.0", - "clean-css-cli": "^4.1.11", - "domino": "^2.1.6", - "fs-extra": "^9.0.1", - "jest": "^26.4.1", - "jest-cli": "^26.4.1", - "np": "^6.4.0", - "pixelmatch": "4.0.2", - "puppeteer": "^5.2.1", - "rollup": "^2.26.4", - "sass": "^1.26.10", - "stylelint": "^13.6.1", - "stylelint-order": "^4.1.0", - "swiper": "5.4.1", - "tslint": "^6.1.3", - "tslint-ionic-rules": "0.0.21", - "tslint-react": "^5.0.0", - "typescript": "^4.0.5" - } - }, "node_modules/@babel/helper-validator-identifier": { "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", @@ -89,8 +53,13 @@ } }, "node_modules/@ionic/core": { - "resolved": "../../core", - "link": true + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.5.4.tgz", + "integrity": "sha512-IjbGN8vh3XuJ2ulo3BMlMflcWlUhvEGEexr29JKFvb+O4bWKP5sC2fkqSrswrIstOmv7axm7CeIi2MNRkwYwVA==", + "dependencies": { + "ionicons": "^5.1.2", + "tslib": "^1.10.0" + } }, "node_modules/@stencil/core": { "version": "1.17.3", @@ -180,6 +149,15 @@ "integrity": "sha512-4XWL/avABGxU2E2ZF1eZq3Tj7fvksCMssDZUHOykBIMmh5d+KcAnQMC5XHMhtnA0NAvktYsA2YpdsVwVmhWzvA==", "dev": true }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -276,6 +254,21 @@ "integrity": "sha512-tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg==", "dev": true }, + "node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -312,6 +305,12 @@ "node": "*" } }, + "node_modules/graceful-fs": { + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", + "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", + "dev": true + }, "node_modules/header-case": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.3.tgz", @@ -343,6 +342,19 @@ "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.1.2.tgz", "integrity": "sha512-zO7ZgbBbXhpA7cXO2rDzTNdcCqErjg1Sprq/ossTvaiV0MriOjRE7JO3EGvYjDTPzF9YALGpvLXqCgsRT0tprA==" }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, "node_modules/lodash": { "version": "4.17.20", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", @@ -500,8 +512,7 @@ "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/typescript": { "version": "4.0.5", @@ -516,6 +527,15 @@ "node": ">=4.2.0" } }, + "node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/upper-case": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.1.tgz", @@ -583,37 +603,12 @@ } }, "@ionic/core": { - "version": "file:../../core", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.5.4.tgz", + "integrity": "sha512-IjbGN8vh3XuJ2ulo3BMlMflcWlUhvEGEexr29JKFvb+O4bWKP5sC2fkqSrswrIstOmv7axm7CeIi2MNRkwYwVA==", "requires": { - "@rollup/plugin-node-resolve": "^8.4.0", - "@rollup/plugin-virtual": "^2.0.3", - "@stencil/core": "2.1.2", - "@stencil/sass": "1.3.2", - "@stencil/vue-output-target": "0.3.0", - "@types/jest": "^26.0.10", - "@types/node": "^14.6.0", - "@types/puppeteer": "3.0.1", - "@types/swiper": "5.4.0", - "aws-sdk": "^2.738.0", - "clean-css-cli": "^4.1.11", - "domino": "^2.1.6", - "fs-extra": "^9.0.1", "ionicons": "^5.1.2", - "jest": "^26.4.1", - "jest-cli": "^26.4.1", - "np": "^6.4.0", - "pixelmatch": "4.0.2", - "puppeteer": "^5.2.1", - "rollup": "^2.26.4", - "sass": "^1.26.10", - "stylelint": "^13.6.1", - "stylelint-order": "^4.1.0", - "swiper": "5.4.1", - "tslib": "^1.10.0", - "tslint": "^6.1.3", - "tslint-ionic-rules": "0.0.21", - "tslint-react": "^5.0.0", - "typescript": "^4.0.5" + "tslib": "^1.10.0" } }, "@stencil/core": { @@ -692,6 +687,12 @@ "integrity": "sha512-4XWL/avABGxU2E2ZF1eZq3Tj7fvksCMssDZUHOykBIMmh5d+KcAnQMC5XHMhtnA0NAvktYsA2YpdsVwVmhWzvA==", "dev": true }, + "at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -788,6 +789,18 @@ "integrity": "sha512-tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg==", "dev": true }, + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -815,6 +828,12 @@ "path-is-absolute": "^1.0.0" } }, + "graceful-fs": { + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", + "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", + "dev": true + }, "header-case": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.3.tgz", @@ -846,6 +865,16 @@ "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.1.2.tgz", "integrity": "sha512-zO7ZgbBbXhpA7cXO2rDzTNdcCqErjg1Sprq/ossTvaiV0MriOjRE7JO3EGvYjDTPzF9YALGpvLXqCgsRT0tprA==" }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, "lodash": { "version": "4.17.20", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", @@ -979,8 +1008,7 @@ "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "typescript": { "version": "4.0.5", @@ -988,6 +1016,12 @@ "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==", "dev": true }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true + }, "upper-case": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.1.tgz", diff --git a/packages/vue/package.json b/packages/vue/package.json index a5e61748e5..e6ed0349df 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -49,6 +49,7 @@ "devDependencies": { "@stencil/core": "^1.17.0", "change-case": "^4.1.1", + "fs-extra": "^9.1.0", "rimraf": "^3.0.2", "rollup": "^2.32.1", "typescript": "^4.0.5", diff --git a/packages/vue/src/ionic-vue.ts b/packages/vue/src/ionic-vue.ts index 0e166d86fe..fd3d196d45 100644 --- a/packages/vue/src/ionic-vue.ts +++ b/packages/vue/src/ionic-vue.ts @@ -2,22 +2,39 @@ import { App, Plugin } from 'vue'; import { IonicConfig, setupConfig } from '@ionic/core'; import { applyPolyfills, defineCustomElements } from '@ionic/core/loader'; +const needsKebabCase = (version: string) => !['3.0.0', '3.0.1', '3.0.2', '3.0.3', '3.0.4', '3.0.5'].includes(version); + /** - * We need to make sure that the web component fires an event - * that will not conflict with the user's @ionChange binding, - * otherwise the binding's callback will fire before any - * v-model values have been updated. +* We need to make sure that the web component fires an event +* that will not conflict with the user's @ionChange binding, +* otherwise the binding's callback will fire before any +* v-model values have been updated. +*/ +const toLowerCase = (eventName: string) => eventName === 'ionChange' ? 'v-ionchange' : eventName.toLowerCase(); +const toKebabCase = (eventName: string) => eventName === 'ionChange' ? 'v-ion-change' : eventName.replace(/([a-z0-9]|(?=[A-Z]))([A-Z])/g, '$1-$2').toLowerCase(); + +/** + * Vue 3.0.6 fixed a bug where events on custom elements + * were always converted to lower case, so "ionRefresh" + * became "ionRefresh". We need to account for the old + * issue as well as the new behavior where "ionRefresh" + * is converted to "ion-refresh". + * See https://github.com/vuejs/vue-next/pull/2847 */ -const transformEventName = (eventName: string) => { - return eventName === 'ionChange' ? 'v-ionchange' : eventName.toLowerCase(); -} -const ael = (el: any, eventName: string, cb: any, opts: any) => el.addEventListener(transformEventName(eventName), cb, opts); -const rel = (el: any, eventName: string, cb: any, opts: any) => el.removeEventListener(transformEventName(eventName), cb, opts); +const getHelperFunctions = (needsKebabCase: boolean = true) => { + const conversionFn = (needsKebabCase) ? toKebabCase : toLowerCase; + return { + ael: (el: any, eventName: string, cb: any, opts: any) => el.addEventListener(conversionFn(eventName), cb, opts), + rel: (el: any, eventName: string, cb: any, opts: any) => el.removeEventListener(conversionFn(eventName), cb, opts), + ce: (eventName: string, opts: any) => new CustomEvent(conversionFn(eventName), opts) + }; +}; export const IonicVue: Plugin = { - async install(_app: App, config: IonicConfig = {}) { + async install(app: App, config: IonicConfig = {}) { if (typeof (window as any) !== 'undefined') { + const { ael, rel, ce } = getHelperFunctions(needsKebabCase(app.version)); setupConfig({ ...config, _ael: ael, @@ -26,7 +43,7 @@ export const IonicVue: Plugin = { await applyPolyfills(); await defineCustomElements(window, { exclude: ['ion-tabs'], - ce: (eventName: string, opts: any) => new CustomEvent(transformEventName(eventName), opts), + ce, ael, rel } as any); diff --git a/packages/vue/src/proxies.ts b/packages/vue/src/proxies.ts index a1f79c4db2..bdcd674465 100644 --- a/packages/vue/src/proxies.ts +++ b/packages/vue/src/proxies.ts @@ -97,7 +97,10 @@ export const IonCheckbox = /*@__PURE__*/ defineContainer('ion-c ], { "modelProp": "checked", - "modelUpdateEvent": "v-ionChange", + "modelUpdateEvent": [ + "v-ionChange", + "v-ion-change" + ], "externalModelUpdateEvent": "ionChange" }); @@ -181,7 +184,10 @@ export const IonDatetime = /*@__PURE__*/ defineContainer('ion-d ], { "modelProp": "value", - "modelUpdateEvent": "v-ionChange", + "modelUpdateEvent": [ + "v-ionChange", + "v-ion-change" + ], "externalModelUpdateEvent": "ionChange" }); @@ -296,7 +302,10 @@ export const IonInput = /*@__PURE__*/ defineContainer('ion-input', ], { "modelProp": "value", - "modelUpdateEvent": "v-ionChange", + "modelUpdateEvent": [ + "v-ionChange", + "v-ion-change" + ], "externalModelUpdateEvent": "ionChange" }); @@ -448,7 +457,10 @@ export const IonRadio = /*@__PURE__*/ defineContainer('ion-radio', ], { "modelProp": "value", - "modelUpdateEvent": "v-ionChange", + "modelUpdateEvent": [ + "v-ionChange", + "v-ion-change" + ], "externalModelUpdateEvent": "ionChange" }); @@ -461,7 +473,10 @@ export const IonRadioGroup = /*@__PURE__*/ defineContainer('i ], { "modelProp": "value", - "modelUpdateEvent": "v-ionChange", + "modelUpdateEvent": [ + "v-ionChange", + "v-ion-change" + ], "externalModelUpdateEvent": "ionChange" }); @@ -486,7 +501,10 @@ export const IonRange = /*@__PURE__*/ defineContainer('ion-range', ], { "modelProp": "value", - "modelUpdateEvent": "v-ionChange", + "modelUpdateEvent": [ + "v-ionChange", + "v-ion-change" + ], "externalModelUpdateEvent": "ionChange" }); @@ -558,7 +576,10 @@ export const IonSearchbar = /*@__PURE__*/ defineContainer('ion ], { "modelProp": "value", - "modelUpdateEvent": "v-ionChange", + "modelUpdateEvent": [ + "v-ionChange", + "v-ion-change" + ], "externalModelUpdateEvent": "ionChange" }); @@ -575,7 +596,10 @@ export const IonSegment = /*@__PURE__*/ defineContainer('ion-seg ], { "modelProp": "value", - "modelUpdateEvent": "v-ionChange", + "modelUpdateEvent": [ + "v-ionChange", + "v-ion-change" + ], "externalModelUpdateEvent": "ionChange" }); @@ -588,7 +612,10 @@ export const IonSegmentButton = /*@__PURE__*/ defineContainer('ion-selec ], { "modelProp": "value", - "modelUpdateEvent": "v-ionChange", + "modelUpdateEvent": [ + "v-ionChange", + "v-ion-change" + ], "externalModelUpdateEvent": "ionChange" }); @@ -706,7 +736,10 @@ export const IonTextarea = /*@__PURE__*/ defineContainer('ion-t ], { "modelProp": "value", - "modelUpdateEvent": "v-ionChange", + "modelUpdateEvent": [ + "v-ionChange", + "v-ion-change" + ], "externalModelUpdateEvent": "ionChange" }); @@ -734,7 +767,10 @@ export const IonToggle = /*@__PURE__*/ defineContainer('ion-toggl ], { "modelProp": "checked", - "modelUpdateEvent": "v-ionChange", + "modelUpdateEvent": [ + "v-ionChange", + "v-ion-change" + ], "externalModelUpdateEvent": "ionChange" }); diff --git a/packages/vue/src/vue-component-lib/utils.ts b/packages/vue/src/vue-component-lib/utils.ts index e9a994c9a4..cdd75367ab 100644 --- a/packages/vue/src/vue-component-lib/utils.ts +++ b/packages/vue/src/vue-component-lib/utils.ts @@ -16,7 +16,7 @@ interface NavManager { interface ComponentOptions { modelProp?: string; - modelUpdateEvent?: string; + modelUpdateEvent?: string | string[]; externalModelUpdateEvent?: string; } @@ -55,19 +55,22 @@ export const defineContainer = (name: string, componentProps: string[] = const onVnodeBeforeMount = (vnode: VNode) => { // Add a listener to tell Vue to update the v-model if (vnode.el) { - vnode.el.addEventListener(modelUpdateEvent.toLowerCase(), (e: Event) => { - modelPropValue = (e?.target as any)[modelProp]; - emit(UPDATE_VALUE_EVENT, modelPropValue); + const eventsNames = Array.isArray(modelUpdateEvent) ? modelUpdateEvent : [modelUpdateEvent]; + eventsNames.forEach((eventName: string) => { + vnode.el.addEventListener(eventName.toLowerCase(), (e: Event) => { + modelPropValue = (e?.target as any)[modelProp]; + emit(UPDATE_VALUE_EVENT, modelPropValue); - /** - * We need to emit the change event here - * rather than on the web component to ensure - * that any v-model bindings have been updated. - * Otherwise, the developer will listen on the - * native web component, but the v-model will - * not have been updated yet. - */ - emit(externalModelUpdateEvent, e); + /** + * We need to emit the change event here + * rather than on the web component to ensure + * that any v-model bindings have been updated. + * Otherwise, the developer will listen on the + * native web component, but the v-model will + * not have been updated yet. + */ + emit(externalModelUpdateEvent, e); + }); }); } }; From 0101a5fce205b26b429c25b8f928d3d25f646b70 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Fri, 26 Feb 2021 13:19:24 -0500 Subject: [PATCH 2/3] 5.5.5 --- CHANGELOG.md | 9 ++ angular/package-lock.json | 129 ++++++++------------- angular/package.json | 4 +- core/package-lock.json | 4 +- core/package.json | 2 +- docs/package.json | 2 +- packages/angular-server/package-lock.json | 132 +++++++++------------- packages/angular-server/package.json | 4 +- packages/react-router/package.json | 10 +- packages/react/package.json | 4 +- packages/vue-router/package-lock.json | 23 ++-- packages/vue-router/package.json | 2 +- packages/vue/package-lock.json | 8 +- packages/vue/package.json | 4 +- 14 files changed, 137 insertions(+), 200 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cb51fe181..cb3f266c13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [5.5.5](https://github.com/ionic-team/ionic/compare/v5.5.4...v5.5.5) (2021-02-26) + + +### Bug Fixes + +* **vue:** account for event name changes in vue 3.0.6+ ([#22980](https://github.com/ionic-team/ionic/issues/22980)) ([7dd2e6d](https://github.com/ionic-team/ionic/commit/7dd2e6d287b47cca758e1d4a71928dd3dc9ac24d)), closes [#22977](https://github.com/ionic-team/ionic/issues/22977) + + + ## [5.5.4](https://github.com/ionic-team/ionic/compare/v5.5.3...v5.5.4) (2021-02-04) diff --git a/angular/package-lock.json b/angular/package-lock.json index 3a27f20ddb..99181eb548 100644 --- a/angular/package-lock.json +++ b/angular/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/angular", - "version": "5.5.4", + "version": "5.5.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/angular", - "version": "5.5.4", + "version": "5.5.5", "license": "MIT", "dependencies": { - "@ionic/core": "file:../core", + "@ionic/core": "5.5.4", "tslib": "^1.9.3" }, "devDependencies": { @@ -42,43 +42,6 @@ "zone.js": ">=0.8.26" } }, - "../core": { - "version": "5.5.3", - "license": "MIT", - "dependencies": { - "ionicons": "^5.1.2", - "tslib": "^1.10.0" - }, - "devDependencies": { - "@rollup/plugin-node-resolve": "^8.4.0", - "@rollup/plugin-virtual": "^2.0.3", - "@stencil/core": "2.1.2", - "@stencil/sass": "1.3.2", - "@stencil/vue-output-target": "0.3.0", - "@types/jest": "^26.0.10", - "@types/node": "^14.6.0", - "@types/puppeteer": "3.0.1", - "@types/swiper": "5.4.0", - "aws-sdk": "^2.738.0", - "clean-css-cli": "^4.1.11", - "domino": "^2.1.6", - "fs-extra": "^9.0.1", - "jest": "^26.4.1", - "jest-cli": "^26.4.1", - "np": "^6.4.0", - "pixelmatch": "4.0.2", - "puppeteer": "^5.2.1", - "rollup": "^2.26.4", - "sass": "^1.26.10", - "stylelint": "^13.6.1", - "stylelint-order": "^4.1.0", - "swiper": "5.4.1", - "tslint": "^6.1.3", - "tslint-ionic-rules": "0.0.21", - "tslint-react": "^5.0.0", - "typescript": "^4.0.5" - } - }, "node_modules/@angular-devkit/core": { "version": "8.3.17", "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.17.tgz", @@ -241,8 +204,13 @@ } }, "node_modules/@ionic/core": { - "resolved": "../core", - "link": true + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.5.4.tgz", + "integrity": "sha512-IjbGN8vh3XuJ2ulo3BMlMflcWlUhvEGEexr29JKFvb+O4bWKP5sC2fkqSrswrIstOmv7axm7CeIi2MNRkwYwVA==", + "dependencies": { + "ionicons": "^5.1.2", + "tslib": "^1.10.0" + } }, "node_modules/@rollup/plugin-commonjs": { "version": "11.1.0", @@ -322,6 +290,18 @@ "node": ">=6" } }, + "node_modules/@stencil/core": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.4.0.tgz", + "integrity": "sha512-gU6+Yyd6O0KrCSS/O6j8KKqmRo+/Dcs2fI0+APCpbAWK+nqhwDISpdnSEfGDCLMoAC08XOZCycBRk2K1VGnEcg==", + "bin": { + "stencil": "bin/stencil" + }, + "engines": { + "node": ">=12.10.0", + "npm": ">=6.0.0" + } + }, "node_modules/@szmarczak/http-timer": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", @@ -945,7 +925,6 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", - "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -2047,6 +2026,14 @@ "node": ">=4" } }, + "node_modules/ionicons": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.0.tgz", + "integrity": "sha512-0DUHTeoIrGSY+KNyNDaQW7v5+mDstjSkjx8dzT925kXKYBDrN3sGs8kUcSSQbTK132U4CbgDEZkn7FDUa9x8Qw==", + "dependencies": { + "@stencil/core": "^2.4.0" + } + }, "node_modules/is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", @@ -2429,13 +2416,7 @@ "integrity": "sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==", "dev": true, "dependencies": { - "errno": "^0.1.1", "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "make-dir": "^2.1.0", - "mime": "^1.4.1", - "native-request": "^1.0.5", - "source-map": "~0.6.0", "tslib": "^1.10.0" }, "bin": { @@ -2818,7 +2799,6 @@ "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.1.2", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -2959,9 +2939,6 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.7.5.tgz", "integrity": "sha512-xQSM8uzhgtF6tTnTVEvOQThrcG3LPUP3T/4l4EukzDp0kbTY1QRDuXjiwtYzs9odKj9Bj/PccRG6viFfS7DmCQ==", "dev": true, - "dependencies": { - "fsevents": "~2.1.2" - }, "bin": { "rollup": "dist/bin/rollup" }, @@ -5173,37 +5150,12 @@ } }, "@ionic/core": { - "version": "file:../core", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.5.4.tgz", + "integrity": "sha512-IjbGN8vh3XuJ2ulo3BMlMflcWlUhvEGEexr29JKFvb+O4bWKP5sC2fkqSrswrIstOmv7axm7CeIi2MNRkwYwVA==", "requires": { - "@rollup/plugin-node-resolve": "^8.4.0", - "@rollup/plugin-virtual": "^2.0.3", - "@stencil/core": "2.1.2", - "@stencil/sass": "1.3.2", - "@stencil/vue-output-target": "0.3.0", - "@types/jest": "^26.0.10", - "@types/node": "^14.6.0", - "@types/puppeteer": "3.0.1", - "@types/swiper": "5.4.0", - "aws-sdk": "^2.738.0", - "clean-css-cli": "^4.1.11", - "domino": "^2.1.6", - "fs-extra": "^9.0.1", "ionicons": "^5.1.2", - "jest": "^26.4.1", - "jest-cli": "^26.4.1", - "np": "^6.4.0", - "pixelmatch": "4.0.2", - "puppeteer": "^5.2.1", - "rollup": "^2.26.4", - "sass": "^1.26.10", - "stylelint": "^13.6.1", - "stylelint-order": "^4.1.0", - "swiper": "5.4.1", - "tslib": "^1.10.0", - "tslint": "^6.1.3", - "tslint-ionic-rules": "0.0.21", - "tslint-react": "^5.0.0", - "typescript": "^4.0.5" + "tslib": "^1.10.0" } }, "@rollup/plugin-commonjs": { @@ -5276,6 +5228,11 @@ "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", "dev": true }, + "@stencil/core": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.4.0.tgz", + "integrity": "sha512-gU6+Yyd6O0KrCSS/O6j8KKqmRo+/Dcs2fI0+APCpbAWK+nqhwDISpdnSEfGDCLMoAC08XOZCycBRk2K1VGnEcg==" + }, "@szmarczak/http-timer": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", @@ -6690,6 +6647,14 @@ "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", "dev": true }, + "ionicons": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.0.tgz", + "integrity": "sha512-0DUHTeoIrGSY+KNyNDaQW7v5+mDstjSkjx8dzT925kXKYBDrN3sGs8kUcSSQbTK132U4CbgDEZkn7FDUa9x8Qw==", + "requires": { + "@stencil/core": "^2.4.0" + } + }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", diff --git a/angular/package.json b/angular/package.json index c7a610b779..2cef7e5356 100644 --- a/angular/package.json +++ b/angular/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular", - "version": "5.5.4", + "version": "5.5.5", "description": "Angular specific wrappers for @ionic/core", "keywords": [ "ionic", @@ -42,7 +42,7 @@ "validate": "npm i && npm run lint && npm run test && npm run build" }, "dependencies": { - "@ionic/core": "5.5.4", + "@ionic/core": "5.5.5", "tslib": "^1.9.3" }, "peerDependencies": { diff --git a/core/package-lock.json b/core/package-lock.json index 177725af1d..ee71247807 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ionic/core", - "version": "5.5.4", + "version": "5.5.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/core", - "version": "5.5.4", + "version": "5.5.5", "license": "MIT", "dependencies": { "@stencil/core": "^2.4.0", diff --git a/core/package.json b/core/package.json index 37bf8a346b..d25db533e8 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "5.5.4", + "version": "5.5.5", "description": "Base components for Ionic", "keywords": [ "ionic", diff --git a/docs/package.json b/docs/package.json index a8c22e1875..f936084359 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/docs", - "version": "5.5.4", + "version": "5.5.5", "description": "Pre-packaged API documentation for the Ionic docs.", "main": "core.json", "types": "core.d.ts", diff --git a/packages/angular-server/package-lock.json b/packages/angular-server/package-lock.json index 6dcf1059af..609733b7cd 100644 --- a/packages/angular-server/package-lock.json +++ b/packages/angular-server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ionic/angular-server", - "version": "5.5.4", + "version": "5.5.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/angular-server", - "version": "5.5.4", + "version": "5.5.5", "license": "MIT", "devDependencies": { "@angular/animations": "8.2.13", @@ -16,7 +16,7 @@ "@angular/core": "8.2.13", "@angular/platform-browser": "8.2.13", "@angular/platform-server": "8.2.13", - "@ionic/core": "file:../../core", + "@ionic/core": "5.5.4", "ng-packagr": "5.7.1", "tslint": "^5.12.1", "tslint-ionic-rules": "0.0.21", @@ -31,44 +31,6 @@ "zone.js": ">=0.8.26" } }, - "../../core": { - "version": "5.5.3", - "dev": true, - "license": "MIT", - "dependencies": { - "ionicons": "^5.1.2", - "tslib": "^1.10.0" - }, - "devDependencies": { - "@rollup/plugin-node-resolve": "^8.4.0", - "@rollup/plugin-virtual": "^2.0.3", - "@stencil/core": "2.1.2", - "@stencil/sass": "1.3.2", - "@stencil/vue-output-target": "0.3.0", - "@types/jest": "^26.0.10", - "@types/node": "^14.6.0", - "@types/puppeteer": "3.0.1", - "@types/swiper": "5.4.0", - "aws-sdk": "^2.738.0", - "clean-css-cli": "^4.1.11", - "domino": "^2.1.6", - "fs-extra": "^9.0.1", - "jest": "^26.4.1", - "jest-cli": "^26.4.1", - "np": "^6.4.0", - "pixelmatch": "4.0.2", - "puppeteer": "^5.2.1", - "rollup": "^2.26.4", - "sass": "^1.26.10", - "stylelint": "^13.6.1", - "stylelint-order": "^4.1.0", - "swiper": "5.4.1", - "tslint": "^6.1.3", - "tslint-ionic-rules": "0.0.21", - "tslint-react": "^5.0.0", - "typescript": "^4.0.5" - } - }, "node_modules/@angular/animations": { "version": "8.2.13", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.13.tgz", @@ -175,8 +137,14 @@ } }, "node_modules/@ionic/core": { - "resolved": "../../core", - "link": true + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.5.4.tgz", + "integrity": "sha512-IjbGN8vh3XuJ2ulo3BMlMflcWlUhvEGEexr29JKFvb+O4bWKP5sC2fkqSrswrIstOmv7axm7CeIi2MNRkwYwVA==", + "dev": true, + "dependencies": { + "ionicons": "^5.1.2", + "tslib": "^1.10.0" + } }, "node_modules/@sindresorhus/is": { "version": "0.14.0", @@ -187,6 +155,19 @@ "node": ">=6" } }, + "node_modules/@stencil/core": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.4.0.tgz", + "integrity": "sha512-gU6+Yyd6O0KrCSS/O6j8KKqmRo+/Dcs2fI0+APCpbAWK+nqhwDISpdnSEfGDCLMoAC08XOZCycBRk2K1VGnEcg==", + "dev": true, + "bin": { + "stencil": "bin/stencil" + }, + "engines": { + "node": ">=12.10.0", + "npm": ">=6.0.0" + } + }, "node_modules/@szmarczak/http-timer": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", @@ -697,7 +678,6 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", - "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -2423,6 +2403,15 @@ "node": ">=4" } }, + "node_modules/ionicons": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.0.tgz", + "integrity": "sha512-0DUHTeoIrGSY+KNyNDaQW7v5+mDstjSkjx8dzT925kXKYBDrN3sGs8kUcSSQbTK132U4CbgDEZkn7FDUa9x8Qw==", + "dev": true, + "dependencies": { + "@stencil/core": "^2.4.0" + } + }, "node_modules/is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", @@ -2808,12 +2797,7 @@ "integrity": "sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q==", "dev": true, "dependencies": { - "errno": "^0.1.1", "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "make-dir": "^2.1.0", - "mime": "^1.4.1", - "native-request": "^1.0.5", "source-map": "~0.6.0", "tslib": "^1.10.0" }, @@ -3246,7 +3230,6 @@ "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.1.2", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -5434,37 +5417,13 @@ } }, "@ionic/core": { - "version": "file:../../core", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.5.4.tgz", + "integrity": "sha512-IjbGN8vh3XuJ2ulo3BMlMflcWlUhvEGEexr29JKFvb+O4bWKP5sC2fkqSrswrIstOmv7axm7CeIi2MNRkwYwVA==", + "dev": true, "requires": { - "@rollup/plugin-node-resolve": "^8.4.0", - "@rollup/plugin-virtual": "^2.0.3", - "@stencil/core": "2.1.2", - "@stencil/sass": "1.3.2", - "@stencil/vue-output-target": "0.3.0", - "@types/jest": "^26.0.10", - "@types/node": "^14.6.0", - "@types/puppeteer": "3.0.1", - "@types/swiper": "5.4.0", - "aws-sdk": "^2.738.0", - "clean-css-cli": "^4.1.11", - "domino": "^2.1.6", - "fs-extra": "^9.0.1", "ionicons": "^5.1.2", - "jest": "^26.4.1", - "jest-cli": "^26.4.1", - "np": "^6.4.0", - "pixelmatch": "4.0.2", - "puppeteer": "^5.2.1", - "rollup": "^2.26.4", - "sass": "^1.26.10", - "stylelint": "^13.6.1", - "stylelint-order": "^4.1.0", - "swiper": "5.4.1", - "tslib": "^1.10.0", - "tslint": "^6.1.3", - "tslint-ionic-rules": "0.0.21", - "tslint-react": "^5.0.0", - "typescript": "^4.0.5" + "tslib": "^1.10.0" } }, "@sindresorhus/is": { @@ -5473,6 +5432,12 @@ "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", "dev": true }, + "@stencil/core": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.4.0.tgz", + "integrity": "sha512-gU6+Yyd6O0KrCSS/O6j8KKqmRo+/Dcs2fI0+APCpbAWK+nqhwDISpdnSEfGDCLMoAC08XOZCycBRk2K1VGnEcg==", + "dev": true + }, "@szmarczak/http-timer": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", @@ -7357,6 +7322,15 @@ "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", "dev": true }, + "ionicons": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.0.tgz", + "integrity": "sha512-0DUHTeoIrGSY+KNyNDaQW7v5+mDstjSkjx8dzT925kXKYBDrN3sGs8kUcSSQbTK132U4CbgDEZkn7FDUa9x8Qw==", + "dev": true, + "requires": { + "@stencil/core": "^2.4.0" + } + }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", diff --git a/packages/angular-server/package.json b/packages/angular-server/package.json index 0134282494..874bb39bf4 100644 --- a/packages/angular-server/package.json +++ b/packages/angular-server/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular-server", - "version": "5.5.4", + "version": "5.5.5", "description": "Angular SSR Module for Ionic", "keywords": [ "ionic", @@ -49,7 +49,7 @@ "@angular/core": "8.2.13", "@angular/platform-browser": "8.2.13", "@angular/platform-server": "8.2.13", - "@ionic/core": "5.5.4", + "@ionic/core": "5.5.5", "ng-packagr": "5.7.1", "tslint": "^5.12.1", "tslint-ionic-rules": "0.0.21", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index df46804d85..e8cb352827 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react-router", - "version": "5.5.4", + "version": "5.5.5", "description": "React Router wrapper for @ionic/react", "keywords": [ "ionic", @@ -39,16 +39,16 @@ "tslib": "*" }, "peerDependencies": { - "@ionic/core": "5.5.4", - "@ionic/react": "5.5.4", + "@ionic/core": "5.5.5", + "@ionic/react": "5.5.5", "react": ">=16.8.6", "react-dom": ">=16.8.6", "react-router": "^5.0.1", "react-router-dom": "^5.0.1" }, "devDependencies": { - "@ionic/core": "5.5.4", - "@ionic/react": "5.5.4", + "@ionic/core": "5.5.5", + "@ionic/react": "5.5.5", "@rollup/plugin-node-resolve": "^8.1.0", "@testing-library/jest-dom": "^5.11.6", "@testing-library/react": "^11.2.2", diff --git a/packages/react/package.json b/packages/react/package.json index b495b19eb4..8848fd6698 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react", - "version": "5.5.4", + "version": "5.5.5", "description": "React specific wrapper for @ionic/core", "keywords": [ "ionic", @@ -39,7 +39,7 @@ "css/" ], "dependencies": { - "@ionic/core": "5.5.4", + "@ionic/core": "5.5.5", "ionicons": "^5.1.2", "tslib": "*" }, diff --git a/packages/vue-router/package-lock.json b/packages/vue-router/package-lock.json index d4377c0248..121a42168c 100644 --- a/packages/vue-router/package-lock.json +++ b/packages/vue-router/package-lock.json @@ -1,16 +1,13 @@ { "name": "@ionic/vue-router", - "version": "5.5.4", + "version": "5.5.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/vue-router", - "version": "5.5.4", + "version": "5.5.5", "license": "MIT", - "dependencies": { - "@ionic/core": "file:../../core" - }, "devDependencies": { "@ionic/vue": "5.4.1", "@types/jest": "^26.0.13", @@ -25,7 +22,9 @@ } }, "../../core": { - "version": "5.4.1", + "name": "@ionic/core", + "version": "5.5.4", + "dev": true, "license": "MIT", "dependencies": { "ionicons": "^5.1.2", @@ -36,7 +35,7 @@ "@rollup/plugin-virtual": "^2.0.3", "@stencil/core": "2.1.2", "@stencil/sass": "1.3.2", - "@stencil/vue-output-target": "0.1.8", + "@stencil/vue-output-target": "^0.4.1", "@types/jest": "^26.0.10", "@types/node": "^14.6.0", "@types/puppeteer": "3.0.1", @@ -908,7 +907,6 @@ "jest-resolve": "^26.6.2", "jest-util": "^26.6.2", "jest-worker": "^26.6.2", - "node-notifier": "^8.0.0", "slash": "^3.0.0", "source-map": "^0.6.0", "string-length": "^4.0.1", @@ -2324,8 +2322,7 @@ "esprima": "^4.0.1", "estraverse": "^4.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "optionator": "^0.8.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -3924,7 +3921,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -6235,9 +6231,6 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.33.3.tgz", "integrity": "sha512-RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w==", "dev": true, - "dependencies": { - "fsevents": "~2.1.2" - }, "bin": { "rollup": "dist/bin/rollup" }, @@ -8251,7 +8244,7 @@ "@rollup/plugin-virtual": "^2.0.3", "@stencil/core": "2.1.2", "@stencil/sass": "1.3.2", - "@stencil/vue-output-target": "0.1.8", + "@stencil/vue-output-target": "^0.4.1", "@types/jest": "^26.0.10", "@types/node": "^14.6.0", "@types/puppeteer": "3.0.1", diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index d8443ee54e..1874cbe846 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/vue-router", - "version": "5.5.4", + "version": "5.5.5", "description": "Vue Router integration for @ionic/vue", "scripts": { "test.spec": "jest", diff --git a/packages/vue/package-lock.json b/packages/vue/package-lock.json index dcf65638b0..d2187be7a7 100644 --- a/packages/vue/package-lock.json +++ b/packages/vue/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ionic/vue", - "version": "5.5.4", + "version": "5.5.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/vue", - "version": "5.5.4", + "version": "5.5.5", "license": "MIT", "dependencies": { "@ionic/core": "5.5.4", @@ -348,7 +348,6 @@ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, "dependencies": { - "graceful-fs": "^4.1.6", "universalify": "^2.0.0" }, "optionalDependencies": { @@ -457,9 +456,6 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz", "integrity": "sha512-uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==", "dev": true, - "dependencies": { - "fsevents": "~2.1.2" - }, "bin": { "rollup": "dist/bin/rollup" }, diff --git a/packages/vue/package.json b/packages/vue/package.json index e6ed0349df..be7a987320 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/vue", - "version": "5.5.4", + "version": "5.5.5", "description": "Vue specific wrapper for @ionic/core", "scripts": { "lint": "echo add linter", @@ -57,7 +57,7 @@ "vue-router": "^4.0.0-rc.4" }, "dependencies": { - "@ionic/core": "5.5.4", + "@ionic/core": "5.5.5", "ionicons": "^5.1.2" }, "vetur": { From fb631742af2bd71985dd89a1547f34bf01d1b534 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Fri, 26 Feb 2021 14:26:06 -0500 Subject: [PATCH 3/3] chore(): run build --- core/package-lock.json | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/core/package-lock.json b/core/package-lock.json index ee71247807..af09a28e5f 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -1013,17 +1013,12 @@ "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==", "dev": true, "dependencies": { -<<<<<<< HEAD - "@jest/console": "^26.6.2", - "@jest/types": "^26.6.2", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" -======= "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^26.3.0", + "@jest/console": "^26.6.2", "@jest/test-result": "^26.3.0", "@jest/transform": "^26.3.0", - "@jest/types": "^26.3.0", + "@jest/types": "^26.6.2", + "@types/istanbul-lib-coverage": "^2.0.0", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", @@ -1043,7 +1038,6 @@ "string-length": "^4.0.1", "terminal-link": "^2.0.0", "v8-to-istanbul": "^5.0.1" ->>>>>>> 594be7db7... fix(vue): account for event name changes in vue 3.0.6+ (#22980) }, "engines": { "node": ">= 10.14.2" @@ -14616,10 +14610,31 @@ "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==", "dev": true, "requires": { + "@bcoe/v8-coverage": "^0.2.3", "@jest/console": "^26.6.2", + "@jest/test-result": "^26.3.0", + "@jest/transform": "^26.3.0", "@jest/types": "^26.6.2", "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.2", + "graceful-fs": "^4.2.4", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^4.0.3", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "jest-haste-map": "^26.3.0", + "jest-resolve": "^26.4.0", + "jest-util": "^26.3.0", + "jest-worker": "^26.3.0", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^4.0.1", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^5.0.1" }, "dependencies": { "@jest/types": {