From 3b4dab3d204345dd0facbca296808a57e7a1c5fd Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Mon, 1 May 2017 17:03:53 +0300 Subject: [PATCH 1/4] chore(deps): update to Angular 4.1.0 --- nativescript-angular/package.json | 32 +++++++++++++++--------------- nativescript-angular/tsconfig.json | 2 +- ng-sample/package.json | 22 ++++++++++---------- tests/package.json | 20 +++++++++---------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 00cbe67c0..5956be139 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -43,27 +43,27 @@ "reflect-metadata": "^0.1.8" }, "peerDependencies": { - "@angular/core": "~4.0.0", - "@angular/common": "~4.0.0", - "@angular/compiler": "~4.0.0", - "@angular/platform-browser": "~4.0.0", - "@angular/router": "~4.0.0", - "@angular/forms": "~4.0.0", - "@angular/http": "~4.0.0", + "@angular/core": "~4.0.0 || ~4.1.0", + "@angular/common": "~4.0.0 || ~4.1.0", + "@angular/compiler": "~4.0.0 || ~4.1.0", + "@angular/platform-browser": "~4.0.0 || ~4.1.0", + "@angular/router": "~4.0.0 || ~4.1.0", + "@angular/forms": "~4.0.0 || ~4.1.0", + "@angular/http": "~4.0.0 || ~4.1.0", "tns-core-modules": "^3.0.0 || ^3.0.0-rc.1", "rxjs": "^5.0.1", "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/core": "~4.0.0", - "@angular/common": "~4.0.0", - "@angular/compiler": "~4.0.0", - "@angular/compiler-cli": "~4.0.0", - "@angular/platform-browser": "~4.0.0", - "@angular/animations": "~4.0.0", - "@angular/router": "~4.0.0", - "@angular/forms": "~4.0.0", - "@angular/http": "~4.0.0", + "@angular/core": "~4.0.0 || ~4.1.0", + "@angular/common": "~4.0.0 || ~4.1.0", + "@angular/compiler": "~4.0.0 || ~4.1.0", + "@angular/compiler-cli": "~4.0.0 || ~4.1.0", + "@angular/platform-browser": "~4.0.0 || ~4.1.0", + "@angular/animations": "~4.0.0 || ~4.1.0", + "@angular/router": "~4.0.0 || ~4.1.0", + "@angular/forms": "~4.0.0 || ~4.1.0", + "@angular/http": "~4.0.0 || ~4.1.0", "codelyzer": "~3.0.0-beta.4", "tns-core-modules": "internal-preview", "tslint": "~4.5.0", diff --git a/nativescript-angular/tsconfig.json b/nativescript-angular/tsconfig.json index 17fd0ba01..641cfd5e2 100644 --- a/nativescript-angular/tsconfig.json +++ b/nativescript-angular/tsconfig.json @@ -31,6 +31,6 @@ "genDir": ".", "skipMetadataEmit": false, "skipTemplateCodegen": true, - "debug": true + "strictMetadataEmit": true } } diff --git a/ng-sample/package.json b/ng-sample/package.json index 4b59f2282..983f3d3a2 100644 --- a/ng-sample/package.json +++ b/ng-sample/package.json @@ -32,18 +32,18 @@ }, "homepage": "https://github.com/NativeScript/template-hello-world", "dependencies": { - "@angular/animations": "~4.0.0", - "@angular/common": "~4.0.0", - "@angular/compiler": "~4.0.0", - "@angular/core": "~4.0.0", - "@angular/forms": "~4.0.0", - "@angular/http": "~4.0.0", - "@angular/platform-browser": "~4.0.0", - "@angular/platform-browser-dynamic": "~4.0.0", - "@angular/router": "~4.0.0", + "@angular/animations": "~4.1.0", + "@angular/common": "~4.1.0", + "@angular/compiler": "~4.1.0", + "@angular/core": "~4.1.0", + "@angular/forms": "~4.1.0", + "@angular/http": "~4.1.0", + "@angular/platform-browser": "~4.1.0", + "@angular/platform-browser-dynamic": "~4.1.0", + "@angular/router": "~4.1.0", "nativescript-angular": "file:../nativescript-angular", - "rxjs": "~5.2.0", - "tns-core-modules": "internal-preview", + "rxjs": "^5.3.0", + "tns-core-modules": "^3.0.0 || ^3.0.0-rc.1", "zone.js": "~0.8.2" }, "devDependencies": { diff --git a/tests/package.json b/tests/package.json index 7b579e011..fb8cbbd5c 100644 --- a/tests/package.json +++ b/tests/package.json @@ -26,15 +26,15 @@ ], "homepage": "http://nativescript.org", "dependencies": { - "@angular/animations": "~4.0.0", - "@angular/common": "~4.0.0", - "@angular/compiler": "~4.0.0", - "@angular/core": "~4.0.0", - "@angular/forms": "~4.0.0", - "@angular/http": "~4.0.0", - "@angular/platform-browser": "~4.0.0", - "@angular/platform-browser-dynamic": "~4.0.0", - "@angular/router": "~4.0.0", + "@angular/animations": "~4.1.0", + "@angular/common": "~4.1.0", + "@angular/compiler": "~4.1.0", + "@angular/core": "~4.1.0", + "@angular/forms": "~4.1.0", + "@angular/http": "~4.1.0", + "@angular/platform-browser": "~4.1.0", + "@angular/platform-browser-dynamic": "~4.1.0", + "@angular/router": "~4.1.0", "nativescript-angular": "../nativescript-angular", "nativescript-unit-test-runner": "^0.3.4", "rxjs": "^5.2.0", @@ -57,7 +57,7 @@ "lazy": "1.0.11", "mocha": "^2.4.5", "nativescript-dev-appium": "0.0.14", - "nativescript-dev-typescript": "^0.3.1", + "nativescript-dev-typescript": "^0.4.0", "socket.io": "1.4.8", "socket.io-client": "1.4.8", "tslint": "^4.5.1", From e4a116a6c431745633ebd774850bd1e7d4b87368 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Mon, 1 May 2017 17:15:12 +0300 Subject: [PATCH 2/4] chore(lint): update tslint to ^5.1.0 and codelyzer to ^3.0.1 --- nativescript-angular/package.json | 26 +- nativescript-angular/yarn.lock | 381 ++++++++++++++++++++++++++++++ 2 files changed, 394 insertions(+), 13 deletions(-) create mode 100644 nativescript-angular/yarn.lock diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 5956be139..8f8abf671 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -29,7 +29,7 @@ "url": "https://github.com/NativeScript/nativescript-angular.git" }, "scripts": { - "tslint": "tslint --project tsconfig.json --config tslint.json", + "tslint": "tslint --project tsconfig.json --config tslint.json --type-check", "postinstall": "node postinstall.js", "tsc": "tsc -p tsconfig.json", "ngc": "ngc -p tsconfig.json", @@ -43,32 +43,32 @@ "reflect-metadata": "^0.1.8" }, "peerDependencies": { - "@angular/core": "~4.0.0 || ~4.1.0", "@angular/common": "~4.0.0 || ~4.1.0", "@angular/compiler": "~4.0.0 || ~4.1.0", - "@angular/platform-browser": "~4.0.0 || ~4.1.0", - "@angular/router": "~4.0.0 || ~4.1.0", + "@angular/core": "~4.0.0 || ~4.1.0", "@angular/forms": "~4.0.0 || ~4.1.0", "@angular/http": "~4.0.0 || ~4.1.0", - "tns-core-modules": "^3.0.0 || ^3.0.0-rc.1", + "@angular/platform-browser": "~4.0.0 || ~4.1.0", + "@angular/router": "~4.0.0 || ~4.1.0", "rxjs": "^5.0.1", + "tns-core-modules": "^3.0.0 || ^3.0.0-rc.1", "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/core": "~4.0.0 || ~4.1.0", + "@angular/animations": "~4.0.0 || ~4.1.0", "@angular/common": "~4.0.0 || ~4.1.0", "@angular/compiler": "~4.0.0 || ~4.1.0", "@angular/compiler-cli": "~4.0.0 || ~4.1.0", - "@angular/platform-browser": "~4.0.0 || ~4.1.0", - "@angular/animations": "~4.0.0 || ~4.1.0", - "@angular/router": "~4.0.0 || ~4.1.0", + "@angular/core": "~4.0.0 || ~4.1.0", "@angular/forms": "~4.0.0 || ~4.1.0", "@angular/http": "~4.0.0 || ~4.1.0", - "codelyzer": "~3.0.0-beta.4", - "tns-core-modules": "internal-preview", - "tslint": "~4.5.0", - "typescript": "~2.2.1", + "@angular/platform-browser": "~4.0.0 || ~4.1.0", + "@angular/router": "~4.0.0 || ~4.1.0", + "codelyzer": "^3.0.1", "rxjs": "^5.0.1", + "tns-core-modules": "internal-preview", + "tslint": "^5.1.0", + "typescript": "^2.3.2", "zone.js": "^0.8.4" } } diff --git a/nativescript-angular/yarn.lock b/nativescript-angular/yarn.lock new file mode 100644 index 000000000..2ade79c72 --- /dev/null +++ b/nativescript-angular/yarn.lock @@ -0,0 +1,381 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@angular/animations@~4.0.0 || ~4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.1.0.tgz#97b642aee01b5406e03ec65e499342ba91e2dd38" + +"@angular/common@~4.0.0 || ~4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.1.0.tgz#4370f569e51ddd99963b7f4aa58c1a5dcc5fea52" + +"@angular/compiler-cli@~4.0.0 || ~4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-4.1.0.tgz#727aaada8bfd94285e9818995925048f7fdf1200" + dependencies: + "@angular/tsc-wrapped" "4.1.0" + minimist "^1.2.0" + reflect-metadata "^0.1.2" + +"@angular/compiler@~4.0.0 || ~4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.1.0.tgz#be1ade5b6aec81f03c29d52bcb95925a28900dcb" + +"@angular/core@~4.0.0 || ~4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.1.0.tgz#72ec173316879571880c9c483ed6dfc0caab94b0" + +"@angular/forms@~4.0.0 || ~4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.1.0.tgz#8eae2a45c4ba064b377f9280e59c012b5dac6b80" + +"@angular/http@~4.0.0 || ~4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@angular/http/-/http-4.1.0.tgz#7ba0c4d044dee964021b7cf19cb146a2c31577a5" + +"@angular/platform-browser@~4.0.0 || ~4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.1.0.tgz#b981386be1a36f2af7f0679447fd97b7267b25de" + +"@angular/router@~4.0.0 || ~4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-4.1.0.tgz#dd3563662f95ca3aa3dd9ff13c6ed4bea1d90b06" + +"@angular/tsc-wrapped@4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-4.1.0.tgz#07cbd61d91adde4c2daf9a41605152952b8832b3" + dependencies: + tsickle "^0.21.0" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + +app-root-path@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46" + +babel-code-frame@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4" + dependencies: + chalk "^1.1.0" + esutils "^2.0.2" + js-tokens "^3.0.0" + +balanced-match@^0.4.1: + version "0.4.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" + +brace-expansion@^1.0.0: + version "1.1.7" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59" + dependencies: + balanced-match "^0.4.1" + concat-map "0.0.1" + +chalk@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +codelyzer@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-3.0.1.tgz#ba66b7b2aa564fe9f45d6004b4003ad2cf116828" + dependencies: + app-root-path "^2.0.1" + css-selector-tokenizer "^0.7.0" + cssauron "^1.4.0" + semver-dsl "^1.0.1" + source-map "^0.5.6" + sprintf-js "^1.0.3" + +colors@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + +css-selector-tokenizer@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86" + dependencies: + cssesc "^0.1.0" + fastparse "^1.1.1" + regexpu-core "^1.0.0" + +cssauron@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8" + dependencies: + through X.X.X + +cssesc@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" + +diff@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" + +escape-string-regexp@^1.0.2: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + +esutils@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" + +fastparse@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8" + +findup-sync@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16" + dependencies: + glob "~5.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + +glob@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.2" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@~5.0.0: + version "5.0.15" + resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + dependencies: + ansi-regex "^2.0.0" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + +js-tokens@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" + +jsesc@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + +"minimatch@2 || 3", minimatch@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" + dependencies: + brace-expansion "^1.0.0" + +minimist@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + +minimist@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + +minimist@~0.0.1: + version "0.0.10" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" + +mkdirp@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + dependencies: + minimist "0.0.8" + +nativescript-intl@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/nativescript-intl/-/nativescript-intl-3.0.0.tgz#82ee9be7d377172b3c4295734723037628e186a7" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + dependencies: + wrappy "1" + +optimist@~0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" + dependencies: + minimist "~0.0.1" + wordwrap "~0.0.2" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + +path-parse@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" + +reflect-metadata@^0.1.2, reflect-metadata@^0.1.8: + version "0.1.10" + resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a" + +regenerate@^1.2.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260" + +regexpu-core@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b" + dependencies: + regenerate "^1.2.1" + regjsgen "^0.2.0" + regjsparser "^0.1.4" + +regjsgen@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" + +regjsparser@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" + dependencies: + jsesc "~0.5.0" + +resolve@^1.3.2: + version "1.3.3" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5" + dependencies: + path-parse "^1.0.5" + +rxjs@^5.0.1: + version "5.3.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.3.0.tgz#d88ccbdd46af290cbdb97d5d8055e52453fabe2d" + dependencies: + symbol-observable "^1.0.1" + +semver-dsl@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0" + dependencies: + semver "^5.3.0" + +semver@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + +source-map-support@^0.4.2: + version "0.4.15" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1" + dependencies: + source-map "^0.5.6" + +source-map@^0.5.6: + version "0.5.6" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" + +sprintf-js@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + +strip-ansi@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + dependencies: + ansi-regex "^2.0.0" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + +symbol-observable@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" + +through@X.X.X: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + +tns-core-modules-widgets@internal-preview: + version "3.1.0-2017-04-28-266" + resolved "https://registry.yarnpkg.com/tns-core-modules-widgets/-/tns-core-modules-widgets-3.1.0-2017-04-28-266.tgz#56d82a9952604e064b76bbd232d56cad9a13337a" + +tns-core-modules@internal-preview: + version "3.1.0-2017-04-26-6412" + resolved "https://registry.yarnpkg.com/tns-core-modules/-/tns-core-modules-3.1.0-2017-04-26-6412.tgz#ae7717292d511e3e6fcac14330d0b0adc18e905d" + dependencies: + tns-core-modules-widgets internal-preview + +tsickle@^0.21.0: + version "0.21.6" + resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.21.6.tgz#53b01b979c5c13fdb13afb3fb958177e5991588d" + dependencies: + minimist "^1.2.0" + mkdirp "^0.5.1" + source-map "^0.5.6" + source-map-support "^0.4.2" + +tslint@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.1.0.tgz#51a47baeeb58956fcd617bd2cf00e2ef0eea2ed9" + dependencies: + babel-code-frame "^6.22.0" + colors "^1.1.2" + diff "^3.2.0" + findup-sync "~0.3.0" + glob "^7.1.1" + optimist "~0.6.0" + resolve "^1.3.2" + semver "^5.3.0" + tsutils "^1.4.0" + +tsutils@^1.4.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.8.0.tgz#bf8118ed8e80cd5c9fc7d75728c7963d44ed2f52" + +typescript@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.2.tgz#f0f045e196f69a72f06b25fd3bd39d01c3ce9984" + +wordwrap@~0.0.2: + version "0.0.3" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + +zone.js@^0.8.4: + version "0.8.9" + resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.9.tgz#34aaa9a3ec6d0e4acebd1b761adafa590473638b" From f0c28d16ec71955641b1268f7b110bab44f5fda1 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Mon, 1 May 2017 17:15:22 +0300 Subject: [PATCH 3/4] refactor: fix lint errors --- nativescript-angular/directives/list-view-comp.ts | 5 +++-- nativescript-angular/http.ts | 4 ++-- nativescript-angular/nativescript.module.ts | 2 +- nativescript-angular/platform-common.ts | 2 +- nativescript-angular/tslint.json | 1 - 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nativescript-angular/directives/list-view-comp.ts b/nativescript-angular/directives/list-view-comp.ts index 93115b52f..781e80a1d 100644 --- a/nativescript-angular/directives/list-view-comp.ts +++ b/nativescript-angular/directives/list-view-comp.ts @@ -168,7 +168,7 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit { if (!viewRef) { listViewError("ViewReference not found for item " + index + ". View recycling is not working"); } - }; + } if (!viewRef) { listViewLog("onItemLoading: " + index + " - Creating view from template"); @@ -234,7 +234,8 @@ function getSingleViewRecursive(nodes: Array, nestLevel: number): View { export interface ComponentView { rootNodes: Array; destroy(): void; -}; +} + export type RootLocator = (nodes: Array, nestLevel: number) => View; export function getItemViewRoot(viewRef: ComponentView, rootLocator: RootLocator = getSingleViewRecursive): View { diff --git a/nativescript-angular/http.ts b/nativescript-angular/http.ts index 2780a6fb3..5f6583a02 100644 --- a/nativescript-angular/http.ts +++ b/nativescript-angular/http.ts @@ -11,11 +11,11 @@ export { NSHttp } from "./http/ns-http"; export function nsHttpFactory(backend, options, nsFileSystem) { return new NSHttp(backend, options, nsFileSystem); -}; +} export function nsXSRFStrategyFactory() { return new NSXSRFStrategy(); -}; +} @NgModule({ providers: [ diff --git a/nativescript-angular/nativescript.module.ts b/nativescript-angular/nativescript.module.ts index dd84f6366..521e926ee 100644 --- a/nativescript-angular/nativescript.module.ts +++ b/nativescript-angular/nativescript.module.ts @@ -26,7 +26,7 @@ import { NS_DIRECTIVES } from "./directives"; export function errorHandlerFactory() { return new ErrorHandler(true); -}; +} @NgModule({ declarations: [ diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts index a8381f5c5..bd2373347 100644 --- a/nativescript-angular/platform-common.ts +++ b/nativescript-angular/platform-common.ts @@ -129,7 +129,7 @@ export class NativeScriptPlatformRef extends PlatformRef { get injector(): Injector { return this.platform.injector; - }; + } destroy(): void { this.platform.destroy(); diff --git a/nativescript-angular/tslint.json b/nativescript-angular/tslint.json index 4db4b9408..faae1470c 100644 --- a/nativescript-angular/tslint.json +++ b/nativescript-angular/tslint.json @@ -62,7 +62,6 @@ "no-string-literal": false, "no-switch-case-fall-through": true, "no-unused-expression": true, - "no-use-before-declare": true, "no-var-keyword": true, "radix": false, "switch-default": true, From c232425f2f87ed690ca8170cb14616ef60f56fe7 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Tue, 2 May 2017 13:36:57 +0300 Subject: [PATCH 4/4] fix: make update-app-ng-deps work with peerDeps --- nativescript-angular/bin/update-app-ng-deps | 68 ++++++++++++--------- 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/nativescript-angular/bin/update-app-ng-deps b/nativescript-angular/bin/update-app-ng-deps index 34b453a74..511bb76a8 100644 --- a/nativescript-angular/bin/update-app-ng-deps +++ b/nativescript-angular/bin/update-app-ng-deps @@ -1,33 +1,43 @@ #!/usr/bin/env node -var path = require("path"); -var fs = require("fs"); - -var binPath = __dirname; -var pluginPath = path.dirname(binPath); -var pluginPackageJsonPath = path.join(pluginPath, "package.json"); -var projectPath = path.dirname(path.dirname(pluginPath)); -var appPackageJsonPath = path.join(projectPath, "package.json"); - -var appPackageJson = JSON.parse(fs.readFileSync(appPackageJsonPath, "utf8")); -var pluginPackageJson = JSON.parse(fs.readFileSync(pluginPackageJsonPath, "utf8")); - -Object.keys(pluginPackageJson.dependencies).forEach(function(dependencyName) { - var version = pluginPackageJson.dependencies[dependencyName]; - if (dependencyName.startsWith("@angular") || dependencyName === "rxjs") { - appPackageJson.dependencies[dependencyName] = version; - console.log("Updated dependency '" + dependencyName + "' to version: " + version + "."); - } -}); - -Object.keys(pluginPackageJson.devDependencies).forEach(function(dependencyName) { - var version = pluginPackageJson.devDependencies[dependencyName]; - if (dependencyName.startsWith("@angular") || dependencyName === "zone.js") { - appPackageJson.devDependencies[dependencyName] = version; - console.log("Updated dev dependency '" + dependencyName + "' to version: " + version + "."); - } -}); - -fs.writeFileSync(appPackageJsonPath, JSON.stringify(appPackageJson, null, 2)); +const path = require("path"); +const fs = require("fs"); + +const binPath = __dirname; +const pluginPath = path.dirname(binPath); +const pluginPackageJsonPath = path.join(pluginPath, "package.json"); +const pluginPackageJson = JSON.parse(fs.readFileSync(pluginPackageJsonPath, "utf8")); +const pluginPeerDeps = pluginPackageJson.peerDependencies; + +const projectPath = path.dirname(path.dirname(pluginPath)); +const appPackageJsonPath = path.join(projectPath, "package.json"); +const appPackageJson = JSON.parse(fs.readFileSync(appPackageJsonPath, "utf8")); + +const shouldUpdateDependency = name => name.startsWith("@angular") || + name === "rxjs" || + name === "zone.js"; + +let updatedDependencies = appPackageJson.dependencies; + +// set app dependencies to ones required from plugin (peer) +Object.keys(pluginPeerDeps) + .filter(shouldUpdateDependency) + .forEach(dependencyName => { + const version = pluginPackageJson.peerDependencies[dependencyName]; + updatedDependencies[dependencyName] = version; + console.log(`Updated dependency ${dependencyName} to version: ${version}.`); + }); + +// remove platform-browser-dynamic if present +const browserDynamicDependency = "@angular/platform-browser-dynamic"; +if (updatedDependencies.hasOwnProperty(browserDynamicDependency)) { + delete updatedDependencies[browserDynamicDependency]; + console.log(`Removed ${browserDynamicDependency}`); +} + +let updatedPackageJson = appPackageJson; +updatedPackageJson.dependencies = updatedDependencies; + +fs.writeFileSync(appPackageJsonPath, JSON.stringify(updatedPackageJson, null, 2)); console.log("\nAngular dependencies updated. Don't forget to run `npm install`.");