Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
"typescript": "3.6.4"
},
"devDependencies": {
"@angular/compiler": "9.0.0-next.14",
"@angular/compiler-cli": "9.0.0-next.14",
"@angular/compiler": "9.0.0-next.15",
"@angular/compiler-cli": "9.0.0-next.15",
"@bazel/bazel": "1.0.0",
"@bazel/buildifier": "0.29.0",
"@bazel/jasmine": "0.39.0",
Expand Down
24 changes: 12 additions & 12 deletions packages/angular_devkit/build_angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,20 @@
"worker-plugin": "3.2.0"
},
"devDependencies": {
"@angular/animations": "9.0.0-next.14",
"@angular/animations": "9.0.0-next.15",
"@angular/cdk": "8.2.3",
"@angular/common": "9.0.0-next.14",
"@angular/compiler": "9.0.0-next.14",
"@angular/compiler-cli": "9.0.0-next.14",
"@angular/core": "9.0.0-next.14",
"@angular/forms": "9.0.0-next.14",
"@angular/localize": "9.0.0-next.14",
"@angular/common": "9.0.0-next.15",
"@angular/compiler": "9.0.0-next.15",
"@angular/compiler-cli": "9.0.0-next.15",
"@angular/core": "9.0.0-next.15",
"@angular/forms": "9.0.0-next.15",
"@angular/localize": "9.0.0-next.15",
"@angular/material": "8.2.3",
"@angular/platform-browser": "9.0.0-next.14",
"@angular/platform-browser-dynamic": "9.0.0-next.14",
"@angular/platform-server": "9.0.0-next.14",
"@angular/router": "9.0.0-next.14",
"@angular/service-worker": "9.0.0-next.14",
"@angular/platform-browser": "9.0.0-next.15",
"@angular/platform-browser-dynamic": "9.0.0-next.15",
"@angular/platform-server": "9.0.0-next.15",
"@angular/router": "9.0.0-next.15",
"@angular/service-worker": "9.0.0-next.15",
"codelyzer": "^5.0.0",
"bootstrap": "^4.0.0",
"font-awesome": "^4.7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,36 +27,38 @@ export async function createTranslationLoader(): Promise<TranslationLoader> {

async function importParsers() {
try {
// In @angular/localize version 9.0.0-next.15 the parsers were located in the below locations.
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change the order to go on the happy path first.

return {
json: new (await import(
// tslint:disable-next-line:trailing-comma no-implicit-dependencies
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/simple_json/simple_json_translation_parser'
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/simple_json_translation_parser'
)).SimpleJsonTranslationParser(),
xlf: new (await import(
// tslint:disable-next-line:trailing-comma no-implicit-dependencies
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xliff1/xliff1_translation_parser'
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xliff1_translation_parser'
)).Xliff1TranslationParser(),
xlf2: new (await import(
// tslint:disable-next-line:trailing-comma no-implicit-dependencies
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xliff2/xliff2_translation_parser'
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xliff2_translation_parser'
)).Xliff2TranslationParser(),
};
} catch {
// Prior to @angular/localize version 9.0.0-next.15 the parsers were located in the below locations.
return {
json: new (await import(
// @ts-ignore
// tslint:disable-next-line:trailing-comma no-implicit-dependencies
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/simple_json_translation_parser'
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/simple_json/simple_json_translation_parser'
)).SimpleJsonTranslationParser(),
xlf: new (await import(
// @ts-ignore
// tslint:disable-next-line:trailing-comma no-implicit-dependencies
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xliff1_translation_parser'
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xliff1/xliff1_translation_parser'
)).Xliff1TranslationParser(),
xlf2: new (await import(
// @ts-ignore
// tslint:disable-next-line:trailing-comma no-implicit-dependencies
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xliff2_translation_parser'
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xliff2/xliff2_translation_parser'
)).Xliff2TranslationParser(),
};
}
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_ng_packagr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"ng-packagr": "^9.0.0-rc.0"
},
"devDependencies": {
"@angular/compiler": "9.0.0-next.14",
"@angular/compiler-cli": "9.0.0-next.14",
"@angular/compiler": "9.0.0-next.15",
"@angular/compiler-cli": "9.0.0-next.15",
"@angular-devkit/core": "0.0.0",
"ng-packagr": "~9.0.0-rc.0",
"tslib": "^1.10.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/ngtools/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"webpack": "^4.0.0"
},
"devDependencies": {
"@angular/compiler": "9.0.0-next.14",
"@angular/compiler-cli": "9.0.0-next.14",
"@angular/compiler": "9.0.0-next.15",
"@angular/compiler-cli": "9.0.0-next.15",
"typescript": "3.6.4",
"webpack": "4.41.2"
}
Expand Down
24 changes: 12 additions & 12 deletions tests/legacy-cli/e2e/ng-snapshot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"description": "snapshot versions of Angular for e2e testing",
"private": true,
"dependencies": {
"@angular/animations": "github:angular/animations-builds#85f9884ebcc90e1b10146d56d3e4ddb334f2c90a",
"@angular/common": "github:angular/common-builds#860e79de1e12c508fa2df2b75ba4e8f1630ee933",
"@angular/compiler": "github:angular/compiler-builds#28919175504c9f73f4c7ae9446e416991a26e022",
"@angular/compiler-cli": "github:angular/compiler-cli-builds#3d380510d0796fcc92201f77f7bf620fc6a4e235",
"@angular/core": "github:angular/core-builds#8b93e1ae70e90155108ddd73c3353c41d51686ec",
"@angular/forms": "github:angular/forms-builds#9c9ff43e8df9548f13000176a96ccc348335bc51",
"@angular/language-service": "github:angular/language-service-builds#736f348091b205671e613a103c50131905762d3a",
"@angular/localize": "github:angular/localize-builds#035e9f7a68e4862f9a3cd77e01725a6e1c5772dd",
"@angular/platform-browser": "github:angular/platform-browser-builds#9c6956b43585a9d206ae61a24cd996bfd48955d8",
"@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#aa080d8d6ba7b0a873a51a57164a0c5731d5687a",
"@angular/platform-server": "github:angular/platform-server-builds#317d385e1308f42703583b7960dee97c4a798b73",
"@angular/router": "github:angular/router-builds#289c78f9c277c720158faa27034f89ef759d3d64"
"@angular/animations": "github:angular/animations-builds#ac30ba554580c061d3c0af1b947c2dadc41f28bd",
"@angular/common": "github:angular/common-builds#81519bb882f4f4a635bb288837513e85ac27b16f",
"@angular/compiler": "github:angular/compiler-builds#5089a1bed7cfb0a43062b3d749e7d7504c5e77bb",
"@angular/compiler-cli": "github:angular/compiler-cli-builds#2f61281a3fa5077f838ccd7b67fe4255927e607a",
"@angular/core": "github:angular/core-builds#457bb4e6f6cfdc37b8db46e8c1cd9ea06b0997aa",
"@angular/forms": "github:angular/forms-builds#d5fb1a58893c8ca0a37f15f6e027ca0ef14597a4",
"@angular/language-service": "github:angular/language-service-builds#99233eb6c7bd0784357ba2ff901949fd0c0e5e20",
"@angular/localize": "github:angular/localize-builds#3b63415900cdd82d2663ead33e66904e0641686f",
"@angular/platform-browser": "github:angular/platform-browser-builds#4a2559f20bd8ded16128b35c86fbc8ed1eda598e",
"@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#002af234104ac5fda0aa9801cf99075bec3dd284",
"@angular/platform-server": "github:angular/platform-server-builds#e5444e31215fc389367faa7ec18ed3c3c930fca5",
"@angular/router": "github:angular/router-builds#7a38790e59395d466bb2f51eb43289d438284f51"
}
}
96 changes: 48 additions & 48 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@angular/[email protected].14":
version "9.0.0-next.14"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-9.0.0-next.14.tgz#9c967be04f7ed1691df48bf4e517172c7d226559"
integrity sha512-5JDFoXcbS9kJWZTxsFatuYwbsCwBb1kAM8WkrCrANgRxJiJ6JDiOMCL9fFmFq8ihKft4QOpuvGoH6UMkAo3mAQ==
"@angular/[email protected].15":
version "9.0.0-next.15"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-9.0.0-next.15.tgz#00535803601019ee49c45f2f601cd53f60a34973"
integrity sha512-s4hIpoKbx/tGK+7eeUHt2OVtQw5GpFPor5SGrrMSuc8mw67kifKk5SR0lFTunc2FKP9NN3FAqx9nFsEc8Tfhcw==

