From dece39123ee1b794fd88abe6e74aa2dc658d4335 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Wed, 29 Nov 2017 16:07:38 -0600 Subject: [PATCH 1/4] fix(aot): fix error reporting with ng 5.0.1 or greater --- package-lock.json | 353 ++++++++++++++++++++-------------------- package.json | 26 +-- src/aot/aot-compiler.ts | 20 ++- 3 files changed, 199 insertions(+), 200 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b537b72..189f687c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,14 +5,14 @@ "requires": true, "dependencies": { "@angular-devkit/build-optimizer": { - "version": "0.0.32", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.32.tgz", - "integrity": "sha512-j09JdaFoRukEllfmH+TUJpe2ujUzTSj/szqYGHWVBilajwnNQh7f0A9v1R27mX+2di4x8tXuvaBgwvdEZBv32w==", + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.33.tgz", + "integrity": "sha512-qdGAwI3Yd3QIJ4FJsJcAyBVThUVEGKqSm0E3njSVSQkEatjvxHXNDvexBieQDPiUhjYG2Yyobor8nW5EMxPieQ==", "requires": { "loader-utils": "1.1.0", "source-map": "0.5.7", - "typescript": "2.6.1", - "webpack-sources": "1.0.2" + "typescript": "2.6.2", + "webpack-sources": "1.1.0" }, "dependencies": { "source-map": { @@ -21,43 +21,43 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, "typescript": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz", - "integrity": "sha1-7znN6ierrAtQAkLWcmq5DgyEZjE=" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz", + "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=" } } }, "@angular/animations": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.0.tgz", - "integrity": "sha1-ta0ZnGf5P3WVREd+/+ZnnhVJkfs=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.3.tgz", + "integrity": "sha1-8IsHAHsUn6EmecNG+lWCD1RLGeA=", "dev": true, "requires": { "tslib": "1.8.0" } }, "@angular/common": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0.tgz", - "integrity": "sha1-+W1mpRe5ldG6mygwnxXC41lnWCU=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.3.tgz", + "integrity": "sha1-mwuHTgyMsIjXx94q9ywsPz69ALs=", "dev": true, "requires": { "tslib": "1.8.0" } }, "@angular/compiler": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0.tgz", - "integrity": "sha1-uf+/GMijnYt9rOxHMZOpDiTMK8k=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.3.tgz", + "integrity": "sha1-RYF8mjKxsQPAMHsPVWYPUw9KBqo=", "dev": true, "requires": { "tslib": "1.8.0" } }, "@angular/compiler-cli": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.0.tgz", - "integrity": "sha1-Dsu5N9hKT43ZTwwqR7B9LkaUyFM=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.3.tgz", + "integrity": "sha1-gg/pX1ZTwUGK2aycqegZqHnM5K4=", "dev": true, "requires": { "chokidar": "1.7.0", @@ -67,54 +67,54 @@ } }, "@angular/core": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0.tgz", - "integrity": "sha1-T5dqIl993fNJkvLK2CTJVDpG9Mg=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.3.tgz", + "integrity": "sha1-JWZAD2cTvxw59+ALwDpjKAqH5ms=", "dev": true, "requires": { "tslib": "1.8.0" } }, "@angular/forms": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.0.tgz", - "integrity": "sha1-x/3fo1OWdZrphSkgowzdqMQe0d4=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.3.tgz", + "integrity": "sha1-IH+Swr2JZg3aWFjvWNHqwfLK8ac=", "dev": true, "requires": { "tslib": "1.8.0" } }, "@angular/http": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.0.tgz", - "integrity": "sha1-Byiivgz7sHhyfF64fUyF1T/smlE=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.3.tgz", + "integrity": "sha1-o7mkJHxLd0VuSVSWVdTB0YWeB10=", "dev": true, "requires": { "tslib": "1.8.0" } }, "@angular/platform-browser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0.tgz", - "integrity": "sha1-xwOPfN6AcFtiAUiXIx4YLuyXb+0=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.3.tgz", + "integrity": "sha1-SshyQEoqgWLdKKWxZCOLdr9eEmE=", "dev": true, "requires": { "tslib": "1.8.0" } }, "@angular/platform-browser-dynamic": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0.tgz", - "integrity": "sha1-iH4QbIsQOwQVz2FWpCXabYP0yJ0=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.3.tgz", + "integrity": "sha1-vm3PA6BPpRxqBIS0Dl8afX5UzIc=", "dev": true, "requires": { "tslib": "1.8.0" } }, "@angular/platform-server": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-5.0.0.tgz", - "integrity": "sha1-h30l74FK+S//x7C1I7lxpv8iIBg=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-5.0.3.tgz", + "integrity": "sha1-XzF15aWcr/coWXoHHUxeFjwT8p4=", "dev": true, "requires": { "domino": "1.0.30", @@ -129,7 +129,7 @@ "dev": true, "requires": { "@types/express": "4.0.39", - "@types/node": "8.0.51" + "@types/node": "8.0.53" } }, "@types/chokidar": { @@ -138,7 +138,7 @@ "integrity": "sha512-0gUr9F5yQY3fynp/HbUOCihob3rISG7HxE/9rivWrDY9UEZ+WPODYjtfccRlY1tuhZTyNtck68umiZ00ghxU5g==", "dev": true, "requires": { - "@types/node": "8.0.51" + "@types/node": "8.0.53" } }, "@types/clean-css": { @@ -154,26 +154,26 @@ "dev": true, "requires": { "@types/body-parser": "1.16.8", - "@types/express-serve-static-core": "4.0.56", + "@types/express-serve-static-core": "4.0.57", "@types/serve-static": "1.13.1" } }, "@types/express-serve-static-core": { - "version": "4.0.56", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.56.tgz", - "integrity": "sha512-/0nwIzF1Bd4KGwW4lhDZYi5StmCZG1DIXXMfQ/zjORzlm4+F1eRA4c6yJQrt4hqX//TDtPULpSlYwmSNyCMeMg==", + "version": "4.0.57", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.57.tgz", + "integrity": "sha512-QLAHjdLwEICm3thVbXSKRoisjfgMVI4xJH/HU8F385BR2HI7PmM6ax4ELXf8Du6sLmSpySXMYaI+xc//oQ/IFw==", "dev": true, "requires": { - "@types/node": "8.0.51" + "@types/node": "8.0.53" } }, "@types/fs-extra": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.4.tgz", - "integrity": "sha512-u2LUBibrqjpF/AJ9trGmpIZMBQ8zjLqDHO7f25gNfNHI+/cCvFjut7u2s7Dn6tbETFBgJEjb/INRDCbTF8nJUA==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.5.tgz", + "integrity": "sha512-tIG0GpHum5IFb8Qze/cSv0w/0gNzHB+MUDftTQaxenx46z50g51/MPkNLssLz9+uZLzCDd35bT9qtWOTXZ21Gw==", "dev": true, "requires": { - "@types/node": "8.0.51" + "@types/node": "8.0.53" } }, "@types/glob": { @@ -183,13 +183,13 @@ "dev": true, "requires": { "@types/minimatch": "3.0.1", - "@types/node": "8.0.51" + "@types/node": "8.0.53" } }, "@types/jest": { - "version": "21.1.6", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-21.1.6.tgz", - "integrity": "sha512-/qrwhjCeZ8vZy/TPXm56A3baMMUDPfUMkhOGZP3M7dgPCGPZSX/zSieM7jYPuhX3kMcMfsYuvsFIt23u7Ypu2g==", + "version": "21.1.8", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-21.1.8.tgz", + "integrity": "sha512-hQbL8aBM/g5S++sM1gb4yC73Dg+FK3uYE+Ioht1RPy629+LV/RmH6q+e+jbQEwKJdWAP/YE4s67CPO+ElkMivg==", "dev": true }, "@types/mime": { @@ -210,13 +210,13 @@ "integrity": "sha1-TYElQeh7I1dyYaWqlfcE3T0B5BA=", "dev": true, "requires": { - "@types/node": "8.0.51" + "@types/node": "8.0.53" } }, "@types/node": { - "version": "8.0.51", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.51.tgz", - "integrity": "sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==", + "version": "8.0.53", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.53.tgz", + "integrity": "sha512-54Dm6NwYeiSQmRB1BLXKr5GELi0wFapR1npi8bnZhEcu84d/yQKqnwwXQ56hZ0RUbTG6L5nqDZaN3dgByQXQRQ==", "dev": true }, "@types/node-sass": { @@ -225,7 +225,7 @@ "integrity": "sha1-spbM5xRP+rd7hAkMqtTx5Lvqjgk=", "dev": true, "requires": { - "@types/node": "8.0.51" + "@types/node": "8.0.53" } }, "@types/rewire": { @@ -240,7 +240,7 @@ "integrity": "sha512-jDMH+3BQPtvqZVIcsH700Dfi8Q3MIcEx16g/VdxjoqiGR/NntekB10xdBpirMKnPe9z2C5cBmL0vte0YttOr3Q==", "dev": true, "requires": { - "@types/express-serve-static-core": "4.0.56", + "@types/express-serve-static-core": "4.0.57", "@types/mime": "2.0.0" } }, @@ -271,7 +271,7 @@ "integrity": "sha512-121nghW8XJ0tFNGuQh5k+VoSMLm71c7bEmNI0MMNDtKiNUcij3nWwypQccfEQrGcmJCAMkoC5vZLtdT4fbbCzw==", "dev": true, "requires": { - "@types/node": "8.0.51", + "@types/node": "8.0.53", "@types/tapable": "0.2.4", "@types/uglify-js": "2.6.29" } @@ -282,7 +282,7 @@ "integrity": "sha512-XehU2SdII5wu7EUV1bAwCoTDZYZCCU7Es7gbHtJjGXq6Bs2AI4HuJ//wvPrVuuYwkkZseQzDUxsZF8Urnb3I1A==", "dev": true, "requires": { - "@types/node": "8.0.51" + "@types/node": "8.0.53" } }, "JSONStream": { @@ -359,9 +359,9 @@ "dev": true }, "ajv": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz", - "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.0.tgz", + "integrity": "sha1-6yhAdG6dxIvV4GOjbj/UAMXqtak=", "requires": { "co": "4.6.0", "fast-deep-equal": "1.0.0", @@ -562,8 +562,8 @@ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz", "integrity": "sha512-C9yv/UF3X+eJTi/zvfxuyfxmLibYrntpF3qoJYrMeQwgUJOZrZvpJiMG2FMQ3qnhWtF/be4pYONBBw95ZGe3vA==", "requires": { - "browserslist": "2.9.0", - "caniuse-lite": "1.0.30000760", + "browserslist": "2.9.1", + "caniuse-lite": "1.0.30000775", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "6.0.14", @@ -630,7 +630,7 @@ "babel-traverse": "6.26.0", "babel-types": "6.26.0", "babylon": "6.18.0", - "convert-source-map": "1.5.0", + "convert-source-map": "1.5.1", "debug": "2.6.9", "json5": "0.5.1", "lodash": "4.17.4", @@ -844,9 +844,9 @@ "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==" }, "binary-extensions": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", - "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=" + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", + "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=" }, "block-stream": { "version": "0.0.9", @@ -1014,19 +1014,19 @@ } }, "browserify-zlib": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", - "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", + "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "requires": { - "pako": "0.2.9" + "pako": "1.0.6" } }, "browserslist": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.9.0.tgz", - "integrity": "sha512-vJEBcDTANoDhSHL46NeOEW5hvQw7It9uCqzeFPQhpawXfnOwnpvW5C97vn1eGJ7iCkSg8wWU0nYObE7d/N95Iw==", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.9.1.tgz", + "integrity": "sha512-3n3nPdbUqn3nWmsy4PeSQthz2ja1ndpoXta+dwFFNhveGjMg6FXpWYe12vsTpNoXJbzx3j7GZXdtoVIdvh3JbA==", "requires": { - "caniuse-lite": "1.0.30000760", + "caniuse-lite": "1.0.30000775", "electron-to-chromium": "1.3.27" } }, @@ -1090,9 +1090,9 @@ } }, "caniuse-lite": { - "version": "1.0.30000760", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000760.tgz", - "integrity": "sha1-7HIDlXQvHH7IlH/W3SYE53qPmP8=" + "version": "1.0.30000775", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000775.tgz", + "integrity": "sha1-dNJ/7dxH88hM+8sTDDCSo168LeI=" }, "caseless": { "version": "0.12.0", @@ -1135,9 +1135,9 @@ } }, "ci-info": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.1.tgz", - "integrity": "sha512-vHDDF/bP9RYpTWtUhpJRhCFdvvp3iDWvEbuDbWgvjUrNGV1MXJrE0MPcwGtEled04m61iwdBLUIHZtDgzWS4ZQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz", + "integrity": "sha512-uTGIPNx/nSpBdsF6xnseRXLLtfr9VLqkz8ZqHXr3Y7b6SftyRxBGjwMtJj1OhNbmlc1wZzLNAlAcvyIiE8a6ZA==", "dev": true }, "cipher-base": { @@ -1212,9 +1212,9 @@ } }, "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + "version": "2.12.2", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz", + "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==" }, "compare-func": { "version": "1.3.2", @@ -1449,9 +1449,9 @@ } }, "convert-source-map": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", - "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", "dev": true }, "cookie": { @@ -1582,7 +1582,7 @@ "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "requires": { - "es5-ext": "0.10.35" + "es5-ext": "0.10.37" } }, "dargs": { @@ -1819,9 +1819,9 @@ } }, "es5-ext": { - "version": "0.10.35", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz", - "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=", + "version": "0.10.37", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz", + "integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=", "requires": { "es6-iterator": "2.0.3", "es6-symbol": "3.1.1" @@ -1833,7 +1833,7 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.35", + "es5-ext": "0.10.37", "es6-symbol": "3.1.1" } }, @@ -1843,7 +1843,7 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.35", + "es5-ext": "0.10.37", "es6-iterator": "2.0.3", "es6-set": "0.1.5", "es6-symbol": "3.1.1", @@ -1856,7 +1856,7 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.35", + "es5-ext": "0.10.37", "es6-iterator": "2.0.3", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" @@ -1868,7 +1868,7 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.35" + "es5-ext": "0.10.37" } }, "es6-weak-map": { @@ -1877,7 +1877,7 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.35", + "es5-ext": "0.10.37", "es6-iterator": "2.0.3", "es6-symbol": "3.1.1" } @@ -1952,9 +1952,9 @@ "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" }, "estree-walker": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.0.tgz", - "integrity": "sha512-/bEAy+yKAZQrEWUhGmS3H9XpGqSDBtRzX0I2PgMw9kA2n1jN22uV5B5p7MFdZdvWdXCRJztXAfx6ZeRfgkEETg==" + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.1.tgz", + "integrity": "sha512-7HgCgz1axW7w5aOvgOQkoR1RMBkllygJrssU3BvymKQ95lxXYv6Pon17fBRDm9qhkvXZGijOULoSF9ShOk/ZLg==" }, "esutils": { "version": "2.0.2", @@ -1972,7 +1972,7 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.35" + "es5-ext": "0.10.37" } }, "events": { @@ -2263,7 +2263,7 @@ "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==", "optional": true, "requires": { - "nan": "2.7.0", + "nan": "2.8.0", "node-pre-gyp": "0.6.39" }, "dependencies": { @@ -3155,7 +3155,7 @@ "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=", "dev": true, "requires": { - "ini": "1.3.4" + "ini": "1.3.5" } }, "github": { @@ -3316,7 +3316,7 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "5.3.0", + "ajv": "5.5.0", "har-schema": "2.0.0" } }, @@ -3439,9 +3439,9 @@ } }, "https-browserify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", - "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", + "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=" }, "iconv-lite": { "version": "0.4.19", @@ -3492,15 +3492,15 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true }, "interpret": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz", - "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", + "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=" }, "invariant": { "version": "2.2.2", @@ -3541,7 +3541,7 @@ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "requires": { - "binary-extensions": "1.10.0" + "binary-extensions": "1.11.0" } }, "is-buffer": { @@ -3563,7 +3563,7 @@ "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=", "dev": true, "requires": { - "ci-info": "1.1.1" + "ci-info": "1.1.2" } }, "is-dotfile": { @@ -3881,7 +3881,7 @@ "string-length": "2.0.0", "strip-ansi": "4.0.0", "which": "1.3.0", - "worker-farm": "1.5.1", + "worker-farm": "1.5.2", "yargs": "9.0.1" } }, @@ -4107,7 +4107,7 @@ "jest-docblock": "21.2.0", "micromatch": "2.3.11", "sane": "2.2.0", - "worker-farm": "1.5.1" + "worker-farm": "1.5.2" } }, "jest-jasmine2": { @@ -4195,7 +4195,7 @@ "jest-util": "21.2.1", "pify": "3.0.0", "throat": "4.1.0", - "worker-farm": "1.5.1" + "worker-farm": "1.5.2" }, "dependencies": { "pify": { @@ -4216,7 +4216,7 @@ "babel-jest": "21.2.0", "babel-plugin-istanbul": "4.1.5", "chalk": "2.3.0", - "convert-source-map": "1.5.0", + "convert-source-map": "1.5.1", "graceful-fs": "4.1.11", "jest-config": "21.2.1", "jest-haste-map": "21.2.0", @@ -4919,9 +4919,9 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "nan": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz", - "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=" + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", + "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=" }, "natural-compare": { "version": "1.4.0", @@ -4968,20 +4968,20 @@ "dev": true }, "node-libs-browser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", - "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", + "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", "requires": { "assert": "1.4.1", - "browserify-zlib": "0.1.4", + "browserify-zlib": "0.2.0", "buffer": "4.9.1", "console-browserify": "1.1.0", "constants-browserify": "1.0.0", "crypto-browserify": "3.12.0", "domain-browser": "1.1.7", "events": "1.1.1", - "https-browserify": "0.0.1", - "os-browserify": "0.2.1", + "https-browserify": "1.0.0", + "os-browserify": "0.3.0", "path-browserify": "0.0.0", "process": "0.11.10", "punycode": "1.4.1", @@ -4989,19 +4989,12 @@ "readable-stream": "2.3.3", "stream-browserify": "2.0.1", "stream-http": "2.7.2", - "string_decoder": "0.10.31", + "string_decoder": "1.0.3", "timers-browserify": "2.0.4", "tty-browserify": "0.0.0", "url": "0.11.0", "util": "0.10.3", "vm-browserify": "0.0.4" - }, - "dependencies": { - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - } } }, "node-notifier": { @@ -5033,7 +5026,7 @@ "lodash.mergewith": "4.6.0", "meow": "3.7.0", "mkdirp": "0.5.1", - "nan": "2.7.0", + "nan": "2.8.0", "node-gyp": "3.6.2", "npmlog": "4.1.2", "request": "2.83.0", @@ -5217,9 +5210,9 @@ } }, "os-browserify": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", - "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=" + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=" }, "os-homedir": { "version": "1.0.2", @@ -5282,9 +5275,9 @@ } }, "pako": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", + "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==" }, "parse-asn1": { "version": "5.1.0", @@ -5788,7 +5781,7 @@ "integrity": "sha512-qK0+uhktmnAgZkHkqFuajNmPw93fjrO7+CysDaxWE5jrUR9XSlSvuao5ZJP+XizxA8weakhgYYBtbVz9SGBpjA==", "requires": { "acorn": "5.2.1", - "estree-walker": "0.5.0", + "estree-walker": "0.5.1", "magic-string": "0.22.4", "resolve": "1.5.0", "rollup-pluginutils": "2.0.1" @@ -5827,7 +5820,7 @@ "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==", "dev": true, "requires": { - "symbol-observable": "1.0.4" + "symbol-observable": "1.1.0" } }, "safe-buffer": { @@ -6238,9 +6231,9 @@ } }, "symbol-observable": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz", - "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz", + "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw==", "dev": true }, "symbol-tree": { @@ -6425,14 +6418,14 @@ "babel-code-frame": "6.26.0", "builtin-modules": "1.1.1", "chalk": "2.3.0", - "commander": "2.11.0", + "commander": "2.12.2", "diff": "3.4.0", "glob": "7.1.2", "minimatch": "3.0.4", "resolve": "1.5.0", "semver": "5.4.1", "tslib": "1.8.0", - "tsutils": "2.12.2" + "tsutils": "2.13.0" } }, "tslint-eslint-rules": { @@ -6495,9 +6488,9 @@ } }, "tsutils": { - "version": "2.12.2", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.2.tgz", - "integrity": "sha1-rVikhl0X7D3bZjG2ylO+FKVlb/M=", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.13.0.tgz", + "integrity": "sha512-FuWzNJbMsp3gcZMbI3b5DomhW4Ia41vMxjN63nKWI0t7f+I3UmHfRl0TrXJTwI2LUduDG+eR1Mksp3pvtlyCFQ==", "requires": { "tslib": "1.8.0" } @@ -6546,11 +6539,11 @@ "dev": true }, "uglify-es": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.9.tgz", - "integrity": "sha512-wVSiJKHDgDDFmxTVVvnbAH6IpamAFHYDI+5JvwPdaqIMnk8kRTX2JKwq1Fx7gb2+Jj5Dus8kzvIpKkWOMNU51w==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.0.tgz", + "integrity": "sha512-eD4rjK4o6rzrvE1SMZJLQFEVMnWRUyIu6phJ0BXk5TIthMmP5B4QP0HI8o3bkQB5wf1N4WHA0leZAQyQBAd+Jg==", "requires": { - "commander": "2.11.0", + "commander": "2.12.2", "source-map": "0.6.1" } }, @@ -6567,7 +6560,7 @@ "requires": { "source-map": "0.5.7", "uglify-js": "2.8.29", - "webpack-sources": "1.0.2" + "webpack-sources": "1.1.0" }, "dependencies": { "camelcase": { @@ -6614,9 +6607,9 @@ } }, "ultron": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz", - "integrity": "sha1-sHoualQagV/Go0zNRTO67DB8qGQ=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==" }, "underscore.string": { "version": "3.3.4", @@ -6757,31 +6750,31 @@ "dev": true }, "webpack": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.6.0.tgz", - "integrity": "sha512-OsHT3D0W0KmPPh60tC7asNnOmST6bKTiR90UyEdT9QYoaJ4OYN4Gg7WK1k3VxHK07ZoiYWPsKvlS/gAjwL/vRA==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz", + "integrity": "sha512-5ZXLWWsMqHKFr5y0N3Eo5IIisxeEeRAajNq4mELb/WELOR7srdbQk2N5XiyNy2A/AgvlR3AmeBCZJW8lHrolbw==", "requires": { "acorn": "5.2.1", "acorn-dynamic-import": "2.0.2", - "ajv": "5.3.0", + "ajv": "5.5.0", "ajv-keywords": "2.1.1", "async": "2.6.0", "enhanced-resolve": "3.4.1", "escope": "3.6.0", - "interpret": "1.0.4", + "interpret": "1.1.0", "json-loader": "0.5.7", "json5": "0.5.1", "loader-runner": "2.3.0", "loader-utils": "1.1.0", "memory-fs": "0.4.1", "mkdirp": "0.5.1", - "node-libs-browser": "2.0.0", + "node-libs-browser": "2.1.0", "source-map": "0.5.7", "supports-color": "4.5.0", "tapable": "0.2.8", "uglifyjs-webpack-plugin": "0.4.6", "watchpack": "1.4.0", - "webpack-sources": "1.0.2", + "webpack-sources": "1.1.0", "yargs": "8.0.2" }, "dependencies": { @@ -6919,9 +6912,9 @@ } }, "webpack-sources": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.2.tgz", - "integrity": "sha512-Y7UddMCv6dGjy81nBv6nuQeFFIt5aalHm7uyDsAsW86nZwfOVPGRr3XMjEQLaT+WKo8rlzhC9qtbJvYKLtAwaw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz", + "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==", "requires": { "source-list-map": "2.0.0", "source-map": "0.6.1" @@ -7014,9 +7007,9 @@ "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" }, "worker-farm": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.1.tgz", - "integrity": "sha512-T5NH6Wqsd8MwGD4AK8BBllUy6LmHaqjEOyo/YIUEegZui6/v5Bqde//3jwyE3PGiGYMmWi06exFBi5LNhhPFNw==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.2.tgz", + "integrity": "sha512-XxiQ9kZN5n6mmnW+mFJ+wXjNNI/Nx4DIdaAKLX1Bn6LYBWlN/zaBhu34DQYPZ1AJobQuu67S2OfDdNSVULvXkQ==", "dev": true, "requires": { "errno": "0.1.4", @@ -7049,13 +7042,13 @@ } }, "ws": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.1.tgz", - "integrity": "sha512-8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.2.tgz", + "integrity": "sha512-t+WGpsNxhMR4v6EClXS8r8km5ZljKJzyGhJf7goJz9k5Ye3+b5Bvno5rjqPuIBn5mnn5GBb7o8IrIWHxX1qOLQ==", "requires": { "async-limiter": "1.0.0", "safe-buffer": "5.1.1", - "ultron": "1.1.0" + "ultron": "1.1.1" } }, "xhr2": { diff --git a/package.json b/package.json index 3bedaf88..d9b0b6d7 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ }, "main": "dist/index.js", "dependencies": { - "@angular-devkit/build-optimizer": "0.0.32", + "@angular-devkit/build-optimizer": "0.0.33", "autoprefixer": "^7.1.6", "chalk": "^2.3.0", "chokidar": "^1.7.0", @@ -53,22 +53,22 @@ "tiny-lr": "^1.0.5", "tslint": "^5.8.0", "tslint-eslint-rules": "^4.1.1", - "uglify-es": "^3.1.6", - "webpack": "3.6.0", + "uglify-es": "^3.2.0", + "webpack": "3.8.1", "ws": "^3.2.0", "xml2js": "^0.4.19" }, "devDependencies": { - "@angular/animations": "5.0.0", - "@angular/common": "5.0.0", - "@angular/compiler": "5.0.0", - "@angular/compiler-cli": "5.0.0", - "@angular/core": "5.0.0", - "@angular/forms": "5.0.0", - "@angular/http": "5.0.0", - "@angular/platform-browser": "5.0.0", - "@angular/platform-browser-dynamic": "5.0.0", - "@angular/platform-server": "5.0.0", + "@angular/animations": "5.0.3", + "@angular/common": "5.0.3", + "@angular/compiler": "5.0.3", + "@angular/compiler-cli": "5.0.3", + "@angular/core": "5.0.3", + "@angular/forms": "5.0.3", + "@angular/http": "5.0.3", + "@angular/platform-browser": "5.0.3", + "@angular/platform-browser-dynamic": "5.0.3", + "@angular/platform-server": "5.0.3", "@types/chokidar": "^1.7.3", "@types/clean-css": "^3.4.29", "@types/express": "^4.0.39", diff --git a/src/aot/aot-compiler.ts b/src/aot/aot-compiler.ts index 81926f9d..6c13f6f7 100644 --- a/src/aot/aot-compiler.ts +++ b/src/aot/aot-compiler.ts @@ -193,17 +193,23 @@ export async function runNg5Aot(context: BuildContext, tsConfig: TsConfig, aggre const result = program.emit({ emitFlags: ngTools2.EmitFlags.Default, customTransformers: transformers }); - // Report diagnostics. - const errors = result.diagnostics.filter((diag) => diag.category === DiagnosticCategory.Error); - const warnings = result.diagnostics.filter((diag) => diag.category === DiagnosticCategory.Warning); + const tsDiagnostics = program.getTsSyntacticDiagnostics() + .concat(program.getTsOptionDiagnostics()) + .concat(program.getTsSemanticDiagnostics()); - if (warnings.length) { - const diagnostics = runTypeScriptDiagnostics(context, warnings); + const angularDiagnostics = program.getNgSemanticDiagnostics() + .concat(program.getNgStructuralDiagnostics()) + .concat(program.getNgOptionDiagnostics()); + + + if (tsDiagnostics.length) { + const diagnostics = runTypeScriptDiagnostics(context, tsDiagnostics); printDiagnostics(context, DiagnosticsType.TypeScript, diagnostics, true, false); + throw new BuildError(new Error('The Angular AoT build failed. See the issues above')); } - if (errors.length) { - const diagnostics = runTypeScriptDiagnostics(context, errors); + if (angularDiagnostics.length) { + const diagnostics = runTypeScriptDiagnostics(context, angularDiagnostics as any[]); printDiagnostics(context, DiagnosticsType.TypeScript, diagnostics, true, false); throw new BuildError(new Error('The Angular AoT build failed. See the issues above')); } From 191b287ca3b4e672c73d5a0d464de5c950721598 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Wed, 29 Nov 2017 16:08:54 -0600 Subject: [PATCH 2/4] chore(changelog): 3.1.3 changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b785d17..07efe022 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ + +## [3.1.3](https://github.com/ionic-team/ionic-app-scripts/compare/v3.1.2...v3.1.3) (2017-11-29) + + +### Bug Fixes + +* **aot:** fix error reporting with ng 5.0.1 or greater ([dece391](https://github.com/ionic-team/ionic-app-scripts/commit/dece391)) + + + ## [3.1.2](https://github.com/ionic-team/ionic-app-scripts/compare/v3.1.1...v3.1.2) (2017-11-13) From 2022c40a88d365db9f1c384d4e224b48c5b02b36 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Wed, 29 Nov 2017 16:10:52 -0600 Subject: [PATCH 3/4] 3.1.3 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 189f687c..6d4e05b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@ionic/app-scripts", - "version": "3.1.2", + "version": "3.1.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d9b0b6d7..895e94ce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/app-scripts", - "version": "3.1.2", + "version": "3.1.3", "description": "Scripts for Ionic Projects", "homepage": "https://ionicframework.com/", "author": "Ionic Team (https://ionic.io)", From d7c7136327a520002436ee55184d199d7f8a784b Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Wed, 29 Nov 2017 23:02:57 -0600 Subject: [PATCH 4/4] fix(aot): remove template validation until we can properly handle the error message format --- src/aot/aot-compiler.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/aot/aot-compiler.ts b/src/aot/aot-compiler.ts index 6c13f6f7..58529bf1 100644 --- a/src/aot/aot-compiler.ts +++ b/src/aot/aot-compiler.ts @@ -197,8 +197,7 @@ export async function runNg5Aot(context: BuildContext, tsConfig: TsConfig, aggre .concat(program.getTsOptionDiagnostics()) .concat(program.getTsSemanticDiagnostics()); - const angularDiagnostics = program.getNgSemanticDiagnostics() - .concat(program.getNgStructuralDiagnostics()) + const angularDiagnostics = program.getNgStructuralDiagnostics() .concat(program.getNgOptionDiagnostics());