From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 28 Apr 2020 21:34:49 +0000 (-0700) Subject: Finish removing bower (#7294) X-Git-Tag: v3.0.0-beta.2~163 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29f6c67fb3625692d7de384b7eb34f860bba1fde;p=thirdparty%2FChart.js.git Finish removing bower (#7294) --- diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db07f6e71..ff59d1d3b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,7 +51,6 @@ jobs: run: | gulp docs gulp package - gulp bower - name: Publish Test Results run: cat ./coverage/lcov.info | ./node_modules/.bin/coveralls shell: bash diff --git a/.gitignore b/.gitignore index 6a066b92f..013f78a47 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ .project .settings .vscode -bower.json *.log *.swp *.stackdump diff --git a/.travis.yml b/.travis.yml index b8f3de00a..2d7e64be5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ script: - gulp test --coverage - gulp docs - gulp package - - gulp bower - cat ./coverage/lcov.info | ./node_modules/.bin/coveralls || true sudo: required diff --git a/MAINTAINING.md b/MAINTAINING.md index 288b03945..894d912b7 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -16,8 +16,7 @@ creation fails and the release process is aborted. Merging into the `release` branch kicks off the automated release process: * build of the `dist/*.js` files -* `bower.json` is generated from `package.json` -* `dist/*.js` and `bower.json` are added to a detached branch +* `dist/*.js` is added to a detached branch * a tag is created from the `package.json` version * tag (with dist files) is pushed to GitHub @@ -32,5 +31,5 @@ Finally, [cdnjs](https://cdnjs.com/libraries/Chart.js) is automatically updated ### Further Reading * [Travis GitHub releases](https://github.com/chartjs/Chart.js/pull/2555) -* [Bower support and dist/* files](https://github.com/chartjs/Chart.js/issues/3033) +* [dist/* files](https://github.com/chartjs/Chart.js/issues/3033) * [cdnjs npm auto update](https://github.com/cdnjs/cdnjs/pull/8401) diff --git a/gulpfile.js b/gulpfile.js index f66404292..336f680fa 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,7 +1,6 @@ /* eslint-disable import/no-nodejs-modules, import/no-commonjs, no-use-before-define */ const gulp = require('gulp'); const eslint = require('gulp-eslint'); -const file = require('gulp-file'); const replace = require('gulp-replace'); const size = require('gulp-size'); const streamify = require('gulp-streamify'); @@ -26,7 +25,6 @@ const argv = yargs const srcDir = './src/'; const outDir = './dist/'; -gulp.task('bower', bowerTask); gulp.task('build', buildTask); gulp.task('package', packageTask); gulp.task('lint-html', lintHtmlTask); @@ -60,32 +58,6 @@ function run(bin, args) { }); } -/** - * Generates the bower.json manifest file which will be pushed along release tags. - * Specs: https://github.com/bower/spec/blob/master/json.md - */ -function bowerTask() { - const json = JSON.stringify({ - name: pkg.name, - description: pkg.description, - homepage: pkg.homepage, - license: pkg.license, - version: pkg.version, - main: outDir + 'Chart.js', - ignore: [ - '.github', - '.codeclimate.yml', - '.gitignore', - '.npmignore', - '.travis.yml', - 'scripts' - ] - }, null, 2); - - return file('bower.json', json, {src: true}) - .pipe(gulp.dest('./')); -} - function buildTask() { return run('rollup/dist/bin/rollup', ['-c', argv.watch ? '--watch' : '']); } diff --git a/package-lock.json b/package-lock.json index 6dca081a6..a000b16fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7031,67 +7031,6 @@ "plugin-error": "^1.0.1" } }, - "gulp-file": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/gulp-file/-/gulp-file-0.4.0.tgz", - "integrity": "sha1-RRNWoqxQicbbkaBEQlKgVDZXAGs=", - "dev": true, - "requires": { - "through2": "^0.4.1", - "vinyl": "^2.1.0" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "object-keys": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", - "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=", - "dev": true - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "through2": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", - "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=", - "dev": true, - "requires": { - "readable-stream": "~1.0.17", - "xtend": "~2.1.1" - } - }, - "xtend": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", - "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", - "dev": true, - "requires": { - "object-keys": "~0.4.0" - } - } - } - }, "gulp-htmllint": { "version": "0.0.16", "resolved": "https://registry.npmjs.org/gulp-htmllint/-/gulp-htmllint-0.0.16.tgz", diff --git a/package.json b/package.json index 2a1ecb6ff..9a611f99e 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "url": "https://github.com/chartjs/Chart.js/issues" }, "files": [ - "bower.json", "composer.json", "dist/*.css", "dist/*.js" @@ -48,7 +47,6 @@ "gitbook-cli": "^2.3.2", "gulp": "^4.0.2", "gulp-eslint": "^6.0.0", - "gulp-file": "^0.4.0", "gulp-htmllint": "^0.0.16", "gulp-replace": "^1.0.0", "gulp-size": "^3.0.0", diff --git a/scripts/release.sh b/scripts/release.sh index 4dcc2c6b5..53afebc85 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -21,7 +21,7 @@ git remote add auth-origin https://$GITHUB_AUTH_TOKEN@github.com/$TRAVIS_REPO_SL git config --global user.email "$GITHUB_AUTH_EMAIL" git config --global user.name "Chart.js" git checkout --detach --quiet -git add -f dist/*.js bower.json +git add -f dist/*.js git commit -m "Release $VERSION" git tag -a "v$VERSION" -m "Version $VERSION" git push -q auth-origin refs/tags/v$VERSION 2>/dev/null