"@angular/[email protected]":
version "8.2.3"
Expand All @@ -16,15 +16,15 @@
optionalDependencies:
parse5 "^5.0.0"

"@angular/[email protected].14":
version "9.0.0-next.14"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-9.0.0-next.14.tgz#a83381e097efc05e173f6b39ba8995e85217ae8a"
integrity sha512-2YfiXyn0vconAT6WDlJH/iIlhdt+/utHnHERE3rEKqL4+xfoGsmRJ0+pm7b729/JlWCykDVxfU4msWvl6EC+pw==
"@angular/[email protected].15":
version "9.0.0-next.15"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-9.0.0-next.15.tgz#969467f74a5d48d5ac2124b8b432713ba4e35b2e"
integrity sha512-OU19ANOPhee+T7GX4itD8dE+3LCG9rNiw8vVlbN+Uy3soHPKPoiouugnWtK0I5RP5brZC0MEDrhkSKkWg8u9Dg==

"@angular/[email protected].14":
version "9.0.0-next.14"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-9.0.0-next.14.tgz#d455935c191deadaf5b27807b0eb0718b2711ae1"
integrity sha512-5mAnqyMtMwKGMgScJDzNC+VCZXsbOf+/JIoPJFoSgo0J2j4tAQzEUW7Sq2PCdKxQRzz/k5Go8GWEPQeDz0hGRQ==
"@angular/[email protected].15":
version "9.0.0-next.15"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-9.0.0-next.15.tgz#8ec3bfa96de9d959490a8fd23a48ba0799047bdf"
integrity sha512-6XuiGdWd/+bAd8BO8PcNE7bQpHSsfXqP3nBmuDtC4kRVxEnfPyPwzHsLig6tn3tEswLhcHs42owiengXe31kUQ==
dependencies:
canonical-path "1.0.0"
chokidar "^2.1.1"
Expand All @@ -37,25 +37,25 @@
source-map "^0.6.1"
yargs "13.1.0"

