From 9532909f154230d6feec558d8dd974548a2a325c Mon Sep 17 00:00:00 2001 From: cre8 <mirkomollik@gmx.de> Date: Sat, 17 Sep 2016 09:59:04 +0200 Subject: [PATCH 1/2] update installation guide to latest cli version The latest cli build (14) is based on webpack in the master branch so you don't need the `@webpack` anymore. --- docs/1-install-and-setup.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/1-install-and-setup.md b/docs/1-install-and-setup.md index 18fdb1583..261979bb4 100644 --- a/docs/1-install-and-setup.md +++ b/docs/1-install-and-setup.md @@ -2,12 +2,10 @@ > Getting started with AngularFire2 is easy with the [Angular CLI](https://github.com/angular/angular-cli). Follow the 10 steps below to get started. Don't worry, we're always working to make this shorter. -**The setups below use the Webpack branch of the [Angular CLI](https://github.com/angular/angular-cli).** - ### 0. Prerequisites -Before you start installing AngularFire2, make sure you have correct version of angular-cli installed. -To verify run the command `ng -v` and ensure you see `angular-cli: 1.x.x-beta.x-webpack.x`. +Before you start installing AngularFire2, make sure you have latest version of angular-cli installed. +To verify run the command `ng -v` and ensure you see `angular-cli: 1.x.x-beta.14`. If not, you may need to do the following: @@ -16,15 +14,15 @@ If not, you may need to do the following: npm uninstall -g angular-cli # reinstall clean version -npm install -g angular-cli@webpack +npm install -g angular-cli ``` You need the Angular CLI, typings, and TypeScript 2.0. TypeScript 2.0 is required for AngularFire2. ```bash -npm install -g angular-cli@webpack +npm install -g angular-cli # or install locally -npm install angular-cli@webpack --save-dev +npm install angular-cli --save-dev # make sure you have typings installed npm install -g typings npm install -g typescript@2.0.2 From 85c71b33a1a50618ee514803e81b018f65c76b85 Mon Sep 17 00:00:00 2001 From: cre8 <mirkomollik@gmx.de> Date: Tue, 20 Sep 2016 09:54:04 +0200 Subject: [PATCH 2/2] Update 1-install-and-setup.md Added lowest possible version of angular-cli --- docs/1-install-and-setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/1-install-and-setup.md b/docs/1-install-and-setup.md index 261979bb4..9e95d9f88 100644 --- a/docs/1-install-and-setup.md +++ b/docs/1-install-and-setup.md @@ -5,7 +5,7 @@ ### 0. Prerequisites Before you start installing AngularFire2, make sure you have latest version of angular-cli installed. -To verify run the command `ng -v` and ensure you see `angular-cli: 1.x.x-beta.14`. +To verify run the command `ng -v` and ensure you see `angular-cli: 1.x.x-beta.xx`. The lowest compatible version is `1.x.x-beta.14`. If not, you may need to do the following: