The output folder is `dist/` by default.
-To output to a different folder, change the `outDir` in `.angular-cli.json`.
+To output to a different folder, change the `outputPath` in `angular.json`.
diff --git a/aio/content/guide/elements.md b/aio/content/guide/elements.md
index 33c842716bb9f..2a8c78de0a073 100644
--- a/aio/content/guide/elements.md
+++ b/aio/content/guide/elements.md
@@ -1,5 +1,7 @@
# Angular Elements Overview
+Angular Elements are Angular components packaged as custom elements, a web standard for defining new html elements in a framework-agnostic way.
+
[Custom elements](https://developer.mozilla.org/en-US/docs/Web/Web_Components/Using_custom_elements) are a Web Platform feature currently supported by Chrome, Opera, and Safari, and available in other browsers through polyfills (see [Browser Support](#browser-support)).
A custom element extends HTML by allowing you to define a tag whose content is created and controlled by JavaScript code.
The browser maintains a `CustomElementRegistry` of defined custom elements (also called Web Components), which maps an instantiable JavaScript class to an HTML tag.
diff --git a/aio/content/guide/http.md b/aio/content/guide/http.md
index 502d914a6b0ba..10dd3b6d43749 100644
--- a/aio/content/guide/http.md
+++ b/aio/content/guide/http.md
@@ -1030,10 +1030,18 @@ you are responsible for flushing and verifying them.
You should test the app's defenses against HTTP requests that fail.
-Call `request.error()` with an `ErrorEvent` instead of `request.flush()`, as in this example.
+Call `request.flush()` with an error message, as seen in the following example.
diff --git a/aio/content/guide/npm-packages.md b/aio/content/guide/npm-packages.md
index fddb4805b9780..dcbd489881574 100644
--- a/aio/content/guide/npm-packages.md
+++ b/aio/content/guide/npm-packages.md
@@ -2,7 +2,7 @@
The [**Angular CLI**](https://cli.angular.io/), Angular applications, and Angular itself depend upon features and functionality provided by libraries that are available as [**npm**](https://docs.npmjs.com/) packages.
-You can download and install these npm packages with the [**npm client**](https://docs.npmjs.com/cli/install), which runs as a node.js application.
+You can download and install these npm packages with the [**npm client**](https://docs.npmjs.com/cli/install), which runs as a Node.js® application.
The [**yarn client**](https://yarnpkg.com/en/) is a popular alternative for downloading and installing npm packages.
The Angular CLI uses `yarn` by default to install npm packages when you create a new project.
@@ -14,19 +14,19 @@ Node.js and npm are essential to Angular development.
[Get them now](https://docs.npmjs.com/getting-started/installing-node "Installing Node.js and updating npm")
if they're not already installed on your machine.
-**Verify that you are running node `v4.x.x` or higher and npm `3.x.x` or higher**
+**Verify that you are running Node.js `v8.x` or higher and npm `5.x` or higher**
by running the commands `node -v` and `npm -v` in a terminal/console window.
Older versions produce errors.
Consider using [nvm](https://github.com/creationix/nvm) for managing multiple
-versions of node and npm. You may need [nvm](https://github.com/creationix/nvm) if
-you already have projects running on your machine that use other versions of node and npm.
+versions of Node.js and npm. You may need [nvm](https://github.com/creationix/nvm) if
+you already have projects running on your machine that use other versions of Node.js and npm.
## _package.json_
-Both `npm` and `yarn` install packages identified in a [**package.json**](https://docs.npmjs.com/files/package.json) file.
+Both `npm` and `yarn` install packages that are identified in a [**package.json**](https://docs.npmjs.com/files/package.json) file.
The CLI `ng new` command creates a default `package.json` file for your project.
This `package.json` specifies _a starter set of packages_ that work well together and
@@ -129,7 +129,7 @@ You don't deploy them with the production application although there is no harm
For example, see the [Angular language service extension for VS Code](https://marketplace.visualstudio.com/items?itemName=Angular.ng-template)
-**@types/... **: TypeScript definition files for 3rd party libraries such as Jasmine and node.
+**@types/... **: TypeScript definition files for 3rd party libraries such as Jasmine and Node.js.
**[codelyzer](https://www.npmjs.com/package/codelyzer)**: A linter for Angular apps whose rules conform to the Angular [style guide](guide/styleguide).
@@ -145,7 +145,7 @@ For example, see the [Angular language service extension for VS Code](https://ma
Built on top of [WebDriverJS](https://github.com/SeleniumHQ/selenium/wiki/WebDriverJs).
-**[ts-node](https://www.npmjs.com/package/ts-node)**: TypeScript execution environment and REPL for node.
+**[ts-node](https://www.npmjs.com/package/ts-node)**: TypeScript execution environment and REPL for Node.js.
**[tslint](https://www.npmjs.com/package/tslint)**: a static analysis tool that checks TypeScript code for readability, maintainability, and functionality errors.
diff --git a/aio/content/guide/quickstart.md b/aio/content/guide/quickstart.md
index d3fb4f3070df0..66eea81611a0e 100644
--- a/aio/content/guide/quickstart.md
+++ b/aio/content/guide/quickstart.md
@@ -32,7 +32,7 @@ if they are not already on your machine.
-**Verify that you are running at least node `6.9.x` and npm `3.x.x`**
+**Verify that you are running at least Node.js version `8.x` or greater and npm version `5.x` or greater**
by running `node -v` and `npm -v` in a terminal/console window.
Older versions produce errors, but newer versions are fine.
diff --git a/aio/content/guide/reactive-forms.md b/aio/content/guide/reactive-forms.md
index c7cf260f4463a..34cb42eccabaf 100644
--- a/aio/content/guide/reactive-forms.md
+++ b/aio/content/guide/reactive-forms.md
@@ -1068,7 +1068,7 @@ Replace the address `FormGroup` definition with a `secretLairs` `FormArray` def
-In `hero-detail.component.html` change `formArrayName="address"` to `formArrayName="secretLairs"`.
+In `hero-detail.component.html` change `formGroupName="address"` to `formArrayName="secretLairs"`.
[Download the finished sample code](generated/zips/universal/universal.zip),
-which runs in a [node express](https://expressjs.com/) server.
+which runs in a [Node.js® Express](https://expressjs.com/) server.
@@ -123,7 +123,7 @@ You'll add more files to support building and serving with Universal.
In this example, the Angular CLI compiles and bundles the Universal version of the app with the
[AOT (Ahead-of-Time) compiler](guide/aot-compiler).
-A node/express web server turns client requests into the HTML pages rendered by Universal.
+A Node.js® Express web server turns client requests into the HTML pages rendered by Universal.
You will create:
diff --git a/aio/content/guide/visual-studio-2015.md b/aio/content/guide/visual-studio-2015.md
index ab6b594a8a307..fdb137f6bf4e1 100644
--- a/aio/content/guide/visual-studio-2015.md
+++ b/aio/content/guide/visual-studio-2015.md
@@ -53,7 +53,7 @@ if they are not already on your machine.
-**Verify that you are running node version `4.6.x` or greater, and npm `3.x.x` or greater**
+**Verify that you are running Node.js version `8.x` or greater, and npm `5.x` or greater**
by running `node -v` and `npm -v` in a terminal window.
Older versions produce errors.
diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
index 96d6424dd3b89..1b473f48d29c6 100644
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@@ -226,7 +226,7 @@
"picture": "wardbell.jpg",
"website": "https://github.com/wardbell",
"twitter": "wardbell",
- "bio": "Ward is an all-around developer with JavaScript, node, and .net chops. He's a frequent conference speaker and podcaster, trainer, Google Developer Expert for Angular, Microsoft MVP, and PluralSight author. He is also president of IdeaBlade, an enterprise software consulting firm and the makers of breeze.js. He would like to get more sleep and spend more time in the mountains.",
+ "bio": "Ward is an all-around developer with JavaScript, Node.js®, and .net chops. He's a frequent conference speaker and podcaster, trainer, Google Developer Expert for Angular, Microsoft MVP, and PluralSight author. He is also president of IdeaBlade, an enterprise software consulting firm and the makers of breeze.js. He would like to get more sleep and spend more time in the mountains.",
"group": "Angular"
},
diff --git a/aio/content/marketing/features.html b/aio/content/marketing/features.html
index da2e88309813f..e62dfd8e09961 100755
--- a/aio/content/marketing/features.html
+++ b/aio/content/marketing/features.html
@@ -45,7 +45,7 @@ Features & Benefits
Universal
- Serve the first view of your application on node.js, .NET, PHP, and other servers for near-instant rendering in just HTML and CSS. Also paves the way for sites that optimize for SEO.
+Serve the first view of your application on Node.js®, .NET, PHP, and other servers for near-instant rendering in just HTML and CSS. Also paves the way for sites that optimize for SEO.
diff --git a/aio/content/marketing/resources.json b/aio/content/marketing/resources.json
index 56cc02d063831..fcb84a5d9a369 100644
--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@@ -202,7 +202,7 @@
"url": "https://github.com/angular/universal"
},
"c1": {
- "desc": "Lightweight development only node server",
+ "desc": "Lightweight development only Node.js® server",
"logo": "",
"rev": true,
"title": "Lite-server",
@@ -541,7 +541,7 @@
"logo": "",
"rev": true,
"title": "Egghead.io",
- "url": "https://egghead.io/technologies/angular2"
+ "url": "https://egghead.io/browse/frameworks/angular"
},
"ab5": {
"desc": "Build Web Apps with Angular - recorded video content",
diff --git a/aio/ngsw-manifest.json b/aio/ngsw-manifest.json
index 538b0ce425b93..343fe4f675e2e 100644
--- a/aio/ngsw-manifest.json
+++ b/aio/ngsw-manifest.json
@@ -18,7 +18,7 @@
"routing": {
"index": "/index.html",
"routes": {
- "^(?!/styleguide|/docs/.|(?:/guide/(?:cli-quickstart|metadata|ngmodule|service-worker-(?:getstart|comm|configref)|learning-angular)|/news)(?:\\.html|/)?$|/testing|/api/(?:.+/[^/]+-|platform-browser/AnimationDriver|testing/|api/|animate/|(?:common/(?:NgModel|Control|MaxLengthValidator))|(?:[^/]+/)?(?:NgFor(?:$|-)|AnimationStateDeclarationMetadata|CORE_DIRECTIVES|PLATFORM_PIPES|DirectiveMetadata|HTTP_PROVIDERS))|.*/stackblitz(?:\\.html)?$|.*\\.[^\/.]+$)": {
+ "^(?!/styleguide|/docs/.|(?:/guide/(?:cli-quickstart|metadata|ngmodule|service-worker-(?:getstart|comm|configref)|learning-angular)|/news)(?:\\.html|/)?$|/testing|/api/(?:.+/[^/]+-|platform-browser/AnimationDriver|testing/|api/|animate/|(?:common/(?:NgModel|Control|MaxLengthValidator))|(?:[^/]+/)?(?:NgFor(?:$|-)|AnimationStateDeclarationMetadata|CORE_DIRECTIVES|PLATFORM_PIPES|DirectiveMetadata|HTTP_PROVIDERS))|.*/stackblitz(?:\\.html)?(?:\\?.*)?$|.*\\.[^\/.]+$)": {
"match": "regex"
}
}
diff --git a/aio/package.json b/aio/package.json
index 3c98130a5aa1f..869fefa55637b 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -12,7 +12,7 @@
"aio-use-npm": "node tools/ng-packages-installer restore .",
"aio-check-local": "node tools/ng-packages-installer check .",
"ng": "yarn check-env && ng",
- "start": "yarn check-env && ng serve",
+ "start": "yarn check-env && ng serve --configuration=fast",
"build": "yarn build-for stable",
"prebuild-for": "yarn setup",
"build-for": "yarn ~~build --configuration",
@@ -126,6 +126,7 @@
"ignore": "^3.3.3",
"image-size": "^0.5.1",
"jasmine-core": "^2.8.0",
+ "jasmine-marbles": "^0.3.1",
"jasmine-spec-reporter": "^4.1.0",
"jasmine-ts": "^0.2.1",
"jsdom": "^9.12.0",
diff --git a/aio/src/styles/1-layouts/_top-menu.scss b/aio/src/styles/1-layouts/_top-menu.scss
index 71da0aaf21b8c..f83ee3e5d3a3a 100644
--- a/aio/src/styles/1-layouts/_top-menu.scss
+++ b/aio/src/styles/1-layouts/_top-menu.scss
@@ -1,6 +1,6 @@
// VARIABLES
-$hamburgerShownMargin: 0;
-$hamburgerHiddenMargin: 0 24px 0 -88px;
+$hamburgerShownMargin: 0 8px 0 0;
+$hamburgerHiddenMargin: 0 16px 0 -88px;
// DOCS PAGE / STANDARD: TOPNAV TOOLBAR FIXED
@@ -96,7 +96,6 @@ aio-shell.folder-tutorial mat-toolbar.mat-toolbar {
.nav-link.home img {
position: relative;
margin-top: -21px;
- margin-right: 20px;
top: 12px;
height: 40px;
@@ -144,6 +143,10 @@ aio-top-menu {
padding: 24px 16px;
cursor: pointer;
+ &.home{
+ margin-right: 20px;
+ }
+
&:focus {
background: rgba($white, 0.15);
border-radius: 4px;
diff --git a/aio/tests/deployment/unit/testServiceWorkerRoutes.spec.ts b/aio/tests/deployment/unit/testServiceWorkerRoutes.spec.ts
index 95cec6143d882..005353ee72b5d 100644
--- a/aio/tests/deployment/unit/testServiceWorkerRoutes.spec.ts
+++ b/aio/tests/deployment/unit/testServiceWorkerRoutes.spec.ts
@@ -19,8 +19,14 @@ describe('service-worker routes', () => {
it('should ignore stackblitz URLs', () => {
const routes = loadSWRoutes();
+
+ // Normal StackBlitz URLs.
expect(routes.some(test => test('/generated/live-examples/toh-pt6/stackblitz.html'))).toBeFalsy();
expect(routes.some(test => test('/generated/live-examples/toh-pt6/stackblitz'))).toBeFalsy();
+
+ // Embedded StackBlitz URLs.
+ expect(routes.some(test => test('/generated/live-examples/toh-pt6/stackblitz.html?ctl=1'))).toBeFalsy();
+ expect(routes.some(test => test('/generated/live-examples/toh-pt6/stackblitz?ctl=1'))).toBeFalsy();
});
it('should ignore URLs to files with extensions', () => {
diff --git a/aio/tools/example-zipper/exampleZipper.js b/aio/tools/example-zipper/exampleZipper.js
index ae2726c3f2a44..fe90b2fa2b0f4 100644
--- a/aio/tools/example-zipper/exampleZipper.js
+++ b/aio/tools/example-zipper/exampleZipper.js
@@ -86,7 +86,7 @@ class ExampleZipper {
let alwaysIncludes = [
'bs-config.json',
'e2e/protractor.conf.js',
- '.angular-cli.json',
+ 'angular.json',
'.editorconfig',
'.gitignore',
'tslint.json',
diff --git a/aio/tools/examples/shared/boilerplate/UPDATING_CLI.md b/aio/tools/examples/shared/boilerplate/UPDATING_CLI.md
index b6edd61a12c83..8092025c3033a 100644
--- a/aio/tools/examples/shared/boilerplate/UPDATING_CLI.md
+++ b/aio/tools/examples/shared/boilerplate/UPDATING_CLI.md
@@ -22,21 +22,28 @@ Now you have a fresh application to get our new boilerplate files.
From `dummy` you can replace the following files into `aio/tools/examples/shared/boilerplate/cli`:
-* tslint.json
-* tsconfig.json
-* package.json
-* protractor.conf.js
-* karma.conf.js
* .editorconfig
-* angular-cli.json
-* src/tsconfig.spec.json
-* src/test.ts
-* src/polyfills.js
-* src/typings.d.ts
+* angular.json
+* package.json
+* tsconfig.json
+* tslint.json
+* e2e/src/app.po.ts
+* e2e/protractor.conf.js
+* e2e/tsconfig.e2e.json
* src/environments/environment.prod.ts
* src/environments/environment.ts
+* src/browserslist
+* src/favicon.ico
+* src/karma.conf.js
+* src/polyfills.js
+* src/styles.css
+* src/test.ts
+* src/tsconfig.app.json
+* src/tsconfig.spec.json
+* src/tslint.json
+* src/typings.d.ts
-### .angular-cli.json
+### angular.json
Update the `project > name` to `angular.io-example`.
@@ -44,10 +51,6 @@ Update the `project > name` to `angular.io-example`.
Update the `name` to `angular.io-example`.
-### src/polyfills.ts
-
-Uncomment the `import 'web-animations-js';` line to enable `web-animations-js` package.
-
### src/tsconfig.app.json
This file is small enough and there are a few new excludes, update by hand.
diff --git a/aio/tools/examples/shared/boilerplate/cli/.angular-cli.json b/aio/tools/examples/shared/boilerplate/cli/.angular-cli.json
deleted file mode 100644
index c30a9c8f45cc3..0000000000000
--- a/aio/tools/examples/shared/boilerplate/cli/.angular-cli.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
- "project": {
- "name": "angular.io-example"
- },
- "apps": [
- {
- "root": "src",
- "outDir": "dist",
- "assets": [
- "assets",
- "favicon.ico"
- ],
- "index": "index.html",
- "main": "main.ts",
- "polyfills": "polyfills.ts",
- "test": "test.ts",
- "tsconfig": "tsconfig.app.json",
- "testTsconfig": "tsconfig.spec.json",
- "prefix": "app",
- "styles": [
- "styles.css"
- ],
- "scripts": [],
- "environmentSource": "environments/environment.ts",
- "environments": {
- "dev": "environments/environment.ts",
- "prod": "environments/environment.prod.ts"
- }
- }
- ],
- "e2e": {
- "protractor": {
- "config": "./protractor.conf.js"
- }
- },
- "lint": [
- {
- "project": "src/tsconfig.app.json",
- "exclude": "**/node_modules/**"
- },
- {
- "project": "src/tsconfig.spec.json",
- "exclude": "**/node_modules/**"
- },
- {
- "project": "e2e/tsconfig.e2e.json",
- "exclude": "**/node_modules/**"
- }
- ],
- "test": {
- "karma": {
- "config": "./karma.conf.js"
- }
- },
- "defaults": {
- "styleExt": "css",
- "component": {}
- }
-}
diff --git a/aio/tools/examples/shared/boilerplate/cli/src/environments/environment.ts b/aio/tools/examples/shared/boilerplate/cli/src/environments/environment.ts
index 4b5d1b15e9146..012182efa3b9b 100644
--- a/aio/tools/examples/shared/boilerplate/cli/src/environments/environment.ts
+++ b/aio/tools/examples/shared/boilerplate/cli/src/environments/environment.ts
@@ -1,7 +1,6 @@
-// The file contents for the current environment will overwrite these during build.
-// The build system defaults to the dev environment which uses `environment.ts`, but if you do
-// `ng build --env=prod` then `environment.prod.ts` will be used instead.
-// The list of which env maps to which file can be found in `.angular-cli.json`.
+// This file can be replaced during build by using the `fileReplacements` array.
+// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
+// The list of file replacements can be found in `angular.json`.
export const environment = {
production: false
diff --git a/aio/tools/stackblitz-builder/builder.js b/aio/tools/stackblitz-builder/builder.js
index 38412c525b165..a738b2eca38b3 100644
--- a/aio/tools/stackblitz-builder/builder.js
+++ b/aio/tools/stackblitz-builder/builder.js
@@ -252,7 +252,7 @@ class StackblitzBuilder {
}
var defaultIncludes = ['**/*.ts', '**/*.js', '**/*.css', '**/*.html', '**/*.md', '**/*.json', '**/*.png'];
- var boilerplateIncludes = ['src/environments/*.*', '.angular-cli.json', 'src/polyfills.ts'];
+ var boilerplateIncludes = ['src/environments/*.*', 'angular.json', 'src/polyfills.ts'];
if (config.files) {
if (config.files.length > 0) {
if (config.files[0].substr(0, 1) == '!') {
diff --git a/aio/yarn.lock b/aio/yarn.lock
index 2a8bfd56a5b7f..5360a91f40573 100644
--- a/aio/yarn.lock
+++ b/aio/yarn.lock
@@ -5846,6 +5846,12 @@ jasmine-core@^2.8.0, jasmine-core@~2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+jasmine-marbles@^0.3.1:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.3.1.tgz#ef65edecb41b8dd62fc6bda40448222042e32043"
+ dependencies:
+ lodash "^4.5.0"
+
jasmine-spec-reporter@^4.1.0:
version "4.2.1"
resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
diff --git a/integration/README.md b/integration/README.md
index ee4ab3699f75b..9367c08f2eef7 100644
--- a/integration/README.md
+++ b/integration/README.md
@@ -6,15 +6,12 @@ to work, so they allow high-fidelity reproductions of real-world issues.
For this to work, we first build the Angular distribution just like we would
publish it to npm, then install the distribution into each app.
-To test Angular CLI applications, we generate integration tests such as `cli-hello-world`.
-This was generated with a current version of the CLI, and the only modification was replacement of `@angular/*` packages with their counterparts coming from `file:../../dist/packages-dist/*`.
-When a significant change is released in the CLI, the application should be re-generated from scratch:
+To test Angular CLI applications, we use the integration test `cli-hello-world`.
+When a significant change is released in the CLI, the application should be updated with `ng update`:
```bash
$ cd integration
-$ rm -rf cli-hello-world
-$ ng new cli-hello-world
-# Edit cli-hello-world/package.json to point the @angular packages to dist/packages-dist, and preserve local mods to
+$ ng update
# ng build
# ng test
# typescript version
diff --git a/integration/cli-hello-world/angular.json b/integration/cli-hello-world/angular.json
index bc8ce2b0cc295..0e6f64e89a81a 100644
--- a/integration/cli-hello-world/angular.json
+++ b/integration/cli-hello-world/angular.json
@@ -137,6 +137,11 @@
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "cli-hello-world:serve"
+ },
+ "configurations": {
+ "production": {
+ "devServerTarget": "cli-hello-world:serve:production"
+ }
}
},
"lint": {
diff --git a/integration/cli-hello-world/e2e/app.e2e-spec.ts b/integration/cli-hello-world/e2e/app.e2e-spec.ts
index 5651a8a3a1a90..899e84d526b40 100644
--- a/integration/cli-hello-world/e2e/app.e2e-spec.ts
+++ b/integration/cli-hello-world/e2e/app.e2e-spec.ts
@@ -11,4 +11,9 @@ describe('cli-hello-world App', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to app!');
});
+
+ it('the percent pipe should work', () => {
+ page.navigateTo();
+ expect(page.getPipeContent()).toEqual('100 % awesome');
+ })
});
diff --git a/integration/cli-hello-world/e2e/app.po.ts b/integration/cli-hello-world/e2e/app.po.ts
index 82ea75ba504ab..ae3d5f7f15c74 100644
--- a/integration/cli-hello-world/e2e/app.po.ts
+++ b/integration/cli-hello-world/e2e/app.po.ts
@@ -8,4 +8,8 @@ export class AppPage {
getParagraphText() {
return element(by.css('app-root h1')).getText();
}
+
+ getPipeContent() {
+ return element(by.css('app-root p')).getText();
+ }
}
diff --git a/integration/cli-hello-world/package.json b/integration/cli-hello-world/package.json
index 27e5180488e63..58096f5b56e13 100644
--- a/integration/cli-hello-world/package.json
+++ b/integration/cli-hello-world/package.json
@@ -5,10 +5,11 @@
"scripts": {
"ng": "ng",
"start": "ng serve",
- "build": "ng build --prod",
- "test": "ng test",
+ "build": "ng build --prod --progress false",
+ "e2e": "ng e2e",
+ "test": "ng test && ng e2e --webdriver-update=false && ng e2e --prod --webdriver-update=false",
"lint": "ng lint",
- "e2e": "ng e2e"
+ "postinstall": "webdriver-manager update --gecko false --standalone false $CHROMEDRIVER_VERSION_ARG"
},
"private": true,
"dependencies": {
@@ -27,13 +28,13 @@
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.5.0",
- "@angular/cli": "^6.0.0-rc.0",
+ "@angular/cli": "^6.0.0-rc.5",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@angular/language-service": "file:../../dist/packages-dist/language-service",
"@types/jasmine": "~2.8.3",
"@types/jasminewd2": "~2.0.2",
"@types/node": "~6.0.60",
- "codelyzer": "^4.0.1",
+ "codelyzer": "^4.3.0",
"jasmine-core": "~2.8.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~2.0.0",
@@ -41,7 +42,7 @@
"karma-coverage-istanbul-reporter": "^1.2.1",
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
- "protractor": "~5.1.2",
+ "protractor": "file:../../node_modules/protractor",
"ts-node": "~4.1.0",
"tslint": "~5.9.1",
"typescript": "file:../../node_modules/typescript"
diff --git a/integration/cli-hello-world/protractor.conf.js b/integration/cli-hello-world/protractor.conf.js
index 0422074c16abe..1c07cbce63b51 100644
--- a/integration/cli-hello-world/protractor.conf.js
+++ b/integration/cli-hello-world/protractor.conf.js
@@ -9,8 +9,9 @@ exports.config = {
'./e2e/**/*.e2e-spec.ts'
],
capabilities: {
- 'browserName': 'chrome',
+ browserName: 'chrome',
chromeOptions: {
+ binary: process.env.CHROME_BIN,
args: ['--no-sandbox']
}
},
diff --git a/integration/cli-hello-world/src/app/app.component.html b/integration/cli-hello-world/src/app/app.component.html
index fa2706a406ba6..fade7834d1e2f 100644
--- a/integration/cli-hello-world/src/app/app.component.html
+++ b/integration/cli-hello-world/src/app/app.component.html
@@ -5,6 +5,7 @@
+
{{ 1 | percent }} awesome
Here are some links to help you start:
- diff --git a/integration/cli-hello-world/src/app/app.module.ts b/integration/cli-hello-world/src/app/app.module.ts index 926975afe8af8..314179fcf7661 100644 --- a/integration/cli-hello-world/src/app/app.module.ts +++ b/integration/cli-hello-world/src/app/app.module.ts @@ -1,9 +1,12 @@ import { BrowserModule } from '@angular/platform-browser'; -import { NgModule } from '@angular/core'; - +import { LOCALE_ID, NgModule } from '@angular/core'; +import { registerLocaleData } from '@angular/common'; +import localeFr from '@angular/common/locales/fr'; import { AppComponent } from './app.component'; +// adding this code to detect issues like https://github.com/angular/angular-cli/issues/10322 +registerLocaleData(localeFr); @NgModule({ declarations: [ @@ -12,7 +15,7 @@ import { AppComponent } from './app.component'; imports: [ BrowserModule ], - providers: [], + providers: [{ provide: LOCALE_ID, useValue: 'fr' }], bootstrap: [AppComponent] }) export class AppModule { } diff --git a/integration/cli-hello-world/yarn.lock b/integration/cli-hello-world/yarn.lock index 2b150588b82c4..9f776ee46c6ec 100644 --- a/integration/cli-hello-world/yarn.lock +++ b/integration/cli-hello-world/yarn.lock @@ -2,21 +2,21 @@ # yarn lockfile v1 -"@angular-devkit/architect@0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.5.4.tgz#8c3cad64ec25df3dc61b06d2c1cec79bed649df5" +"@angular-devkit/architect@0.5.7": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.5.7.tgz#f0bbf10265eef1481c24cc4fc5330dc2326f3062" dependencies: - "@angular-devkit/core" "0.5.4" + "@angular-devkit/core" "0.5.7" rxjs "^6.0.0-beta.3" "@angular-devkit/build-angular@~0.5.0": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.5.4.tgz#13c95714e6f5340d31c54cb6d3af64bcc96a1669" + version "0.5.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.5.7.tgz#a28f3fa88a8b62720cd7b96583d0ed3e2ec353dd" dependencies: - "@angular-devkit/architect" "0.5.4" - "@angular-devkit/build-optimizer" "0.5.4" - "@angular-devkit/core" "0.5.4" - "@ngtools/webpack" "6.0.0-rc.2.4" + "@angular-devkit/architect" "0.5.7" + "@angular-devkit/build-optimizer" "0.5.7" + "@angular-devkit/core" "0.5.7" + "@ngtools/webpack" "6.0.0-rc.5" ajv "^6.0.0" autoprefixer "^8.1.0" cache-loader "^1.2.2" @@ -66,66 +66,64 @@ webpack-sources "^1.1.0" webpack-subresource-integrity "^1.1.0-rc.4" -"@angular-devkit/build-optimizer@0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.5.4.tgz#66ea44c37e570ad85fca11ac036ee8e7559ce4e1" +"@angular-devkit/build-optimizer@0.5.7": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.5.7.tgz#a66e21707fe65131549133bc03ebff4dbd61cbe8" dependencies: loader-utils "^1.1.0" source-map "^0.5.6" typescript "~2.7.2" webpack-sources "^1.1.0" -"@angular-devkit/core@0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.5.4.tgz#94b7462f5039cf811c7e06db0c87bb2299d61c71" +"@angular-devkit/core@0.5.7": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.5.7.tgz#77cff4d1d0a29040c8771b99cb849909691c3653" dependencies: - ajv "~5.5.1" + ajv "~6.4.0" chokidar "^1.7.0" rxjs "^6.0.0-beta.3" source-map "^0.5.6" -"@angular-devkit/schematics@0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.5.4.tgz#6a4b0abb30091fa1a5d0751737f9ed036ac8704f" +"@angular-devkit/schematics@0.5.7": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.5.7.tgz#a3780798147451d2455960060c22d7b499655e4a" dependencies: - "@angular-devkit/core" "0.5.4" + "@angular-devkit/core" "0.5.7" "@ngtools/json-schema" "^1.1.0" rxjs "^6.0.0-beta.3" "@angular/animations@file:../../dist/packages-dist/animations": - version "6.0.0-rc.3-c99c2177b4" + version "6.0.0-rc.5" dependencies: tslib "^1.9.0" -"@angular/cli@^6.0.0-rc.0": - version "6.0.0-rc.2" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-6.0.0-rc.2.tgz#2831fd7e2dd1618d85bc38fcb5ca3c9fd7d8ce78" +"@angular/cli@^6.0.0-rc.5": + version "6.0.0-rc.5" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-6.0.0-rc.5.tgz#7eeb00697342b7e0412abcdf0b3c3a4c6b85dd56" dependencies: - "@angular-devkit/architect" "0.5.4" - "@angular-devkit/core" "0.5.4" - "@angular-devkit/schematics" "0.5.4" - "@schematics/angular" "0.5.4" - "@schematics/update" "0.5.4" + "@angular-devkit/architect" "0.5.7" + "@angular-devkit/core" "0.5.7" + "@angular-devkit/schematics" "0.5.7" + "@schematics/angular" "0.5.7" + "@schematics/update" "0.5.7" chalk "~2.2.0" - ember-cli-string-utils "^1.0.0" fs-extra "^4.0.0" - lodash "^4.11.1" node-modules-path "^1.0.0" opn "~5.1.0" resolve "^1.1.7" - rxjs "^6.0.0-rc.0" + rxjs "^6.0.0-turbo-rc.4" semver "^5.1.0" silent-error "^1.0.0" symbol-observable "^1.2.0" yargs-parser "^9.0.2" "@angular/common@file:../../dist/packages-dist/common": - version "6.0.0-rc.3-c99c2177b4" + version "6.0.0-rc.5" dependencies: tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "6.0.0-rc.3-c99c2177b4" + version "6.0.0-rc.5" dependencies: chokidar "^1.4.2" minimist "^1.2.0" @@ -133,40 +131,40 @@ tsickle "^0.27.2" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "6.0.0-rc.3-c99c2177b4" + version "6.0.0-rc.5" dependencies: tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "6.0.0-rc.3-c99c2177b4" + version "6.0.0-rc.5" dependencies: tslib "^1.9.0" "@angular/forms@file:../../dist/packages-dist/forms": - version "6.0.0-rc.3-c99c2177b4" + version "6.0.0-rc.5" dependencies: tslib "^1.9.0" "@angular/http@file:../../dist/packages-dist/http": - version "6.0.0-rc.3-c99c2177b4" + version "6.0.0-rc.5" dependencies: tslib "^1.9.0" "@angular/language-service@file:../../dist/packages-dist/language-service": - version "6.0.0-rc.3-c99c2177b4" + version "6.0.0-rc.5" "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": - version "6.0.0-rc.3-c99c2177b4" + version "6.0.0-rc.5" dependencies: tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "6.0.0-rc.3-c99c2177b4" + version "6.0.0-rc.5" dependencies: tslib "^1.9.0" "@angular/router@file:../../dist/packages-dist/router": - version "6.0.0-rc.3-c99c2177b4" + version "6.0.0-rc.5" dependencies: tslib "^1.9.0" @@ -174,28 +172,28 @@ version "1.1.0" resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922" -"@ngtools/webpack@6.0.0-rc.2.4": - version "6.0.0-rc.2.4" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-6.0.0-rc.2.4.tgz#b3f727f2f4f750e411e220a478237f720ef22e9c" +"@ngtools/webpack@6.0.0-rc.5": + version "6.0.0-rc.5" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-6.0.0-rc.5.tgz#841c7cc8cde31e195e46703fcd925330f3cb2727" dependencies: - "@angular-devkit/core" "0.5.4" + "@angular-devkit/core" "0.5.7" tree-kill "^1.0.0" webpack-sources "^1.1.0" -"@schematics/angular@0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.5.4.tgz#1c87706703a985fd291d283a4db1a9fc0aa6238f" +"@schematics/angular@0.5.7": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.5.7.tgz#4260ffc2728453697a42a58560666775f31bc74c" dependencies: - "@angular-devkit/core" "0.5.4" - "@angular-devkit/schematics" "0.5.4" - typescript "~2.6.2" + "@angular-devkit/core" "0.5.7" + "@angular-devkit/schematics" "0.5.7" + typescript ">=2.6.2 <2.8" -"@schematics/update@0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.5.4.tgz#065c2f4be0d2fc45bcf2256cef5ce7f684937306" +"@schematics/update@0.5.7": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.5.7.tgz#9ae1ab70cc77a0d14c0148df2737dbcd3988fedd" dependencies: - "@angular-devkit/core" "0.5.4" - "@angular-devkit/schematics" "0.5.4" + "@angular-devkit/core" "0.5.7" + "@angular-devkit/schematics" "0.5.7" rxjs "^6.0.0-beta.3" semver "^5.3.0" semver-intersect "^1.1.2" @@ -319,7 +317,7 @@ ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^5.0.0, ajv@^5.1.0, ajv@~5.5.1: +ajv@^5.0.0, ajv@^5.1.0: version "5.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" dependencies: @@ -328,7 +326,7 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@~5.5.1: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -ajv@^6.0.0, ajv@^6.1.0: +ajv@^6.0.0, ajv@^6.1.0, ajv@~6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6" dependencies: @@ -1282,15 +1280,15 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -codelyzer@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.1.0.tgz#3117754538d8f5ffa36dff91d340573a836cf373" +codelyzer@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.3.0.tgz#6bf3ba68efd9d655a451ecaa14a2852001a43dfb" 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" + source-map "^0.5.7" sprintf-js "^1.0.3" collection-visit@^1.0.0: @@ -1962,10 +1960,6 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -ember-cli-string-utils@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1" - emojis-list@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" @@ -3894,7 +3888,7 @@ lodash.tail@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" -lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.4: +lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.4: version "4.17.5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" @@ -5009,9 +5003,8 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -protractor@~5.1.2: +"protractor@file:../../node_modules/protractor": version "5.1.2" - resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.1.2.tgz#9b221741709a4c62d5cd53c6aadd54a71137e95f" dependencies: "@types/node" "^6.0.46" "@types/q" "^0.0.32" @@ -5606,8 +5599,14 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rxjs@^6.0.0-beta.3, rxjs@^6.0.0-rc.0, "rxjs@file:../../node_modules/rxjs": - version "6.0.0-tactical-rc.1" +rxjs@^6.0.0-beta.3, rxjs@^6.0.0-turbo-rc.4: + version "6.0.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0.tgz#d647e029b5854617f994c82fe57a4c6747b352da" + dependencies: + tslib "^1.9.0" + +"rxjs@file:../../node_modules/rxjs": + version "6.0.0-uncanny-rc.7" dependencies: tslib "^1.9.0" @@ -6614,16 +6613,12 @@ typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -"typescript@file:../../node_modules/typescript": +"typescript@>=2.6.2 <2.8", typescript@~2.7.2: version "2.7.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836" -typescript@~2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" - -typescript@~2.7.2: +"typescript@file:../../node_modules/typescript": version "2.7.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836" uglify-es@^3.3.4: version "3.3.9" @@ -7217,4 +7212,4 @@ yn@^2.0.0: resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a" "zone.js@file:../../node_modules/zone.js": - version "0.8.25" + version "0.8.26" diff --git a/package.json b/package.json index 701fd49c69c2b..bc78e62ec78e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-srcs", - "version": "6.0.0-rc.6", + "version": "6.0.0", "private": true, "branchPattern": "2.0.*", "description": "Angular - a web framework for modern web apps", @@ -31,7 +31,7 @@ "@schematics/angular": "^0.5.4", "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", - "rxjs": "^6.0.0-uncanny-rc.7", + "rxjs": "^6.0.0", "tslib": "^1.7.1", "zone.js": "^0.8.26" }, diff --git a/packages/benchpress/package.json b/packages/benchpress/package.json index 42dfb961a9f10..72cccaf76bb00 100644 --- a/packages/benchpress/package.json +++ b/packages/benchpress/package.json @@ -8,7 +8,7 @@ "dependencies": { "@angular/core": "^2.0.0-rc.7", "reflect-metadata": "^0.1.2", - "rxjs": "^6.0.0-rc.0", + "rxjs": "^6.0.0", "jpm": "1.1.4", "firefox-profile": "0.4.0", "selenium-webdriver": "^2.53.3" diff --git a/packages/common/package.json b/packages/common/package.json index ca858ee014ced..865fb8faee189 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -17,7 +17,7 @@ }, "locales": "locales", "peerDependencies": { - "rxjs": "^6.0.0-rc.0", + "rxjs": "^6.0.0", "@angular/core": "0.0.0-PLACEHOLDER" }, "repository": { diff --git a/packages/core/package.json b/packages/core/package.json index a536c17235446..4c2a656abee68 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -16,7 +16,7 @@ "tslib": "^1.9.0" }, "peerDependencies": { - "rxjs": "^6.0.0-rc.0", + "rxjs": "^6.0.0", "zone.js": "~0.8.26" }, "repository": { diff --git a/packages/core/src/view/ng_module.ts b/packages/core/src/view/ng_module.ts index 20f4ef060d54d..4a7d6a19ad84b 100644 --- a/packages/core/src/view/ng_module.ts +++ b/packages/core/src/view/ng_module.ts @@ -68,7 +68,10 @@ export function initNgModule(data: NgModuleData) { for (let i = 0; i < def.providers.length; i++) { const provDef = def.providers[i]; if (!(provDef.flags & NodeFlags.LazyProvider)) { - providers[i] = _createProviderInstance(data, provDef); + // Make sure the provider has not been already initialized outside this loop. + if (providers[i] === undefined) { + providers[i] = _createProviderInstance(data, provDef); + } } } } diff --git a/packages/core/test/linker/ng_module_integration_spec.ts b/packages/core/test/linker/ng_module_integration_spec.ts index 70194daa79d40..0ef56663cb0a1 100644 --- a/packages/core/test/linker/ng_module_integration_spec.ts +++ b/packages/core/test/linker/ng_module_integration_spec.ts @@ -883,6 +883,35 @@ function declareTests({useJit}: {useJit: boolean}) { expect(createModule(MyModule).injector.get('eager1')).toBe('v1: v2'); }); + + it('eager providers should get initialized only once', () => { + @Injectable() + class MyService1 { + public innerService: MyService2; + constructor(injector: Injector) { + // Create MyService2 before it it's initialized by TestModule. + this.innerService = injector.get(MyService2); + } + } + + @Injectable() + class MyService2 { + constructor() {} + } + + @NgModule({ + providers: [MyService1, MyService2], + }) + class TestModule { + constructor(public service1: MyService1, public service2: MyService2) {} + } + + const moduleRef = createModule(TestModule, injector); + const module = moduleRef.instance; + + // MyService2 should not get initialized twice. + expect(module.service1.innerService).toBe(module.service2); + }); }); it('should throw when no provider defined', () => { diff --git a/packages/elements/package.json b/packages/elements/package.json index 08d9e2a7c6b05..2b44aa73b794e 100644 --- a/packages/elements/package.json +++ b/packages/elements/package.json @@ -18,7 +18,7 @@ "peerDependencies": { "@angular/core": "0.0.0-PLACEHOLDER", "@angular/platform-browser": "0.0.0-PLACEHOLDER", - "rxjs": "^6.0.0-rc.0" + "rxjs": "^6.0.0" }, "repository": { "type": "git", diff --git a/packages/forms/package.json b/packages/forms/package.json index b5a55f7865328..9b644c186beaa 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -16,7 +16,7 @@ "tslib": "^1.9.0" }, "peerDependencies": { - "rxjs": "^6.0.0-rc.0", + "rxjs": "^6.0.0", "@angular/core": "0.0.0-PLACEHOLDER", "@angular/common": "0.0.0-PLACEHOLDER", "@angular/platform-browser": "0.0.0-PLACEHOLDER" diff --git a/packages/http/package.json b/packages/http/package.json index 46c1623ba9181..eac22ac7a31c9 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -16,7 +16,7 @@ "tslib": "^1.9.0" }, "peerDependencies": { - "rxjs": "^6.0.0-rc.0", + "rxjs": "^6.0.0", "@angular/core": "0.0.0-PLACEHOLDER", "@angular/platform-browser": "0.0.0-PLACEHOLDER" }, diff --git a/packages/router/package.json b/packages/router/package.json index 129a9cc02f807..115d685b8521e 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -31,7 +31,7 @@ "@angular/core": "0.0.0-PLACEHOLDER", "@angular/common": "0.0.0-PLACEHOLDER", "@angular/platform-browser": "0.0.0-PLACEHOLDER", - "rxjs": "^6.0.0-rc.0" + "rxjs": "^6.0.0" }, "ng-update": { "packageGroup": "NG_UPDATE_PACKAGE_GROUP" diff --git a/yarn.lock b/yarn.lock index b07f15349d545..5b87332be0e14 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5142,15 +5142,15 @@ rollup@0.47.4: version "0.47.4" resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.47.4.tgz#e3a55de83a78221d232ce29619a8d68189ae845e" -rxjs@^6.0.0-beta.3: - version "6.0.0-tactical-rc.1" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-tactical-rc.1.tgz#1fe1f1204132d1c71c72f249a487f8e76a5ec1d5" +rxjs@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0.tgz#d647e029b5854617f994c82fe57a4c6747b352da" dependencies: tslib "^1.9.0" -rxjs@^6.0.0-uncanny-rc.7: - version "6.0.0-uncanny-rc.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-uncanny-rc.7.tgz#e5d6ebe2c538c583bf4b3600b60112d64a7a6991" +rxjs@^6.0.0-beta.3: + version "6.0.0-tactical-rc.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-tactical-rc.1.tgz#1fe1f1204132d1c71c72f249a487f8e76a5ec1d5" dependencies: tslib "^1.9.0"