"@angular/[email protected].14":
version "9.0.0-next.14"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0-next.14.tgz#d590eee10ac0e8d9cd27400f481f5b4553fa533f"
integrity sha512-6DazT5cunWrGu+035l8IfMRadI5Z6vRe2kZoBF8OS8XldYL3cMZCfpY4WEmmcRRM+41r9QP/FTyAbZFQeMTrog==
"@angular/[email protected].15":
version "9.0.0-next.15"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0-next.15.tgz#cc6157d7d9c63e5dfbbb37f03d9a06ee738eefbc"
integrity sha512-F88fuv6SO2nCDAbvP8cAynxg8KWO1ouUyWVVYH0FUHKw/kWWgSUqax4CB7XtO6NVbpol4IOssUXx/hG/D5XCZA==

"@angular/[email protected].14":
version "9.0.0-next.14"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.0.0-next.14.tgz#b13f0771e52ea931bb845a1b040b4e83b47ba70f"
integrity sha512-/NZAqgbSCoEehTqlnEVIcPdb4UWISnetbkEai7F4PLvoqey3T1qiTdcuQkVcZAK2ahhC89y1FgUbR1biatHrnA==
"@angular/[email protected].15":
version "9.0.0-next.15"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.0.0-next.15.tgz#66fb9ced44f6e72a3ccc5e46d33f32a2f6ccf830"
integrity sha512-ZvhxaHl1dHwseMbMbYfs134yyUZIq13bqejAfSp/ZalRsTV2nbWlBMbYhjemsHSS1UWNb3DXfUXJTKQzqk8QZQ==

"@angular/[email protected].14":
version "9.0.0-next.14"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-9.0.0-next.14.tgz#fcb15807d2621e90423eccd59bd5852892d523e0"
integrity sha512-4DpJSU5MCU15Whmcwt+oDOmDUALo1bIagOr0PqhL7ZQqVyuciOGXrQJNMKXvlM0yCZOHlvkDJw/egTmROkfzDg==
"@angular/[email protected].15":
version "9.0.0-next.15"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-9.0.0-next.15.tgz#8baefe67e63c64a1104efa10ca8eb86268aa0d3d"
integrity sha512-OudfUyJp2k8x+dgb3NB5i7RSjXT1ImKLUZ2xmsNxtbhijpAVgE2wZ224D/wLiwXqUMRcMnPdz6rnT+Fzuui1jw==

"@angular/[email protected].14":
version "9.0.0-next.14"
resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-9.0.0-next.14.tgz#c39ff2f5aa7c66de335a426245e7f7bd170edfee"
integrity sha512-ZzjGVaFZwnFL9vVXFwxbcwpK19aKNSbbWAORGozV8c5cTkoc1AxmDS7ZvvDrFmqM15Y1Ju/6GNNQK+skm8Wqgw==
"@angular/[email protected].15":
version "9.0.0-next.15"
resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-9.0.0-next.15.tgz#f3a385b76221137da9fcc72e0c1e9767468959d1"
integrity sha512-0h9NzKiEAqsTSNFSf7IVCrZJse+uvx0Ncb6FomW93AJFBVvdWiNfllRJjIzPkyPwC/dnoYhUaF/I9+4q7qxipA==
dependencies:
"@babel/core" "^7.5.5"
glob "7.1.2"
Expand All @@ -68,33 +68,33 @@
dependencies:
tslib "^1.7.1"

