From 46691c94cad83713a3abbbeac4e235aeb72f6989 Mon Sep 17 00:00:00 2001 From: Geoffrey Roguelon Date: Thu, 18 Aug 2016 13:04:43 -0500 Subject: [PATCH] Remove old traces of typings. In the commit akveo/ng2-admin@e7fca6d4, we moved to @types for TypeScript typings. It remains some traces in the documentation. This commit remove them. --- Dockerfile | 2 +- .../contents/articles/002-installation-guidelines/index.md | 7 +------ docs/contents/articles/012-project-structure/index.md | 1 - src/main.browser.ts | 2 +- src/vendor.browser.ts | 2 +- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 991928ae..8eb287ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ RUN git clone https://github.com/akveo/ng2-admin.git /var/www \ && cd /var/www \ && npm install --global rimraf \ && npm run clean \ - && npm install --global bower typings webpack webpack-dev-server typescript \ + && npm install --global bower webpack webpack-dev-server typescript \ && bower install --allow-root \ && npm install \ && npm run prebuild:prod && npm run build:prod diff --git a/docs/contents/articles/002-installation-guidelines/index.md b/docs/contents/articles/002-installation-guidelines/index.md index a8bec08c..80c1ce9d 100644 --- a/docs/contents/articles/002-installation-guidelines/index.md +++ b/docs/contents/articles/002-installation-guidelines/index.md @@ -29,11 +29,6 @@ npm install --global webpack npm install --global webpack-dev-server ``` -* typings -```bash -npm install --global typings -``` - * typescript ```bash npm install --global typescript @@ -59,7 +54,7 @@ This will setup a working copy of ng2-admin on your local machine. **Note**: If you have any issues after the installation, additionally run the following: ```bash -typings install && bower install +bower install ``` ## Running local copy diff --git a/docs/contents/articles/012-project-structure/index.md b/docs/contents/articles/012-project-structure/index.md index ee55241d..42aa8a09 100644 --- a/docs/contents/articles/012-project-structure/index.md +++ b/docs/contents/articles/012-project-structure/index.md @@ -53,7 +53,6 @@ ng2-admin/ ├──tslint.json * typescript lint config ├──typedoc.json * typescript documentation generator ├──tsconfig.json * config that webpack uses for typescript - ├──typings.json * our typings manager ├──package.json * what npm uses to manage it's dependencies ├──bower.json * DEPRECATED - moving to npm as primary package manager for all dependenties └──.bowerrc * DEPRECARD - temporary bower configuration diff --git a/src/main.browser.ts b/src/main.browser.ts index 7ac3b9e8..f1de52a0 100644 --- a/src/main.browser.ts +++ b/src/main.browser.ts @@ -38,7 +38,7 @@ export function main(initialHmrState?: any): Promise { * Vendors * For vendors for example jQuery, Lodash, angular2-jwt just import them anywhere in your app * You can also import them in vendors to ensure that they are bundled in one file - * Also see custom-typings.d.ts as you also need to do `typings install x` where `x` is your module + * Also see custom-typings.d.ts as you also need to do `npm install @types/x` where `x` is your module */ diff --git a/src/vendor.browser.ts b/src/vendor.browser.ts index e89dc2a1..379786f2 100644 --- a/src/vendor.browser.ts +++ b/src/vendor.browser.ts @@ -1,7 +1,7 @@ // For vendors for example jQuery, Lodash, angular2-jwt just import them here unless you plan on // chunking vendors files for async loading. You would need to import the async loaded vendors // at the entry point of the async loaded file. Also see custom-typings.d.ts as you also need to -// run `typings install x` where `x` is your module +// run `npm install @types/x` where `x` is your module // Angular 2 import '@angular/platform-browser';