From 19b22d02f97d9d582db35add6bcc6c144e359509 Mon Sep 17 00:00:00 2001 From: Adam Plumer Date: Wed, 6 Nov 2019 00:36:28 -0600 Subject: [PATCH] build: upgrade to Angular and CDK v9 --- package.json | 32 +++--- src/apps/demo-app/package.json | 8 +- src/apps/hello-world/package.json | 4 +- src/apps/universal-app/package.json | 12 +-- src/lib/package.json | 2 +- src/lib/tsconfig-build.json | 1 + yarn.lock | 159 ++++++++++++---------------- 7 files changed, 99 insertions(+), 119 deletions(-) diff --git a/package.json b/package.json index a63d1e428..4a503ef8a 100644 --- a/package.json +++ b/package.json @@ -27,29 +27,29 @@ "universal:serve": "gulp universal:serve" }, "version": "8.0.0-beta.27", - "requiredAngularVersion": ">=8.0.0-rc.5", + "requiredAngularVersion": ">=9.0.0-rc.0", "dependencies": { - "@angular/cdk": "^8.0.0-rc.1", - "@angular/common": "^8.0.0-rc.5", - "@angular/compiler": "^8.0.0-rc.5", - "@angular/core": "^8.0.0-rc.5", - "@angular/platform-browser": "^8.0.0-rc.5", + "@angular/cdk": "^9.0.0-rc.0", + "@angular/common": "^9.0.0-rc.0", + "@angular/compiler": "^9.0.0-rc.0", + "@angular/core": "^9.0.0-rc.0", + "@angular/platform-browser": "^9.0.0-rc.0", "core-js": "^2.5.7", "karma-parallel": "^0.3.1", "rxjs": "^6.5.1", "systemjs": "0.19.43", - "tsickle": "^0.35.0", + "tsickle": "^0.37.0", "tslib": "^1.9.3", - "zone.js": "~0.9.1" + "zone.js": "~0.10.2" }, "devDependencies": { - "@angular/animations": "^8.0.0-rc.5", - "@angular/compiler-cli": "^8.0.0-rc.5", - "@angular/forms": "^8.0.0-rc.5", - "@angular/material": "^8.0.0-rc.1", - "@angular/platform-browser-dynamic": "^8.0.0-rc.5", - "@angular/platform-server": "^8.0.0-rc.5", - "@angular/router": "^8.0.0-rc.5", + "@angular/animations": "^9.0.0-rc.0", + "@angular/compiler-cli": "^9.0.0-rc.0", + "@angular/forms": "^9.0.0-rc.0", + "@angular/material": "^9.0.0-rc.0", + "@angular/platform-browser-dynamic": "^9.0.0-rc.0", + "@angular/platform-server": "^9.0.0-rc.0", + "@angular/router": "^9.0.0-rc.0", "@firebase/app-types": "^0.3.2", "@types/chalk": "^0.4.31", "@types/fs-extra": "^4.0.5", @@ -119,7 +119,7 @@ "ts-node": "^3.0.4", "tsconfig-paths": "^2.3.0", "tslint": "^5.11.0", - "typescript": "~3.4.5", + "typescript": "~3.6.4", "uglify-js": "^2.8.14" }, "// Gulp": "Overwrite graceful-fs to a version that does not rely on the 'natives' package. This fixes gulp for >= 10.13, more information: #28213", diff --git a/src/apps/demo-app/package.json b/src/apps/demo-app/package.json index 0faa1ecab..f3d55ea92 100644 --- a/src/apps/demo-app/package.json +++ b/src/apps/demo-app/package.json @@ -14,7 +14,7 @@ "dependencies": { "@angular/animations": "file:../../../node_modules/@angular/animations", "@angular/cdk": "file:../../../node_modules/@angular/cdk", - "@angular/cli": "^8.3.17", + "@angular/cli": "^9.0.0-rc.0", "@angular/common": "file:../../../node_modules/@angular/common", "@angular/compiler": "file:../../../node_modules/@angular/compiler", "@angular/core": "file:../../../node_modules/@angular/core", @@ -30,9 +30,9 @@ "zone.js": "file:../../../node_modules/zone.js" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.803.17", + "@angular-devkit/build-angular": "~0.900.0-rc.0", "@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli", - "@angular/language-service": "^8.2.13", + "@angular/language-service": "^9.0.0-rc.0", "@types/jasmine": "~2.8.3", "@types/jasminewd2": "~2.0.2", "@types/node": "~6.0.60", @@ -49,4 +49,4 @@ "tslint": "~5.9.1", "typescript": "file:../../../node_modules/typescript" } -} +} \ No newline at end of file diff --git a/src/apps/hello-world/package.json b/src/apps/hello-world/package.json index 0ef140494..03002e64e 100644 --- a/src/apps/hello-world/package.json +++ b/src/apps/hello-world/package.json @@ -14,7 +14,7 @@ "dependencies": { "@angular/animations": "file:../../../node_modules/@angular/animations", "@angular/cdk": "file:../../../node_modules/@angular/cdk", - "@angular/cli": "^8.3.17", + "@angular/cli": "^9.0.0-rc.0", "@angular/common": "file:../../../node_modules/@angular/common", "@angular/compiler": "file:../../../node_modules/@angular/compiler", "@angular/core": "file:../../../node_modules/@angular/core", @@ -29,7 +29,7 @@ "zone.js": "file:../../../node_modules/zone.js" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.803.17", + "@angular-devkit/build-angular": "~0.900.0-rc.0", "@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli", "@angular/language-service": "^8.2.13", "typescript": "file:../../../node_modules/typescript" diff --git a/src/apps/universal-app/package.json b/src/apps/universal-app/package.json index 67f1eb910..62bb6e075 100644 --- a/src/apps/universal-app/package.json +++ b/src/apps/universal-app/package.json @@ -29,15 +29,15 @@ "@nguniversal/express-engine": "^8.1.1", "core-js": "^2.5.4", "express": "^4.16.2", - "rxjs": "~6.5.2", - "tslib": "^1.9.0", - "zone.js": "~0.9.1" + "rxjs": "~6.5.3", + "tslib": "^1.10.0", + "zone.js": "~0.10.2" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.803.17", - "@angular/cli": "~8.3.17", + "@angular-devkit/build-angular": "~0.900.0-rc.0", + "@angular/cli": "~9.0.0-rc.0", "@angular/compiler-cli": "file:../../../node_modules/@angular/compiler-cli", - "@angular/language-service": "~8.2.13", + "@angular/language-service": "~9.0.0-rc.0", "@types/node": "~8.9.4", "@types/jasmine": "~2.8.8", "@types/jasminewd2": "~2.0.3", diff --git a/src/lib/package.json b/src/lib/package.json index 2104f2856..90036af2c 100644 --- a/src/lib/package.json +++ b/src/lib/package.json @@ -23,7 +23,7 @@ }, "homepage": "https://github.com/angular/flex-layout#readme", "peerDependencies": { - "@angular/cdk": "^8.0.0-rc.0", + "@angular/cdk": "^9.0.0-rc.0", "@angular/core": "0.0.0-NG", "@angular/common": "0.0.0-NG", "@angular/platform-browser": "0.0.0-NG", diff --git a/src/lib/tsconfig-build.json b/src/lib/tsconfig-build.json index ac9a23a96..8f80cd8cb 100644 --- a/src/lib/tsconfig-build.json +++ b/src/lib/tsconfig-build.json @@ -38,6 +38,7 @@ ], "angularCompilerOptions": { "annotateForClosureCompiler": true, + "enableIvy": false, "strictMetadataEmit": true, "flatModuleOutFile": "index.js", "flatModuleId": "@angular/flex-layout", diff --git a/yarn.lock b/yarn.lock index 702f976f1..1fa725046 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,33 +2,27 @@ # yarn lockfile v1 -"@angular/animations@^8.0.0-rc.5": - version "8.2.13" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.2.13.tgz#0fdcf9bdcc0b310bff09a024557f0f935ae9b5dc" - integrity sha512-ZE4UZsQ6HDW1ZIj9tL45PVosCcG4Ke7ihV7eWCE1VgLZKDDxTOPbLf1UeEiszUYptMLGH3eGMNBKo85mOlkH8w== - dependencies: - tslib "^1.9.0" - -"@angular/cdk@^8.0.0-rc.1": - version "8.2.3" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.2.3.tgz#16b96ffa935cbf5a646757ecaf2b19c434678f72" - integrity sha512-ZwO5Sn720RA2YvBqud0JAHkZXjmjxM0yNzCO8RVtRE9i8Gl26Wk0j0nQeJkVm4zwv2QO8MwbKUKGTMt8evsokA== - dependencies: - tslib "^1.7.1" +"@angular/animations@^9.0.0-rc.0": + version "9.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-9.0.0-rc.0.tgz#8d0ebebebcaf152f08c229a25c175729254759d2" + integrity sha512-H6d5STkg6IgmzsNKZf9d3u7uqWR7T1ouFzyZHCt3CVifo9P17K0sQkqz1tjxT3oxI4SGeBWnDhJKV3kcFKePOg== + +"@angular/cdk@^9.0.0-rc.0": + version "9.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-9.0.0-rc.0.tgz#b5935d7445fcd8b2bb22d950939fa5b26c2bc4ac" + integrity sha512-7lOEQI+A1/maVRc3G+LNAF8N4tZqIj9PernfLfhrkKz+s212yjceJkbjvJMLV95M5Jq//lao3q4K52Jq8V11EQ== optionalDependencies: parse5 "^5.0.0" -"@angular/common@^8.0.0-rc.5": - version "8.2.13" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.2.13.tgz#32e374396e17d85791672a0900ad972c6b3e50ed" - integrity sha512-I9cTcjUi88L+Mb/a/ZzUrdDcn3YgFFK9LubxaPjAfr6+G7IZ//MY5HuvG8Y41yKprXVVvQCbQ1yQD+GGRSCkaA== - dependencies: - tslib "^1.9.0" +"@angular/common@^9.0.0-rc.0": + version "9.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-9.0.0-rc.0.tgz#4b11c34d1ac4137d99d840a913218b0ffe1aa173" + integrity sha512-YU6FbBeZZPePNqzdK90CNLDw13yXloJ4XltVykOV8ScJuBC2qgpn3qFFIcs8b58rbQ2uOsp9IqUUUCO0bFDADw== -"@angular/compiler-cli@^8.0.0-rc.5": - version "8.2.13" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.2.13.tgz#c8f842e3873c9eadd6629f66d6156c94ae9cd522" - integrity sha512-ryW2Kozx/oHJrtdeIhgZ24RIU7Za3YIOHS9EMCQ8xMo+ZlSI+t2zOlLAXzK4PVWEjuTtQlKbT0KqilgU0QsHJg== +"@angular/compiler-cli@^9.0.0-rc.0": + version "9.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-9.0.0-rc.0.tgz#8989e26e8220b7d4df3562ae8fe818c829d42ff6" + integrity sha512-ZULmYBxJbjsXlWMN3HhEAnvr/i0k0WUjg6QoAiYb/WpWOSwfgO1khRfcutD7S2hyb8JX8aozZpjQK3CLOWCgvQ== dependencies: canonical-path "1.0.0" chokidar "^2.1.1" @@ -37,67 +31,52 @@ magic-string "^0.25.0" minimist "^1.2.0" reflect-metadata "^0.1.2" + semver "^6.3.0" source-map "^0.6.1" - tslib "^1.9.0" yargs "13.1.0" -"@angular/compiler@^8.0.0-rc.5": - version "8.2.13" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.2.13.tgz#76d35761918df8cadeb1624418377712d259347f" - integrity sha512-u2NWCvEn4SjbMvn2PG6sYcf+rR5u3aYMv3/mNQ9k+2UmCIu3yJrcuCzebjo5SdlDVqKD2vzbyMZnr8VB9OcceQ== - dependencies: - tslib "^1.9.0" - -"@angular/core@^8.0.0-rc.5": - version "8.2.13" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.2.13.tgz#b65b81ddb9400f4f11491b6032c2ace9b90e32b4" - integrity sha512-W8HN0lUQV4Sq85l17nhRIXeIfcw1ZdpgGm6to98pl0y9l/1srfzWfTnofuwCJC7gedt5AMrYJGUaNiDbByosFw== - dependencies: - tslib "^1.9.0" - -"@angular/forms@^8.0.0-rc.5": - version "8.2.13" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.2.13.tgz#8bb2a5d3e0e8adc17e2bcc94b07d3a56c557ed63" - integrity sha512-l7lHD4kbWK70KY0Xp4IpSa106ZzSgPMwRYMFKd9qhYaJ7v0Y7Shh7Z/ZDCOP730maj9WULnpy5X4eeozWXgvgg== - dependencies: - tslib "^1.9.0" - -"@angular/material@^8.0.0-rc.1": - version "8.2.3" - resolved "https://registry.yarnpkg.com/@angular/material/-/material-8.2.3.tgz#16543e4e06a3fde2651a25cfe126e88e714ae105" - integrity sha512-SOczkIaqes+r+9XF/UUiokidfFKBpHkOPIaFK857sFD0FBNPvPEpOr5oHKCG3feERRwAFqHS7Wo2ohVEWypb5A== - dependencies: - tslib "^1.7.1" - -"@angular/platform-browser-dynamic@^8.0.0-rc.5": - version "8.2.13" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.13.tgz#238025b7b3a6d8b1aa9025df52805e5ee0119f55" - integrity sha512-KP5psUKujAO8jZKHi6LRC+N7hE/epiGOhYZxdher1sCi81sYoZmqrEWkVZ4VKhov/4aC409CocDXcF7nmHV8tg== - dependencies: - tslib "^1.9.0" - -"@angular/platform-browser@^8.0.0-rc.5": - version "8.2.13" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.2.13.tgz#4b7ecfb67c9a3db30d9d403677db70c496c40983" - integrity sha512-1lPbeLQIbbafjq9ul3IA8s2fMJ/EXeMJ74ouTolVXoPPur9ZPRLX9FqBAO1K4QzkAWhRlyf6qIC+mDZfJILwZw== - dependencies: - tslib "^1.9.0" - -"@angular/platform-server@^8.0.0-rc.5": - version "8.2.13" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.2.13.tgz#be654535e4c59051a09603266cb5a0a1ae030505" - integrity sha512-rRSqcUF0ExiE8mhX8Gwu4aDvrcyKi7VxLd2/wXXFQ3kuxwiWJ36RJ/ciJ8WrAjWjvvHHtJ8iEyF2BxJqGjqWlQ== +"@angular/compiler@^9.0.0-rc.0": + version "9.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0-rc.0.tgz#4964e91af01e7d9fca0ec8c6ec56ea66ad263d15" + integrity sha512-gKU+g8lLD6U22qH7osKUcEDjWz5aUk3p2xavqWLsBVRvVCbDOB/Y2aMvjI1lkl0hiV5fSJXH/FrjVCTNDYtXSQ== + +"@angular/core@^9.0.0-rc.0": + version "9.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.0.0-rc.0.tgz#35eb185cddf72ea084079046fe328e14d025ad09" + integrity sha512-GSyxLHKQh6/BBUkoCmjq+4eKlYQldXoKUZlVBBb14fhdzUKjkvXUt140P5smJGxYT62zovjTzB7fJYs4CDn6HQ== + +"@angular/forms@^9.0.0-rc.0": + version "9.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-9.0.0-rc.0.tgz#98fcb1f7d20f2bf9c1a868aa719650970dc037c4" + integrity sha512-X6YVoIKtfDOKnRAsuq9cvAF2YioCmbnYXDOLcqPsy3sY1np5NIONo1bTP4z6yEdkdrgj3wja8VB/HUI1Gzfb4Q== + +"@angular/material@^9.0.0-rc.0": + version "9.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/material/-/material-9.0.0-rc.0.tgz#ba0922265ffd1cf6cc82384b6ef645f76ff813ce" + integrity sha512-NvBGLhNBsdwowJetwDP8dD4HI2udWrWd70CqtOQ2CvBl0jTl0sW5Klt58VldrK56eE9YMl19qcOfCcAxvTSVTQ== + +"@angular/platform-browser-dynamic@^9.0.0-rc.0": + version "9.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.0.0-rc.0.tgz#d40367cb27a02f142978e268a77c9804f5c0023c" + integrity sha512-7o/cToWJy7TNv4Eh2HblCfbFQXIAusxty0XqK9n+PB4bwwMOl28KTbzk1VrxPeCsJeDvff8WAhTViLkXVLsc9Q== + +"@angular/platform-browser@^9.0.0-rc.0": + version "9.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-9.0.0-rc.0.tgz#1e52a2b772cbeecb078d1ee3d5a1210371d6d5ac" + integrity sha512-j4GsCXFZDqEmCmAB1CjUVG5BRzWIYyNf08idaohQNSldxilGRcN2ZCma3fFLz/mKk2/+RPvtk7abO4bZ+saqTQ== + +"@angular/platform-server@^9.0.0-rc.0": + version "9.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-9.0.0-rc.0.tgz#38a44dd2e77ca1ede6ac9a8acacf43f6f0bb9bbb" + integrity sha512-LZVNdSEbC1FLtK4LuMJejxfoiwGZGADfozOEFnjjVtRF56zNLj7E/0CXdHmR8FaY/n6WZyPpP+pqbY8kajCjhA== dependencies: domino "^2.1.2" - tslib "^1.9.0" xhr2 "^0.1.4" -"@angular/router@^8.0.0-rc.5": - version "8.2.13" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.2.13.tgz#fad64a7147e2863d8332aaaa08b3bda9e3dcdd51" - integrity sha512-9CqnachtdASnEmRMtrG/R3c5nDCjjlCU4n0W/xt5+LlveyuUVvAT/CFUC38km4Df3lIvqap8mSpxzGaEzCL+wQ== - dependencies: - tslib "^1.9.0" +"@angular/router@^9.0.0-rc.0": + version "9.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-9.0.0-rc.0.tgz#28b6a1276b64a841cea4c315b4e4739b86c119d3" + integrity sha512-n4T+c3UI/+PxHWyL+z1S7G2HOFz9xgc5Sk1MCdm+mpBsFtKmx9eyPN+kRkiGCDpW/3argNRmOwiHmrlJzR5dQQ== "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5": version "7.5.5" @@ -9626,16 +9605,16 @@ tsconfig@^6.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tsickle@^0.35.0: - version "0.35.0" - resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.35.0.tgz#59235df45937c0ec5d072c616c26d2d97fba54b9" - integrity sha512-irsZLX4293YUl9TuwNC5Fy020eLSc4bC3LfKnxnx1oq5wmZD9zSP8qvNNTiwRmf2/rxH+58JINcTARDjuvn+oQ== +tsickle@^0.37.0: + version "0.37.0" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.37.0.tgz#cc8a174310ac349913c62477b346db4f342c87d1" + integrity sha512-ufUZqLUNqh+kOfr52N/hJ5JbiDO32/CO7ZCteZBX9HA2kiejwEgDaJeJe1GAj2TIu683IgTA/LPKvlns6Liw0w== dependencies: minimist "^1.2.0" mkdirp "^0.5.1" source-map "^0.7.3" -tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: +tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== @@ -9713,10 +9692,10 @@ typescript@~2.7.1: resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836" integrity sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw== -typescript@~3.4.5: - version "3.4.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99" - integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw== +typescript@~3.6.4: + version "3.6.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.4.tgz#b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d" + integrity sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg== uglify-js@3.4.x: version "3.4.10" @@ -10623,7 +10602,7 @@ zip-stream@^1.2.0: lodash "^4.8.0" readable-stream "^2.0.0" -zone.js@~0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b" - integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag== +zone.js@~0.10.2: + version "0.10.2" + resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.2.tgz#67ca084b3116fc33fc40435e0d5ea40a207e392e" + integrity sha512-UAYfiuvxLN4oyuqhJwd21Uxb4CNawrq6fPS/05Su5L4G+1TN+HVDJMUHNMobVQDFJRir2cLAODXwluaOKB7HFg==