From c3fe53cd42d8055b596f287e37497bc65d52eecf Mon Sep 17 00:00:00 2001 From: Johann-S Date: Thu, 31 Aug 2017 19:00:51 +0200 Subject: [PATCH] Use rollup to add our copyright instead of a custom script --- build/rollup.config.js | 10 +++++++++- build/stamp.js | 19 ------------------- package.json | 1 - 3 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 build/stamp.js diff --git a/build/rollup.config.js b/build/rollup.config.js index 7cec6ef1cc..d6eb0cf5dd 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -1,7 +1,9 @@ const path = require('path') const babel = require('rollup-plugin-babel') const resolve = require('rollup-plugin-node-resolve') +const pkg = require(path.resolve(__dirname, '../package.json')) const BUNDLE = process.env.BUNDLE === 'true' +const year = new Date().getFullYear() var fileDest = 'bootstrap.js' var external = ['jquery', 'popper.js'] @@ -39,5 +41,11 @@ module.exports = { name: 'bootstrap', external: external, globals: globals, - plugins: plugins + plugins: plugins, + banner: `/*! + * Bootstrap v${pkg.version} (${pkg.homepage}) + * Copyright 2011-${year} ${pkg.author} + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + ` } diff --git a/build/stamp.js b/build/stamp.js deleted file mode 100644 index 2135c60a3b..0000000000 --- a/build/stamp.js +++ /dev/null @@ -1,19 +0,0 @@ -const fs = require('fs') -const path = require('path') -const pkg = require(path.resolve(__dirname, '../package.json')) -const year = new Date().getFullYear() - -const pathBoostrap = path.resolve(__dirname, '../dist/js/bootstrap.js') -const pathBootstrapBundle = path.resolve(__dirname, '../dist/js/bootstrap.bundle.js') -const contentFile = fs.readFileSync(pathBoostrap, { encoding: 'UTF8' }) -const contentBundleFile = fs.readFileSync(pathBootstrapBundle, { encoding: 'UTF8' }) - -const stamp = -`/*! - * Bootstrap v${pkg.version} (${pkg.homepage}) - * Copyright 2011-${year} ${pkg.author} - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ -` -fs.writeFileSync(pathBoostrap, `${stamp}${contentFile}`, { encoding: 'UTF8' }) -fs.writeFileSync(pathBootstrapBundle, `${stamp}${contentBundleFile}`, { encoding: 'UTF8' }) diff --git a/package.json b/package.json index 6ae3476d15..73ddb69066 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "js-compile-standalone": "rollup --environment BUNDLE:false --config build/rollup.config.js", "js-compile-bundle": "rollup --environment BUNDLE:true --config build/rollup.config.js", "js-compile-plugins": "babel --no-babelrc js/src/ --out-dir js/dist/ --source-maps --presets=es2015 --plugins=transform-es2015-modules-strip", - "postjs-compile": "node build/stamp.js", "js-minify": "npm-run-all --parallel js-minify-*", "js-minify-standalone": "uglifyjs --config-file build/uglifyjs.config.json --output dist/js/bootstrap.min.js dist/js/bootstrap.js", "js-minify-bundle": "uglifyjs --config-file build/uglifyjs.config.json --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js",