diff options
| author | Johann-S <[email protected]> | 2017-09-02 19:31:12 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-02 19:31:12 +0200 |
| commit | bfa4df21f31e9b6007fadeaf6b90c22e888c7849 (patch) | |
| tree | 0e9d33ba69840c7bcdb8eb83f1381e3310252a4c /package.json | |
| parent | 0b06ad69d2c3428b052ca228c0b12b45ab36ec55 (diff) | |
| parent | 8f7a8cf5a7e5993221a39c3fa83d6dbfb50dd29e (diff) | |
| download | bootstrap-bfa4df21f31e9b6007fadeaf6b90c22e888c7849.tar.xz bootstrap-bfa4df21f31e9b6007fadeaf6b90c22e888c7849.zip | |
Merge branch 'v4-dev' into patch-5
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/package.json b/package.json index 640099946..73ddb6906 100644 --- a/package.json +++ b/package.json @@ -33,9 +33,12 @@ "js-lint": "eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/ Gruntfile.js", "js-lint-docs": "eslint --config js/tests/.eslintrc.json assets/js/ sw.js", "js-compile": "npm-run-all --parallel js-compile-*", - "js-compile-bundle": "shx cat js/src/util.js js/src/alert.js js/src/button.js js/src/carousel.js js/src/collapse.js js/src/dropdown.js js/src/modal.js js/src/scrollspy.js js/src/tab.js js/src/tooltip.js js/src/popover.js | shx sed \"s/^(import|export).*//\" | babel --filename js/src/bootstrap.js | node build/stamp.js > dist/js/bootstrap.js", - "js-compile-plugins": "babel js/src/ --out-dir js/dist/ --source-maps", - "js-minify": "uglifyjs --config-file build/uglifyjs.config.json --output dist/js/bootstrap.min.js dist/js/bootstrap.js", + "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", + "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", "js-minify-docs": "uglifyjs --config-file build/uglifyjs.config.json --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js", "js-test": "phantomjs ./node_modules/qunit-phantomjs-runner/runner.js js/tests/index.html 60", "js-test-cloud": "ruby -r webrick -e \"s = WEBrick::HTTPServer.new(:Port => 3000, :DocumentRoot => Dir.pwd, :Logger => WEBrick::Log.new('/dev/null'), :AccessLog => []); trap('INT') { s.shutdown }; s.start\" & grunt saucelabs-qunit", @@ -74,6 +77,7 @@ "autoprefixer": "^7.1.2", "babel-cli": "^6.24.1", "babel-eslint": "^7.2.3", + "babel-plugin-external-helpers": "^6.22.0", "babel-plugin-transform-es2015-modules-strip": "^0.1.1", "babel-preset-es2015": "^6.24.1", "clean-css-cli": "^4.1.6", @@ -86,9 +90,13 @@ "nodemon": "^1.11.0", "npm-run-all": "^4.0.2", "phantomjs-prebuilt": "^2.1.14", + "popper.js": "^1.12.5", "postcss-cli": "^4.1.0", "qunit-phantomjs-runner": "^2.3.0", "qunitjs": "^2.4.0", + "rollup": "^0.49.2", + "rollup-plugin-babel": "^3.0.2", + "rollup-plugin-node-resolve": "^3.0.0", "shelljs": "^0.7.8", "shx": "^0.2.2", "uglify-js": "^3.0.24" |