Skip to content

Commit 29f6c67

Browse files
authored
Finish removing bower (#7294)
1 parent f19a701 commit 29f6c67

File tree

8 files changed

+3
-98
lines changed

8 files changed

+3
-98
lines changed

.github/workflows/ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ jobs:
5151
run: |
5252
gulp docs
5353
gulp package
54-
gulp bower
5554
- name: Publish Test Results
5655
run: cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
5756
shell: bash

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
.project
1212
.settings
1313
.vscode
14-
bower.json
1514
*.log
1615
*.swp
1716
*.stackdump

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ script:
1313
- gulp test --coverage
1414
- gulp docs
1515
- gulp package
16-
- gulp bower
1716
- cat ./coverage/lcov.info | ./node_modules/.bin/coveralls || true
1817

1918
sudo: required

MAINTAINING.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ creation fails and the release process is aborted.
1616
Merging into the `release` branch kicks off the automated release process:
1717

1818
* build of the `dist/*.js` files
19-
* `bower.json` is generated from `package.json`
20-
* `dist/*.js` and `bower.json` are added to a detached branch
19+
* `dist/*.js` is added to a detached branch
2120
* a tag is created from the `package.json` version
2221
* tag (with dist files) is pushed to GitHub
2322

@@ -32,5 +31,5 @@ Finally, [cdnjs](https://cdnjs.com/libraries/Chart.js) is automatically updated
3231
### Further Reading
3332

3433
* [Travis GitHub releases](https://github.com/chartjs/Chart.js/pull/2555)
35-
* [Bower support and dist/* files](https://github.com/chartjs/Chart.js/issues/3033)
34+
* [dist/* files](https://github.com/chartjs/Chart.js/issues/3033)
3635
* [cdnjs npm auto update](https://github.com/cdnjs/cdnjs/pull/8401)

gulpfile.js

-28
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* eslint-disable import/no-nodejs-modules, import/no-commonjs, no-use-before-define */
22
const gulp = require('gulp');
33
const eslint = require('gulp-eslint');
4-
const file = require('gulp-file');
54
const replace = require('gulp-replace');
65
const size = require('gulp-size');
76
const streamify = require('gulp-streamify');
@@ -26,7 +25,6 @@ const argv = yargs
2625
const srcDir = './src/';
2726
const outDir = './dist/';
2827

29-
gulp.task('bower', bowerTask);
3028
gulp.task('build', buildTask);
3129
gulp.task('package', packageTask);
3230
gulp.task('lint-html', lintHtmlTask);
@@ -60,32 +58,6 @@ function run(bin, args) {
6058
});
6159
}
6260

63-
/**
64-
* Generates the bower.json manifest file which will be pushed along release tags.
65-
* Specs: https://github.com/bower/spec/blob/master/json.md
66-
*/
67-
function bowerTask() {
68-
const json = JSON.stringify({
69-
name: pkg.name,
70-
description: pkg.description,
71-
homepage: pkg.homepage,
72-
license: pkg.license,
73-
version: pkg.version,
74-
main: outDir + 'Chart.js',
75-
ignore: [
76-
'.github',
77-
'.codeclimate.yml',
78-
'.gitignore',
79-
'.npmignore',
80-
'.travis.yml',
81-
'scripts'
82-
]
83-
}, null, 2);
84-
85-
return file('bower.json', json, {src: true})
86-
.pipe(gulp.dest('./'));
87-
}
88-
8961
function buildTask() {
9062
return run('rollup/dist/bin/rollup', ['-c', argv.watch ? '--watch' : '']);
9163
}

package-lock.json

-61
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"url": "https://github.com/chartjs/Chart.js/issues"
2525
},
2626
"files": [
27-
"bower.json",
2827
"composer.json",
2928
"dist/*.css",
3029
"dist/*.js"
@@ -48,7 +47,6 @@
4847
"gitbook-cli": "^2.3.2",
4948
"gulp": "^4.0.2",
5049
"gulp-eslint": "^6.0.0",
51-
"gulp-file": "^0.4.0",
5250
"gulp-htmllint": "^0.0.16",
5351
"gulp-replace": "^1.0.0",
5452
"gulp-size": "^3.0.0",

scripts/release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ git remote add auth-origin https://[email protected]/$TRAVIS_REPO_SL
2121
git config --global user.email "$GITHUB_AUTH_EMAIL"
2222
git config --global user.name "Chart.js"
2323
git checkout --detach --quiet
24-
git add -f dist/*.js bower.json
24+
git add -f dist/*.js
2525
git commit -m "Release $VERSION"
2626
git tag -a "v$VERSION" -m "Version $VERSION"
2727
git push -q auth-origin refs/tags/v$VERSION 2>/dev/null

0 commit comments

Comments
 (0)