From ed45830044d42252c3cf8db8fbc8c56b26000904 Mon Sep 17 00:00:00 2001 From: Jesus Rodriguez Date: Fri, 30 Jun 2017 16:06:00 +0200 Subject: [PATCH] docs(aio): update quickstart to latest cli --- .../examples/cli-quickstart/e2e-spec.ts | 2 +- .../cli-quickstart/e2e/app.e2e-spec.ts | 2 +- .../cli-quickstart/e2e/tsconfig.e2e.json | 16 +-- .../cli-quickstart/src/app/app.component.html | 23 +++- .../src/app/app.component.spec.ts | 6 +- .../cli-quickstart/src/app/app.module.ts | 6 +- .../examples/cli-quickstart/src/index.html | 4 +- .../examples/cli-quickstart/src/polyfills.ts | 14 ++- .../cli-quickstart/src/tsconfig.app.json | 11 +- .../cli-quickstart/src/tsconfig.spec.json | 14 +-- .../examples/cli-quickstart/src/typings.d.ts | 5 + .../examples/cli-quickstart/tsconfig.json | 8 +- aio/content/guide/quickstart.md | 2 +- .../images/guide/cli-quickstart/app-works.png | Bin 2122 -> 11802 bytes .../guide/cli-quickstart/my-first-app.png | Bin 4331 -> 7067 bytes .../examples/shared/boilerplate/package.json | 2 +- aio/tools/examples/shared/package.json | 6 +- aio/tools/examples/shared/yarn.lock | 110 ++++++++++-------- 18 files changed, 128 insertions(+), 103 deletions(-) create mode 100644 aio/content/examples/cli-quickstart/src/typings.d.ts diff --git a/aio/content/examples/cli-quickstart/e2e-spec.ts b/aio/content/examples/cli-quickstart/e2e-spec.ts index 59816e13c2..3f0760b56e 100644 --- a/aio/content/examples/cli-quickstart/e2e-spec.ts +++ b/aio/content/examples/cli-quickstart/e2e-spec.ts @@ -9,6 +9,6 @@ describe('cli-quickstart App', () => { it('should display message saying app works', () => { let pageTitle = element(by.css('app-root h1')).getText(); - expect(pageTitle).toEqual('My First Angular App'); + expect(pageTitle).toEqual('Welcome to My First Angular App!!'); }); }); diff --git a/aio/content/examples/cli-quickstart/e2e/app.e2e-spec.ts b/aio/content/examples/cli-quickstart/e2e/app.e2e-spec.ts index 4346d120c8..eea51018bd 100644 --- a/aio/content/examples/cli-quickstart/e2e/app.e2e-spec.ts +++ b/aio/content/examples/cli-quickstart/e2e/app.e2e-spec.ts @@ -9,6 +9,6 @@ describe('my-app App', function() { it('should display message saying app works', () => { page.navigateTo(); - expect(page.getParagraphText()).toEqual('app works!'); + expect(page.getParagraphText()).toEqual('Welcome to app!!'); }); }); diff --git a/aio/content/examples/cli-quickstart/e2e/tsconfig.e2e.json b/aio/content/examples/cli-quickstart/e2e/tsconfig.e2e.json index 74c2bca131..39b800f789 100644 --- a/aio/content/examples/cli-quickstart/e2e/tsconfig.e2e.json +++ b/aio/content/examples/cli-quickstart/e2e/tsconfig.e2e.json @@ -1,18 +1,12 @@ { + "extends": "../tsconfig.json", "compilerOptions": { - "sourceMap": true, - "declaration": false, - "moduleResolution": "node", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "lib": [ - "es2016" - ], - "outDir": "../dist/out-tsc-e2e", + "outDir": "../out-tsc/e2e", "module": "commonjs", - "target": "es6", - "types":[ + "target": "es5", + "types": [ "jasmine", + "jasminewd2", "node" ] } diff --git a/aio/content/examples/cli-quickstart/src/app/app.component.html b/aio/content/examples/cli-quickstart/src/app/app.component.html index b6931b538a..1a1d09dc78 100644 --- a/aio/content/examples/cli-quickstart/src/app/app.component.html +++ b/aio/content/examples/cli-quickstart/src/app/app.component.html @@ -1,3 +1,20 @@ -

- {{title}} -

+ +
+

+ Welcome to {{title}}!! +

+ Angular logo +
+

Here are some links to help you start:

+ + diff --git a/aio/content/examples/cli-quickstart/src/app/app.component.spec.ts b/aio/content/examples/cli-quickstart/src/app/app.component.spec.ts index c740bcd745..7d2799ceb6 100644 --- a/aio/content/examples/cli-quickstart/src/app/app.component.spec.ts +++ b/aio/content/examples/cli-quickstart/src/app/app.component.spec.ts @@ -17,16 +17,16 @@ describe('AppComponent', () => { expect(app).toBeTruthy(); })); - it(`should have as title 'app works!'`, async(() => { + it(`should have as title 'app'`, async(() => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.debugElement.componentInstance; - expect(app.title).toEqual('app works!'); + expect(app.title).toEqual('app'); })); it('should render title in a h1 tag', async(() => { const fixture = TestBed.createComponent(AppComponent); fixture.detectChanges(); const compiled = fixture.debugElement.nativeElement; - expect(compiled.querySelector('h1').textContent).toContain('app works!'); + expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!!'); })); }); diff --git a/aio/content/examples/cli-quickstart/src/app/app.module.ts b/aio/content/examples/cli-quickstart/src/app/app.module.ts index 67ae49119b..f65716351a 100644 --- a/aio/content/examples/cli-quickstart/src/app/app.module.ts +++ b/aio/content/examples/cli-quickstart/src/app/app.module.ts @@ -1,7 +1,5 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { HttpModule } from '@angular/http'; import { AppComponent } from './app.component'; @@ -10,9 +8,7 @@ import { AppComponent } from './app.component'; AppComponent ], imports: [ - BrowserModule, - FormsModule, - HttpModule + BrowserModule ], providers: [], bootstrap: [AppComponent] diff --git a/aio/content/examples/cli-quickstart/src/index.html b/aio/content/examples/cli-quickstart/src/index.html index 8a1a7b32b3..0450fa57c3 100644 --- a/aio/content/examples/cli-quickstart/src/index.html +++ b/aio/content/examples/cli-quickstart/src/index.html @@ -1,5 +1,5 @@ - + MyApp @@ -9,6 +9,6 @@ - Loading... + diff --git a/aio/content/examples/cli-quickstart/src/polyfills.ts b/aio/content/examples/cli-quickstart/src/polyfills.ts index 53bdaf1b86..7831e97b79 100644 --- a/aio/content/examples/cli-quickstart/src/polyfills.ts +++ b/aio/content/examples/cli-quickstart/src/polyfills.ts @@ -31,21 +31,21 @@ // import 'core-js/es6/array'; // import 'core-js/es6/regexp'; // import 'core-js/es6/map'; +// import 'core-js/es6/weak-map'; // import 'core-js/es6/set'; /** IE10 and IE11 requires the following for NgClass support on SVG elements */ // import 'classlist.js'; // Run `npm install --save classlist.js`. -/** IE10 and IE11 requires the following to support `@angular/animation`. */ -// import 'web-animations-js'; // Run `npm install --save web-animations-js`. - - /** Evergreen browsers require these. **/ import 'core-js/es6/reflect'; import 'core-js/es7/reflect'; -/** ALL Firefox browsers require the following to support `@angular/animation`. **/ +/** + * Required to support Web Animations `@angular/animation`. + * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation + **/ // import 'web-animations-js'; // Run `npm install --save web-animations-js`. @@ -66,3 +66,7 @@ import 'zone.js/dist/zone'; // Included with Angular CLI. * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 */ // import 'intl'; // Run `npm install --save intl`. +/** + * Need to import at least one locale-data with intl. + */ +// import 'intl/locale-data/jsonp/en'; diff --git a/aio/content/examples/cli-quickstart/src/tsconfig.app.json b/aio/content/examples/cli-quickstart/src/tsconfig.app.json index 9f12c4b849..5e2507db58 100644 --- a/aio/content/examples/cli-quickstart/src/tsconfig.app.json +++ b/aio/content/examples/cli-quickstart/src/tsconfig.app.json @@ -1,16 +1,7 @@ { + "extends": "../tsconfig.json", "compilerOptions": { - "sourceMap": true, - "declaration": false, - "moduleResolution": "node", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "lib": [ - "es2016", - "dom" - ], "outDir": "../out-tsc/app", - "target": "es5", "module": "es2015", "baseUrl": "", "types": [] diff --git a/aio/content/examples/cli-quickstart/src/tsconfig.spec.json b/aio/content/examples/cli-quickstart/src/tsconfig.spec.json index 6c5160e12e..510e3f1fda 100644 --- a/aio/content/examples/cli-quickstart/src/tsconfig.spec.json +++ b/aio/content/examples/cli-quickstart/src/tsconfig.spec.json @@ -1,16 +1,9 @@ { + "extends": "../tsconfig.json", "compilerOptions": { - "sourceMap": true, - "declaration": false, - "moduleResolution": "node", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "lib": [ - "es2016" - ], "outDir": "../out-tsc/spec", "module": "commonjs", - "target": "es6", + "target": "es5", "baseUrl": "", "types": [ "jasmine", @@ -21,6 +14,7 @@ "test.ts" ], "include": [ - "**/*.spec.ts" + "**/*.spec.ts", + "**/*.d.ts" ] } diff --git a/aio/content/examples/cli-quickstart/src/typings.d.ts b/aio/content/examples/cli-quickstart/src/typings.d.ts new file mode 100644 index 0000000000..ef5c7bd620 --- /dev/null +++ b/aio/content/examples/cli-quickstart/src/typings.d.ts @@ -0,0 +1,5 @@ +/* SystemJS module definition */ +declare var module: NodeModule; +interface NodeModule { + id: string; +} diff --git a/aio/content/examples/cli-quickstart/tsconfig.json b/aio/content/examples/cli-quickstart/tsconfig.json index cde5e35054..a35a8ee3a4 100644 --- a/aio/content/examples/cli-quickstart/tsconfig.json +++ b/aio/content/examples/cli-quickstart/tsconfig.json @@ -2,13 +2,19 @@ "compileOnSave": false, "compilerOptions": { "outDir": "./dist/out-tsc", + "baseUrl": "src", "sourceMap": true, "declaration": false, "moduleResolution": "node", "emitDecoratorMetadata": true, "experimentalDecorators": true, + "target": "es5", + "typeRoots": [ + "node_modules/@types" + ], "lib": [ - "es2016" + "es2016", + "dom" ] } } diff --git a/aio/content/guide/quickstart.md b/aio/content/guide/quickstart.md index 41bc4b1b0f..69819dcb20 100644 --- a/aio/content/guide/quickstart.md +++ b/aio/content/guide/quickstart.md @@ -140,7 +140,7 @@ This is the _root component_ and it is named `app-root`. You can find it in `./src/app/app.component.ts`. -Open the component file and change the `title` property from _app works!_ to _My First Angular App_: +Open the component file and change the `title` property from _Welcome to app!!_ to _Welcome to My First Angular App!!_: diff --git a/aio/content/images/guide/cli-quickstart/app-works.png b/aio/content/images/guide/cli-quickstart/app-works.png index 1dbaa4f63454289744fc240e3095bb862310bdc3..606adf0e17c9595893b2d47217aa03e6bd374fda 100644 GIT binary patch literal 11802 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 literal 2122 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 diff --git a/aio/tools/examples/shared/boilerplate/package.json b/aio/tools/examples/shared/boilerplate/package.json index 2e4bc19f91..463567b1eb 100644 --- a/aio/tools/examples/shared/boilerplate/package.json +++ b/aio/tools/examples/shared/boilerplate/package.json @@ -38,7 +38,7 @@ "license": "MIT", "dependencies": {}, "devDependencies": { - "angular-cli": "^1.0.0-rc.0" + "@angular/cli": "^1.2.0" }, "repository": {} } diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json index 989b7346c9..d2c8d5501a 100644 --- a/aio/tools/examples/shared/package.json +++ b/aio/tools/examples/shared/package.json @@ -27,12 +27,12 @@ "@angular/upgrade": "~4.2.0", "angular-in-memory-web-api": "~0.3.2", "core-js": "^2.4.1", - "rxjs": "5.0.1", + "rxjs": "^5.1.0", "systemjs": "0.19.39", "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/cli": "^1.0.0", + "@angular/cli": "^1.2.0", "@types/angular": "^1.5.16", "@types/angular-animate": "^1.5.5", "@types/angular-cookies": "^1.4.2", @@ -78,7 +78,7 @@ "rollup-plugin-uglify": "^1.0.1", "source-map-explorer": "^1.3.2", "style-loader": "^0.13.1", - "ts-node": "^1.3.0", + "ts-node": "~3.0.4", "tslint": "^3.15.1", "typescript": "~2.3.2", "webpack": "2.2.1", diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock index da8915203c..9219bc5357 100644 --- a/aio/tools/examples/shared/yarn.lock +++ b/aio/tools/examples/shared/yarn.lock @@ -8,18 +8,18 @@ dependencies: tslib "^1.7.1" -"@angular/cli@^1.0.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.1.1.tgz#ee5cf7637ad859c08e8a5e7a7f2161d0e74ce7a5" +"@angular/cli@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.2.0.tgz#dfd8b8983ec37c2b6d7f902ead60396d7b571597" dependencies: "@ngtools/json-schema" "1.1.0" - "@ngtools/webpack" "1.4.1" + "@ngtools/webpack" "1.5.0" autoprefixer "^6.5.3" chalk "^1.1.3" common-tags "^1.3.1" + core-object "^3.1.0" css-loader "^0.28.1" cssnano "^3.10.0" - debug "^2.1.3" denodeify "^1.2.1" diff "^3.1.0" ember-cli-normalize-entity-name "^1.0.0" @@ -27,9 +27,11 @@ exports-loader "^0.6.3" extract-text-webpack-plugin "^2.1.0" file-loader "^0.10.0" - fs-extra "^2.0.0" + fs-extra "^3.0.1" get-caller-file "^1.0.0" glob "^7.0.3" + heimdalljs "^0.2.4" + heimdalljs-logger "^0.1.9" html-webpack-plugin "^2.19.0" inflection "^1.7.0" inquirer "^3.0.0" @@ -38,6 +40,7 @@ json-loader "^0.5.4" less "^2.7.2" less-loader "^4.0.2" + license-webpack-plugin "^0.4.2" lodash "^4.11.1" memory-fs "^0.4.1" minimatch "^3.0.3" @@ -49,7 +52,6 @@ postcss-url "^5.1.2" raw-loader "^0.5.1" resolve "^1.1.7" - rimraf "^2.5.3" rsvp "^3.0.17" rxjs "^5.0.1" sass-loader "^6.0.3" @@ -152,9 +154,9 @@ version "1.1.0" resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922" -"@ngtools/webpack@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.4.1.tgz#6d498f21cd1afc027b8b746d8524a7f4e91e1dab" +"@ngtools/webpack@1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.5.0.tgz#b6be58d857d41f8999751d6bbc3d21e84bc977ca" dependencies: enhanced-resolve "^3.1.0" loader-utils "^1.0.2" @@ -356,10 +358,6 @@ ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -any-promise@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - anymatch@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507" @@ -1676,6 +1674,12 @@ core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" +core-object@^3.1.0: + version "3.1.3" + resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.3.tgz#df399b3311bdb0c909e8aae8929fc3c1c4b25880" + dependencies: + chalk "^1.1.3" + core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -1888,7 +1892,7 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -debug@*, debug@2, debug@2.6.8, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.6.8: +debug@*, debug@2, debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.6.8: version "2.6.8" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" dependencies: @@ -2586,7 +2590,7 @@ fs-access@^1.0.0: dependencies: null-check "^1.0.0" -fs-extra@3.0.1: +fs-extra@3.0.1, fs-extra@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" dependencies: @@ -2603,13 +2607,6 @@ fs-extra@^0.23.1: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-extra@^2.0.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - fs-extra@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" @@ -2890,6 +2887,19 @@ he@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/he/-/he-0.5.0.tgz#2c05ffaef90b68e860f3fd2b54ef580989277ee2" +heimdalljs-logger@^0.1.9: + version "0.1.9" + resolved "https://registry.yarnpkg.com/heimdalljs-logger/-/heimdalljs-logger-0.1.9.tgz#d76ada4e45b7bb6f786fc9c010a68eb2e2faf176" + dependencies: + debug "^2.2.0" + heimdalljs "^0.2.0" + +heimdalljs@^0.2.0, heimdalljs@^0.2.4: + version "0.2.5" + resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.5.tgz#6aa54308eee793b642cff9cf94781445f37730ac" + dependencies: + rsvp "~3.2.1" + hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -3632,6 +3642,12 @@ less@^2.7.2: request "^2.72.0" source-map "^0.5.3" +license-webpack-plugin@^0.4.2: + version "0.4.3" + resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-0.4.3.tgz#f9d88d4ebc04407a0061e8ccac26571f88e51a16" + dependencies: + object-assign "^4.1.0" + limiter@^1.0.5: version "1.1.0" resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.0.tgz#6e2bd12ca3fcdaa11f224e2e53c896df3f08d913" @@ -4418,7 +4434,7 @@ pinkie-promise@^2.0.0: dependencies: pinkie "^2.0.0" -pinkie@^2.0.0, pinkie@^2.0.4: +pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" @@ -5217,7 +5233,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d" dependencies: @@ -5275,6 +5291,10 @@ rsvp@^3.0.17: version "3.5.0" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.5.0.tgz#a62c573a4ae4e1dfd0697ebc6242e79c681eaa34" +rsvp@~3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a" + run-async@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" @@ -5299,9 +5319,9 @@ rx@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" -rxjs@5.0.1, rxjs@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.0.1.tgz#3a69bdf9f0ca0a986303370d4708f72bdfac8356" +rxjs@^5.0.1, rxjs@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.1.0.tgz#0aa9018b7f440b505fa42bd742b6738be550e720" dependencies: symbol-observable "^1.0.1" @@ -5844,6 +5864,10 @@ strip-bom@^2.0.0: dependencies: is-utf8 "^0.2.0" +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + strip-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" @@ -6018,9 +6042,9 @@ trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" -ts-node@^1.3.0: - version "1.7.3" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-1.7.3.tgz#dee7f8a84751732d3c2e497cac5a02fb117dfee7" +ts-node@~3.0.4: + version "3.0.6" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-3.0.6.tgz#55127ff790c7eebf6ba68c1e6dde94b09aaa21e0" dependencies: arrify "^1.0.0" chalk "^1.1.1" @@ -6028,20 +6052,16 @@ ts-node@^1.3.0: make-error "^1.1.1" minimist "^1.2.0" mkdirp "^0.5.1" - pinkie "^2.0.4" source-map-support "^0.4.0" - tsconfig "^5.0.2" + tsconfig "^6.0.0" v8flags "^2.0.11" - xtend "^4.0.0" - yn "^1.2.0" + yn "^2.0.0" -tsconfig@^5.0.2: - version "5.0.3" - resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-5.0.3.tgz#5f4278e701800967a8fc383fd19648878f2a6e3a" +tsconfig@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-6.0.0.tgz#6b0e8376003d7af1864f8df8f89dd0059ffcd032" dependencies: - any-promise "^1.3.0" - parse-json "^2.2.0" - strip-bom "^2.0.0" + strip-bom "^3.0.0" strip-json-comments "^2.0.0" tsickle@^0.21.0: @@ -6724,11 +6744,9 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -yn@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/yn/-/yn-1.3.0.tgz#1b0812abb8d805d48966f8df385dc9dacc9a19d8" - dependencies: - object-assign "^4.1.1" +yn@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a" zone.js@^0.8.4: version "0.8.12"