From 7c205ee7137ec2930f76498554e12b2eaea552b8 Mon Sep 17 00:00:00 2001 From: Aditya Parab Date: Sun, 3 Sep 2017 20:12:32 +0530 Subject: [PATCH 1/4] Updated global lib story to reflect latest changes required by bootstrap4 beta --- docs/documentation/stories/global-lib.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/documentation/stories/global-lib.md b/docs/documentation/stories/global-lib.md index 3583b5f143d2..2a061f2e42c0 100644 --- a/docs/documentation/stories/global-lib.md +++ b/docs/documentation/stories/global-lib.md @@ -10,24 +10,26 @@ what you need to do: First install Bootstrap from `npm`: ```bash -npm install bootstrap@next +npm install jquery --save +npm install bootstrap@next --save +npm install popper.js --save ``` Then add the needed script files to `apps[0].scripts`: ```json "scripts": [ - "../node_modules/jquery/dist/jquery.js", - "../node_modules/tether/dist/js/tether.js", - "../node_modules/bootstrap/dist/js/bootstrap.js" + "../node_modules/jquery/dist/jquery.slim.js", + "../node_modules/popper.js/dist/umd/popper.js", + "../node_modules/bootstrap/dist/js/bootstrap.js" ], ``` Finally add the Bootstrap CSS to the `apps[0].styles` array: ```json "styles": [ - "../node_modules/bootstrap/dist/css/bootstrap.css", - "styles.css" + "../node_modules/bootstrap/dist/css/bootstrap.css", + "styles.css" ], ``` From 645d1700f2bf224e11d9ef1acb0999f63738386f Mon Sep 17 00:00:00 2001 From: Aditya Parab Date: Sun, 3 Sep 2017 21:55:13 +0530 Subject: [PATCH 2/4] Updated bootstrap link --- docs/documentation/stories/global-lib.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/documentation/stories/global-lib.md b/docs/documentation/stories/global-lib.md index 2a061f2e42c0..026a9254b5f4 100644 --- a/docs/documentation/stories/global-lib.md +++ b/docs/documentation/stories/global-lib.md @@ -4,7 +4,7 @@ Some javascript libraries need to be added to the global scope, and loaded as if they were in a script tag. We can do this using the `apps[0].scripts` and `apps[0].styles` properties of `.angular-cli.json`. -As an example, to use [Bootstrap 4](http://v4-alpha.getbootstrap.com/) this is +As an example, to use [Bootstrap 4](https://getbootstrap.com/docs/4.0/getting-started/introduction/) (beta) this is what you need to do: First install Bootstrap from `npm`: From 31f6437f15c6ce14c274468a483de9ea61962e5e Mon Sep 17 00:00:00 2001 From: Aditya Parab Date: Sun, 3 Sep 2017 21:55:13 +0530 Subject: [PATCH 3/4] docs(@angular/cli): update global lib story to reflect latest bootstrap configuration - change bootstrap link to point to latest verion - remove tether import from .angular-cli.json - update jquery path in .angular-cli.json to point to jquery.slim.js as per bootstrap documenation - update popper.js path in angular-cli.json to point to use umd verion Closes #7584 --- docs/documentation/stories/global-lib.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/documentation/stories/global-lib.md b/docs/documentation/stories/global-lib.md index 2a061f2e42c0..026a9254b5f4 100644 --- a/docs/documentation/stories/global-lib.md +++ b/docs/documentation/stories/global-lib.md @@ -4,7 +4,7 @@ Some javascript libraries need to be added to the global scope, and loaded as if they were in a script tag. We can do this using the `apps[0].scripts` and `apps[0].styles` properties of `.angular-cli.json`. -As an example, to use [Bootstrap 4](http://v4-alpha.getbootstrap.com/) this is +As an example, to use [Bootstrap 4](https://getbootstrap.com/docs/4.0/getting-started/introduction/) (beta) this is what you need to do: First install Bootstrap from `npm`: From c38fc3ef228e5af301a70bf5a58301c1ea11df96 Mon Sep 17 00:00:00 2001 From: Aditya Parab Date: Sun, 3 Sep 2017 22:42:56 +0530 Subject: [PATCH 4/4] docs(@angular/cli): update global lib story to reflect latest configuration for bootstrap4 - update bootstrap url to point to current version - remove tether import from .angular-cli.json and replace it with popper.js - specify popper.js should use umd version Closes #7584 --- docs/documentation/stories/global-lib.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/documentation/stories/global-lib.md b/docs/documentation/stories/global-lib.md index 026a9254b5f4..c2c2323cd7fd 100644 --- a/docs/documentation/stories/global-lib.md +++ b/docs/documentation/stories/global-lib.md @@ -19,16 +19,16 @@ Then add the needed script files to `apps[0].scripts`: ```json "scripts": [ - "../node_modules/jquery/dist/jquery.slim.js", - "../node_modules/popper.js/dist/umd/popper.js", - "../node_modules/bootstrap/dist/js/bootstrap.js" + "../node_modules/jquery/dist/jquery.slim.js", + "../node_modules/popper.js/dist/umd/popper.js", + "../node_modules/bootstrap/dist/js/bootstrap.js" ], ``` Finally add the Bootstrap CSS to the `apps[0].styles` array: ```json "styles": [ - "../node_modules/bootstrap/dist/css/bootstrap.css", + "../node_modules/bootstrap/dist/css/bootstrap.css", "styles.css" ], ```