From a0d16dcfea80f089379e4f6b9a4da68790cc1436 Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Thu, 17 Oct 2019 12:18:19 +0100 Subject: [PATCH] test: use @types/node compatible with TS 3.6 (#32946) PR Close #32946 --- integration/cli-hello-world-ivy-compat/package.json | 2 +- integration/cli-hello-world-ivy-i18n/package.json | 12 ++++++------ integration/cli-hello-world-ivy-minimal/package.json | 2 +- integration/cli-hello-world/package.json | 2 +- integration/injectable-def/package.json | 2 +- integration/ng_update_migrations/package.json | 2 +- integration/ngcc/package.json | 2 +- integration/platform-server/package.json | 2 +- package.json | 2 +- yarn.lock | 10 +++++----- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/integration/cli-hello-world-ivy-compat/package.json b/integration/cli-hello-world-ivy-compat/package.json index 7c58c37afb..636a9e4d40 100644 --- a/integration/cli-hello-world-ivy-compat/package.json +++ b/integration/cli-hello-world-ivy-compat/package.json @@ -35,7 +35,7 @@ "@angular/language-service": "file:../../dist/packages-dist/language-service", "@types/jasmine": "~2.8.8", "@types/jasminewd2": "~2.0.3", - "@types/node": "~8.9.4", + "@types/node": "file:../../node_modules/@types/node", "codelyzer": "~4.5.0", "jasmine-core": "~2.99.1", "jasmine-spec-reporter": "~4.2.1", diff --git a/integration/cli-hello-world-ivy-i18n/package.json b/integration/cli-hello-world-ivy-i18n/package.json index 90f103ab61..aeeae353d5 100644 --- a/integration/cli-hello-world-ivy-i18n/package.json +++ b/integration/cli-hello-world-ivy-i18n/package.json @@ -12,18 +12,18 @@ "pretest": "ng version", "test": "ng test --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production && yarn translated:test && yarn translated:legacy:test", "translate": "localize-translate -r \"dist/\" -s \"**/*\" -l \"en-US\" -t \"src/locales/messages.*\" -o \"tmp/translations/{{LOCALE}}\"", - + "translated:test": "yarn build && yarn translate && yarn translated:fr:e2e && yarn translated:de:e2e && yarn translated:en:e2e", - + "translated:fr:serve": "serve tmp/translations/fr --listen 4200", "translated:fr:e2e": "npm-run-all -p -r translated:fr:serve \"ng e2e --configuration=translated-fr --webdriver-update=false\"", - + "translated:de:serve": "serve tmp/translations/de --listen 4200", "translated:de:e2e": "npm-run-all -p -r translated:de:serve \"ng e2e --configuration=translated-de --webdriver-update=false\"", - + "translated:en:serve": "serve tmp/translations/en-US --listen 4200", "translated:en:e2e": "npm-run-all -p -r translated:en:serve \"ng e2e --configuration=translated-en --webdriver-update=false\"", - + "translated:legacy:test": "yarn translated:legacy:extract-and-update && ng build --configuration=translated-legacy && yarn translated:legacy:translate && yarn translated:legacy:e2e", "translated:legacy:extract-and-update": "ng xi18n && sed -i.bak -e 's/source>/target>'/ -e 's/Hello/Bonjour/' -e 's/source-language=\"en-US\"/source-language=\"en-US\" target-language=\"legacy\"/' tmp/legacy-locales/messages.legacy.xlf", "translated:legacy:translate": "localize-translate -r \"dist/\" -s \"**/*\" -t \"tmp/legacy-locales/messages.legacy.xlf\" -o \"tmp/translations/{{LOCALE}}\"", @@ -55,7 +55,7 @@ "@angular/language-service": "file:../../dist/packages-dist/language-service", "@types/jasmine": "~2.8.8", "@types/jasminewd2": "~2.0.3", - "@types/node": "~8.9.4", + "@types/node": "file:../../node_modules/@types/node", "codelyzer": "~4.5.0", "jasmine-core": "~2.99.1", "jasmine-spec-reporter": "~4.2.1", diff --git a/integration/cli-hello-world-ivy-minimal/package.json b/integration/cli-hello-world-ivy-minimal/package.json index c3920da8aa..b40cc25765 100644 --- a/integration/cli-hello-world-ivy-minimal/package.json +++ b/integration/cli-hello-world-ivy-minimal/package.json @@ -34,7 +34,7 @@ "@angular/language-service": "file:../../dist/packages-dist/language-service", "@types/jasmine": "~2.8.8", "@types/jasminewd2": "~2.0.3", - "@types/node": "~8.9.4", + "@types/node": "file:../../node_modules/@types/node", "codelyzer": "~4.5.0", "jasmine-core": "~2.99.1", "jasmine-spec-reporter": "~4.2.1", diff --git a/integration/cli-hello-world/package.json b/integration/cli-hello-world/package.json index f818a120dd..5617db3d8c 100644 --- a/integration/cli-hello-world/package.json +++ b/integration/cli-hello-world/package.json @@ -34,7 +34,7 @@ "@angular/language-service": "file:../../dist/packages-dist/language-service", "@types/jasmine": "~2.8.3", "@types/jasminewd2": "~2.0.4", - "@types/node": "~6.0.60", + "@types/node": "file:../../node_modules/@types/node", "codelyzer": "^4.3.0", "jasmine-core": "~2.8.0", "jasmine-spec-reporter": "~4.2.1", diff --git a/integration/injectable-def/package.json b/integration/injectable-def/package.json index 123c11816d..e422acdf3c 100644 --- a/integration/injectable-def/package.json +++ b/integration/injectable-def/package.json @@ -11,7 +11,7 @@ "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser", "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic", "@angular/platform-server": "file:../../dist/packages-dist/platform-server", - "@types/node": "^9.4.0", + "@types/node": "file:../../node_modules/@types/node", "rxjs": "file:../../node_modules/rxjs", "typescript": "file:../../node_modules/typescript", "zone.js": "file:../../node_modules/zone.js" diff --git a/integration/ng_update_migrations/package.json b/integration/ng_update_migrations/package.json index a858482f17..a8c3386ade 100644 --- a/integration/ng_update_migrations/package.json +++ b/integration/ng_update_migrations/package.json @@ -30,7 +30,7 @@ "@angular/language-service": "file:../../dist/packages-dist/language-service", "@types/jasmine": "~3.3.8", "@types/jasminewd2": "~2.0.3", - "@types/node": "~8.9.4", + "@types/node": "file:../../node_modules/@types/node", "chalk": "^2.4.2", "diff": "^4.0.1", "glob": "^7.1.4", diff --git a/integration/ngcc/package.json b/integration/ngcc/package.json index ee0bd13c77..97d67b03c7 100644 --- a/integration/ngcc/package.json +++ b/integration/ngcc/package.json @@ -14,7 +14,7 @@ "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser", "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic", "@angular/router": "file:../../dist/packages-dist/router", - "@types/node": "^9.4.0", + "@types/node": "file:../../node_modules/@types/node", "rxjs": "file:../../node_modules/rxjs", "typescript": "file:../../node_modules/typescript", "zone.js": "file:../../node_modules/zone.js" diff --git a/integration/platform-server/package.json b/integration/platform-server/package.json index 90461c9ac9..c866190b73 100644 --- a/integration/platform-server/package.json +++ b/integration/platform-server/package.json @@ -23,7 +23,7 @@ }, "devDependencies": { "@types/jasmine": "2.5.41", - "@types/node": "10.11.x", + "@types/node": "file:../../node_modules/@types/node", "babel-core": "^6.23.1", "babel-loader": "^6.4.0", "babel-preset-es2015": "^6.22.0", diff --git a/package.json b/package.json index c849195d5f..5b3c8b7281 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@types/jasmine": "^2.8.8", "@types/jasminewd2": "^2.0.6", "@types/minimist": "^1.2.0", - "@types/node": "^10.9.4", + "@types/node": "^12.11.1", "@types/selenium-webdriver": "3.0.7", "@types/semver": "^6.0.2", "@types/shelljs": "^0.7.8", diff --git a/yarn.lock b/yarn.lock index b57f161f5f..b6253d99c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -753,16 +753,16 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.4.tgz#1c586b991457cbb58fef51bc4e0cfcfa347714b5" integrity sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg== -"@types/node@^10.9.4": - version "10.14.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.21.tgz#4a9db7ef1d1671c0015e632c5fa3d46c86c58c1e" - integrity sha512-nuFlRdBiqbF+PJIEVxm2jLFcQWN7q7iWEJGsBV4n7v1dbI9qXB8im2pMMKMCUZe092sQb5SQft2DHfuQGK5hqQ== - "@types/node@^11.13.9": version "11.13.10" resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.10.tgz#4df59e5966b56f512bac98898bcbee5067411f0f" integrity sha512-leUNzbFTMX94TWaIKz8N15Chu55F9QSH+INKayQr5xpkasBQBRF3qQXfo3/dOnMU/dEIit+Y/SU8HyOjq++GwA== +"@types/node@^12.11.1": + version "12.11.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.1.tgz#1fd7b821f798b7fa29f667a1be8f3442bb8922a3" + integrity sha512-TJtwsqZ39pqcljJpajeoofYRfeZ7/I/OMUQ5pR4q5wOKf2ocrUvBAZUMhWsOvKx3dVc/aaV5GluBivt0sWqA5A== + "@types/q@^0.0.32": version "0.0.32" resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"