"@angular/[email protected].14":
version "9.0.0-next.14"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.0.0-next.14.tgz#2c7f6c8374152ec292f48ec57db62763bf5711f9"
integrity sha512-REkbvBOIE4ssmnJI8nOUSvUxm4dVlfqinqgv4sQdV2G8ioJXFtWkqfjAFvR7QU1/Dadaj2Oo+5Yau110V/sbMw==
"@angular/[email protected].15":
version "9.0.0-next.15"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.0.0-next.15.tgz#385c459c267ff2f9443a4f698a155cbdf7fde7ea"
integrity sha512-oiXozg87f+ijco61Ao9NLy7/O0pBntzXL0FDE+dVZYWxJgb4dHsq0w/ojL0rlLrqLxaxANtEszfsSlEUoC5drg==

"@angular/[email protected].14":
version "9.0.0-next.14"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-9.0.0-next.14.tgz#b741e583a60bef778f92b285469c2d0d00ab9a7a"
integrity sha512-ZgB9T2hZytqSr7xpYacLgct5WVQ+xKlsrLymK++SffaGKzj0zlkAMj3mVF+12Zec0Ic5NpG8oTIovH+Lk57IuQ==
"@angular/[email protected].15":
version "9.0.0-next.15"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-9.0.0-next.15.tgz#9c698ac1b2c2f2dfba5205f6875ebd5f0504c3c9"
integrity sha512-rT4fMhO75cyLBICxSIX7rEBnaQvn0t/aHBA5L4FLXz/J/fgk+3OBI9pE1zRcyo+Z1vwrWZ+9eiNdmNMFFSXNAg==

"@angular/[email protected].14":
version "9.0.0-next.14"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-9.0.0-next.14.tgz#887e948f9da265f88378aa4ec8273b22433ec951"
integrity sha512-CnBa+Q13xDkr0zJlqhiShF1ovqpvOQCkMAKCPaGyByMC24nys8wNKhw/El743TREwZQXTWNfXveboSmqDVrGtA==
"@angular/[email protected].15":
version "9.0.0-next.15"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-9.0.0-next.15.tgz#1c13eaf94e65ec1a7a24ee2a00e78ba60f5f24c1"
integrity sha512-9FmJfwZHrVj7YHvACflAnI0tJ8wpAccymq3Pvr9kHaLnPwD1xeoGGfHINqWTjUoHldpltfHiiwcHXQ3GxbmZrw==
dependencies:
domino "^2.1.2"
xhr2 "^0.1.4"

"@angular/[email protected].14":
version "9.0.0-next.14"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-9.0.0-next.14.tgz#3d19e351d533657887b87d8c5abe74a56806854d"
integrity sha512-Uv8Bre1JXjHUaFf6v1dtfHKPWhQiZdy/v9ZS5yZyPjX8xX0lBHQKu+Uryo9EyXldwNDIcqxi9/y4Vl+PB5d0/g==
"@angular/[email protected].15":
version "9.0.0-next.15"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-9.0.0-next.15.tgz#a0e5b07e5f40c0c7d8afd849eb69f9788da21fce"
integrity sha512-klzVn6yWv0NQcE2qYdrD5EVt4ETBJSmtmfF562ibqBBOXuFyU9PY2GzkZ6Ot+rS6Ed4Q/GEg1iigEd8uqB+2lg==

"@angular/[email protected].14":
version "9.0.0-next.14"
resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-9.0.0-next.14.tgz#57fd4993c14f3155dfbeb228b871dea1483066e6"
integrity sha512-RAPzRfxIyq6yIOHYk+vdLxe4HuCS4S6o6+P2SnBJIkpf+do05aPbin4tmEr5rK+3wDa7QP1E14NAgCYxF0b1hA==
"@angular/[email protected].15":
version "9.0.0-next.15"
resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-9.0.0-next.15.tgz#4fec3aca0e338cc8bd1b2efa60413f928546c4b3"
integrity sha512-DuUAbbLM9IMxzbNj+X0FUOyREWHd0MX0BTu5e2WJpfPRQyphGRvtNpDOWUWukkfo1RtlF7cE2rcxfzDSQMKt+w==

"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
version "7.5.5"
Expand Down