From a96faf13784ed30a5fc645dc769e44960242cb4f Mon Sep 17 00:00:00 2001 From: Daniel Sogl Date: Sat, 23 Jan 2021 18:33:36 +0100 Subject: [PATCH] chore(package): upgrade to angular 11 BREAKING CHANGE: ionic-native now requires at least Angular 10 with ts-lib 2.0 Co-Authored-By: Daniel Sogl --- package-lock.json | 121 ++++++++++++++++++-------- package.json | 27 +++--- scripts/build/transformers/imports.ts | 1 + 3 files changed, 97 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc87950a20..6ed3b289f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,23 +5,31 @@ "requires": true, "dependencies": { "@angular/common": { - "version": "9.1.13", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.13.tgz", - "integrity": "sha512-QACUhJWlly/nfHUmjopVS1p6ayxxa/NqjyftdCeBJaoyM2YohqWixP/n/keu1K/srJ96aFpUNsZQgmgoRv5SOQ==", - "dev": true + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-11.1.0.tgz", + "integrity": "sha512-jR9fnhzvvpdilyhPnyRlRRFRJ9vf/OhUFJrL42Knaj7uknmjgeu168JhwVdq6uj+v1208suXW+nOXhKNIpH38Q==", + "dev": true, + "requires": { + "tslib": "^2.0.0" + } }, "@angular/compiler": { - "version": "9.1.13", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.13.tgz", - "integrity": "sha512-9MLB1Xx7odKuxDoybVwiOB1ZEUZpL8FurYm4RVuW39ntsUt0IMC9Hb8UagZLTAWhaWSHydkD/KBQVVobGqd0lA==", - "dev": true + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-11.1.0.tgz", + "integrity": "sha512-XW+McH/RVjpLtNkft6UYZQbjhXwX/hvLgUa9jGlTuIFM5o7W4XRPnq5sfn3+QvzdROF0j8S5sy47mGVNQOYMNg==", + "dev": true, + "requires": { + "tslib": "^2.0.0" + } }, "@angular/compiler-cli": { - "version": "9.1.13", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.13.tgz", - "integrity": "sha512-40jbfMr1FinOqUyG3k4Moiytjs/Z8zKBgP3S5Qfn80EBJItRdFXwNtvaOi/onaag4+Mv+vigShwsgCewLbt/kA==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-11.1.0.tgz", + "integrity": "sha512-PLeVrqBpn43G7DeBkDQqH38Y+VMlCIbxiP4Vv1rFAmKVNIm9J8m8jdC3EQSTXVV+L3oDCVP5/ERSCZ8Jqx6UoA==", "dev": true, "requires": { + "@babel/core": "^7.8.6", + "@babel/types": "^7.8.6", "canonical-path": "1.0.0", "chokidar": "^3.0.0", "convert-source-map": "^1.5.1", @@ -33,6 +41,7 @@ "semver": "^6.3.0", "source-map": "^0.6.1", "sourcemap-codec": "^1.4.8", + "tslib": "^2.0.0", "yargs": "^16.1.1" }, "dependencies": { @@ -50,10 +59,13 @@ } }, "@angular/core": { - "version": "9.1.13", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.13.tgz", - "integrity": "sha512-mBm24Q9GjkAsxMAzqQ86U1078+yTEpr0+syMEruUtJ0HUH6Fzn3J+6xTLb+BVcGb9RkCkFaV9T5mcn6ZM0f++g==", - "dev": true + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-11.1.0.tgz", + "integrity": "sha512-VhiRWZEj9Q/OvbbSDcgQ4f53oVcMnDB4uNL8xaWnK0Sb3lZA4aQW3VOlROBITS5n2g7D1zRhvUzdfzVuyuMIaQ==", + "dev": true, + "requires": { + "tslib": "^2.0.0" + } }, "@babel/code-frame": { "version": "7.8.3", @@ -2644,6 +2656,14 @@ "dev": true, "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "ci-info": { @@ -12914,6 +12934,14 @@ "dev": true, "requires": { "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "safe-buffer": { @@ -14192,27 +14220,27 @@ } }, "ts-node": { - "version": "8.10.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz", - "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz", + "integrity": "sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==", "dev": true, "requires": { "arg": "^4.1.0", "diff": "^4.0.1", "make-error": "^1.1.1", - "source-map-support": "^0.5.17", - "yn": "3.1.1" + "source-map-support": "^0.5.6", + "yn": "^3.0.0" } }, "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" }, "tslint": { - "version": "5.20.1", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz", - "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==", + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz", + "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -14223,10 +14251,10 @@ "glob": "^7.1.1", "js-yaml": "^3.13.1", "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", + "mkdirp": "^0.5.3", "resolve": "^1.3.2", "semver": "^5.3.0", - "tslib": "^1.8.0", + "tslib": "^1.13.0", "tsutils": "^2.29.0" }, "dependencies": { @@ -14285,6 +14313,12 @@ "requires": { "has-flag": "^3.0.0" } + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true } } }, @@ -14347,6 +14381,14 @@ "dev": true, "requires": { "tslib": "^1.8.1" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } } }, "tty-browserify": { @@ -14459,15 +14501,15 @@ } }, "typescript": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", - "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz", + "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==", "dev": true }, "typescript-tslint-plugin": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz", - "integrity": "sha512-tR5igNQP+6FhxaPJYRlUBVsEl0n5cSuXRbg7L1y80mL4B1jUHb8uiIcbQBJ9zWyypJEdFYFUccpXxvMwZR8+AA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typescript-tslint-plugin/-/typescript-tslint-plugin-1.0.1.tgz", + "integrity": "sha512-akj+J1FDoEv8y5uSs6f6SfkY3ywnhnTifDvOmwejSs4U+a18p73YoetrllKCDf14iq0VMNwIgCxNY/v88K6QYg==", "dev": true, "requires": { "minimatch": "^3.0.4", @@ -15560,10 +15602,13 @@ "dev": true }, "zone.js": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz", - "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==", - "dev": true + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.3.tgz", + "integrity": "sha512-Y4hTHoh4VcxU5BDGAqEoOnOiyT254w6CiHtpQxAJUSMZPyVgdbKf+5R7Mwz6xsPhMIeBXk5rTopRZDpjssTCUg==", + "dev": true, + "requires": { + "tslib": "^2.0.0" + } } } } diff --git a/package.json b/package.json index 5bc087c16b..dceb37c220 100644 --- a/package.json +++ b/package.json @@ -22,11 +22,14 @@ "shipit": "npm run build && npm run readmes && npm run npmpub", "prettier": "prettier --write \"**/*.{js,json,css,scss,less,md,ts,html,component.html}\"" }, + "dependencies": { + "tslib": "^2.0.0" + }, "devDependencies": { - "@angular/common": "^9.1.13", - "@angular/compiler": "^9.1.13", - "@angular/compiler-cli": "^9.1.13", - "@angular/core": "^9.1.13", + "@angular/common": "^11.1.0", + "@angular/compiler": "^11.1.0", + "@angular/compiler-cli": "^11.1.0", + "@angular/core": "^11.1.0", "@types/cordova": "0.0.34", "@types/fs-extra": "^9.0.6", "@types/jest": "^26.0.20", @@ -34,7 +37,6 @@ "@types/node": "^12.19.15", "@types/rimraf": "^3.0.0", "@types/webpack": "^4.41.26", - "ajv": "^6.12.6", "async-promise-queue": "^1.0.5", "conventional-changelog-cli": "^2.1.1", "cz-conventional-changelog": "^3.3.0", @@ -53,20 +55,20 @@ "natives": "^1.1.6", "prettier": "^2.2.1", "rimraf": "^3.0.2", - "rxjs": "^6.6.3", + "rxjs": "~6.6.0", "ts-jest": "^26.4.4", - "ts-node": "^8.10.2", - "tslint": "^5.20.1", + "ts-node": "~8.3.0", + "tslint": "~6.1.0", "tslint-config-prettier": "^1.18.0", "tslint-ionic-rules": "0.0.21", "typedoc": "^0.18.0", - "typescript": "~3.8.3", - "typescript-tslint-plugin": "0.5.5", + "typescript": "~4.1.2", + "typescript-tslint-plugin": "^1.0.1", "uglifyjs-webpack-plugin": "^2.2.0", "unminified-webpack-plugin": "^2.0.0", "webpack": "^4.46.0", "winston": "^3.3.3", - "zone.js": "^0.10.3" + "zone.js": "~0.11.3" }, "jest": { "transform": { @@ -93,9 +95,6 @@ "path": "./node_modules/cz-conventional-changelog" } }, - "dependencies": { - "tslib": "^1.14.1" - }, "husky": { "hooks": { "pre-commit": "lint-staged" diff --git a/scripts/build/transformers/imports.ts b/scripts/build/transformers/imports.ts index befdf5653d..419e4ae3e3 100644 --- a/scripts/build/transformers/imports.ts +++ b/scripts/build/transformers/imports.ts @@ -4,6 +4,7 @@ import { getMethodsForDecorator } from '../helpers'; function transformImports(file: ts.SourceFile, ctx: ts.TransformationContext, ngcBuild?: boolean) { // remove angular imports if (!ngcBuild) { + // @ts-expect-error file.statements = (file.statements as any).filter( (s: any) => !(s.kind === ts.SyntaxKind.ImportDeclaration && s.moduleSpecifier.text === '@angular/core') );