From c770e6883695e8b5d92a1107d3a49b1cb63655b6 Mon Sep 17 00:00:00 2001 From: Tanguy Krotoff Date: Tue, 5 Sep 2017 00:29:05 +0200 Subject: [PATCH] Drop Bower support (#23568) --- .gitignore | 1 - README.md | 2 -- bower.json | 38 +------------------------- docs/4.0/getting-started/download.md | 10 +------ docs/4.0/getting-started/javascript.md | 2 +- index.html | 5 +--- package.json | 2 +- 7 files changed, 5 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index b78c3a0fbc..f74540ab0d 100644 --- a/.gitignore +++ b/.gitignore @@ -49,5 +49,4 @@ docs/.jekyll-metadata twbsconfig.yml # Folders to ignore -bower_components node_modules diff --git a/README.md b/README.md index e3756e6004..99e21d43b4 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,6 @@ Several quick start options are available: - Install with [npm](https://www.npmjs.com): `npm install bootstrap@4.0.0-beta` - Install with [yarn](https://yarnpkg.com): `yarn add bootstrap@4.0.0-beta` - Install with [Composer](https://getcomposer.org): `composer require twbs/bootstrap:4.0.0-beta` -- Install with [Bower](https://bower.io): `bower install bootstrap#v4.0.0-beta` - Install with [NuGet](https://www.nuget.org): CSS: `Install-Package bootstrap -Pre` Sass: `Install-Package bootstrap.sass -Pre` (`-Pre` is only required until Bootstrap v4 has a stable release). Read the [Getting started page](https://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more. @@ -51,7 +50,6 @@ Read the [Getting started page](https://getbootstrap.com/getting-started/) for i ## Status [![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.com) -[![Bower](https://img.shields.io/bower/v/bootstrap.svg)](https://bower.io/search/?q=bootstrap) [![npm version](https://img.shields.io/npm/v/bootstrap.svg)](https://www.npmjs.com/package/bootstrap) [![Gem version](https://img.shields.io/gem/v/bootstrap.svg)](https://rubygems.org/gems/bootstrap) [![Build Status](https://img.shields.io/travis/twbs/bootstrap/v4-dev.svg)](https://travis-ci.org/twbs/bootstrap) diff --git a/bower.json b/bower.json index dd84105d61..88cf108fd8 100644 --- a/bower.json +++ b/bower.json @@ -1,37 +1 @@ -{ - "name": "bootstrap", - "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "keywords": [ - "css", - "js", - "sass", - "mobile-first", - "responsive", - "front-end", - "framework", - "web" - ], - "homepage": "https://getbootstrap.com", - "license": "MIT", - "moduleType": "globals", - "main": [ - "scss/bootstrap.scss", - "dist/js/bootstrap.js" - ], - "ignore": [ - "/.*", - "/_*", - "about", - "assets", - "docs", - "js/tests", - "nuget", - "CNAME", - "composer.json", - "Gruntfile.js" - ], - "dependencies": { - "jquery": ">=3.0.0", - "popper.js": "^1.12.3" - } -} +@$% Not a Bower package. Use a better package management tool instead. ^&* \ No newline at end of file diff --git a/docs/4.0/getting-started/download.md b/docs/4.0/getting-started/download.md index 29d09a5c5b..a5a586e9ce 100644 --- a/docs/4.0/getting-started/download.md +++ b/docs/4.0/getting-started/download.md @@ -1,7 +1,7 @@ --- layout: docs title: Download -description: Download Bootstrap to get the compiled CSS and JavaScript, source code, or include it with your favorite package managers like npm, Bower, RubyGems, and more. +description: Download Bootstrap to get the compiled CSS and JavaScript, source code, or include it with your favorite package managers like npm, RubyGems, and more. group: getting-started toc: true --- @@ -87,14 +87,6 @@ You can also install and manage Bootstrap's Sass and JavaScript using [Composer] composer require twbs/bootstrap:{{ site.current_version }} {% endhighlight %} -### Bower - -Install and manage Bootstrap's Sass and JavaScript using [Bower](https://bower.io). - -{% highlight bash %} -bower install bootstrap#v{{ site.current_version }} -{% endhighlight %} - ### NuGet If you develop in .NET, you can also install and manage Bootstrap's [CSS](https://www.nuget.org/packages/bootstrap/) or [Sass](https://www.nuget.org/packages/bootstrap.sass/) and JavaScript using [NuGet](https://www.nuget.org): diff --git a/docs/4.0/getting-started/javascript.md b/docs/4.0/getting-started/javascript.md index b33789b72c..12e7f89cae 100644 --- a/docs/4.0/getting-started/javascript.md +++ b/docs/4.0/getting-started/javascript.md @@ -12,7 +12,7 @@ Plugins can be included individually (using Bootstrap's individual `*.js` files) ## Dependencies -Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that **all plugins depend on jQuery** (this means jQuery must be included **before** the plugin files). [Consult our `bower.json`]({{ site.repo }}/blob/v{{ site.current_version }}/bower.json) to see which versions of jQuery are supported. +Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that **all plugins depend on jQuery** (this means jQuery must be included **before** the plugin files). [Consult our `package.json`]({{ site.repo }}/blob/v{{ site.current_version }}/package.json) to see which versions of jQuery are supported. Our tooltips and popovers also depend on [Popper.js](https://github.com/FezVrasta/popper.js). diff --git a/index.html b/index.html index aa3840da9e..264b4f6276 100644 --- a/index.html +++ b/index.html @@ -34,7 +34,7 @@ layout: home {% include icons/import.svg width="32" height="32" class="text-primary mb-2" %}

Installation

-

Include Bootstrap's source Sass and JavaScript files via Bower, Composer, Meteor, or npm. Package managed installs don't include documentation, but do include our build system and readme.

+

Include Bootstrap's source Sass and JavaScript files via npm, Composer or Meteor. Package managed installs don't include documentation, but do include our build system and readme.

{% highlight sh %} npm install bootstrap@{{ site.current_version }} @@ -44,9 +44,6 @@ npm install bootstrap@{{ site.current_version }} gem install bootstrap -v 4.0.0.beta {% endhighlight %} -{% highlight sh %} -bower install bootstrap#v{{ site.current_version }} -{% endhighlight %}
Read installation docs diff --git a/package.json b/package.json index 3c24762271..5642173752 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "docs-serve": "bundle exec jekyll serve", "docs-github": "shx echo \"github: true\" > twbsconfig.yml && npm run docs-compile -- --config _config.yml,twbsconfig.yml && shx rm ./twbsconfig.yml", "docs-upload-preview": "build/upload-preview.sh", - "maintenance-dependencies": "ncu -a -x jquery && npm update && bundle update && shx echo 'Manually update assets/js/vendor/*, js/tests/vendor/*, bower.json and .travis.yml'", + "maintenance-dependencies": "ncu -a -x jquery && npm update && bundle update && shx echo 'Manually update assets/js/vendor/*, js/tests/vendor/* and .travis.yml'", "release-version": "node build/change-version.js", "release-zip": "cd dist/ && zip -r9 bootstrap-$npm_package_version-dist.zip * && shx mv bootstrap-$npm_package_version-dist.zip ..", "dist": "npm-run-all --parallel css js css-docs",