From 0cb7a1687c6589f65c6da9d63d8140508a8b05c2 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 8 Aug 2017 19:37:50 +0300 Subject: Fix sourcemaps for node-sass too. Specify `--source-map-contents true` for node-sass and `source-map-inline-sources` for clean-css. Without this, the sourcemaps weren't found. --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 72a6e2110..390979ad6 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,12 @@ "css-docs": "npm-run-all css-lint-docs css-compile-docs css-prefix-docs css-minify-docs", "css-lint": "bundle exec scss-lint --config .scss-lint.yml scss/*.scss", "css-lint-docs": "bundle exec scss-lint --config .scss-lint.yml --exclude assets/scss/docs.scss assets/scss/*.scss", - "css-compile": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css", - "css-compile-docs": "node-sass --output-style expanded --source-map true --precision 6 assets/scss/docs.scss assets/css/docs.min.css", + "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css", + "css-compile-docs": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 assets/scss/docs.scss assets/css/docs.min.css", "css-prefix": "postcss --config build/ --replace dist/css/*.css", "css-prefix-docs": "postcss --config build/ --no-map --replace assets/css/docs.min.css", - "css-minify": "cleancss --level 1 --source-map --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css", - "css-minify-docs": "cleancss --level 1 --source-map --output assets/css/docs.min.css assets/css/docs.min.css", + "css-minify": "cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css", + "css-minify-docs": "cleancss --level 1 --source-map --source-map-inline-sources --output assets/css/docs.min.css assets/css/docs.min.css", "js": "npm-run-all js-lint js-compile js-minify", "js-docs": "npm-run-all js-lint-docs js-minify-docs", "js-lint": "eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/ Gruntfile.js", -- cgit v1.2.3 From b21fc944b41c4d492b1c28cc89e51fcbcf4cf4b1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Aug 2017 21:37:01 -0700 Subject: Move from dependencies to peerDependencies --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 390979ad6..6af7162b1 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,8 @@ }, "license": "MIT", "dependencies": { + }, + "peerDependencies": { "jquery": ">=1.9.1", "popper.js": "^1.11.0" }, -- cgit v1.2.3 From f2304e74bd7fabb80881d9d50b220056a3ddc758 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 10 Aug 2017 05:41:05 +0300 Subject: Update devDependencies. (#23264) --- package.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 6af7162b1..975cd6df0 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,8 @@ "css-lint-docs": "bundle exec scss-lint --config .scss-lint.yml --exclude assets/scss/docs.scss assets/scss/*.scss", "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css", "css-compile-docs": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 assets/scss/docs.scss assets/css/docs.min.css", - "css-prefix": "postcss --config build/ --replace dist/css/*.css", - "css-prefix-docs": "postcss --config build/ --no-map --replace assets/css/docs.min.css", + "css-prefix": "postcss --config build/postcss.config.js --replace dist/css/*.css", + "css-prefix-docs": "postcss --config build/postcss.config.js --no-map --replace assets/css/docs.min.css", "css-minify": "cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css", "css-minify-docs": "cleancss --level 1 --source-map --source-map-inline-sources --output assets/css/docs.min.css assets/css/docs.min.css", "js": "npm-run-all js-lint js-compile js-minify", @@ -65,8 +65,7 @@ "url": "https://github.com/twbs/bootstrap/issues" }, "license": "MIT", - "dependencies": { - }, + "dependencies": {}, "peerDependencies": { "jquery": ">=1.9.1", "popper.js": "^1.11.0" -- cgit v1.2.3 From 35f80bb12e4e71fd777ee60ffa43711d8f84b1a6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 10 Aug 2017 20:56:35 -0700 Subject: bump to beta --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 975cd6df0..dc9949b29 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "version": "4.0.0-alpha.6", + "version": "4.0.0-beta", "keywords": [ "css", "sass", -- cgit v1.2.3 From 7b0a0b246c039dd8f702e5bff0d674786919ce0a Mon Sep 17 00:00:00 2001 From: Johann-S Date: Fri, 11 Aug 2017 07:57:05 +0200 Subject: Add a README.md badge to track our dependencies and require jQuery >=3.0.0. (#23125) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index dc9949b29..2112d7e7a 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "license": "MIT", "dependencies": {}, "peerDependencies": { - "jquery": ">=1.9.1", + "jquery": ">=3.0.0", "popper.js": "^1.11.0" }, "devDependencies": { -- cgit v1.2.3 From 012224386cab458c47782a13a03df1726258492f Mon Sep 17 00:00:00 2001 From: Tom Scholz Date: Sun, 13 Aug 2017 23:59:44 +0200 Subject: Moved watch task up to match the rest of the package.json (#22756) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 2112d7e7a..196657782 100644 --- a/package.json +++ b/package.json @@ -50,9 +50,9 @@ "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", "test": "npm-run-all dist js-test docs", + "watch": "npm-run-all --parallel watch-css watch-js", "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css && npm run css-docs\"", - "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile-plugins\"", - "watch": "npm-run-all --parallel watch-css watch-js" + "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile-plugins\"" }, "style": "dist/css/bootstrap.css", "sass": "scss/bootstrap.scss", -- cgit v1.2.3 From 6d6d42b56ac804fe25eac07e540992227095aad8 Mon Sep 17 00:00:00 2001 From: Arthur Franco Date: Mon, 14 Aug 2017 13:09:38 -0300 Subject: Adding Gemfile to package.json Gemfile was missing. Couldn't compile documentation when using npm. --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 196657782..0f0618284 100644 --- a/package.json +++ b/package.json @@ -100,6 +100,7 @@ ".babelrc", ".eslintignore", "Gruntfile.js", + "Gemfile", "dist", "build", "js/.eslintrc.json", -- cgit v1.2.3 From 20abbc3c16d39ad92fbf0b497a3690967764a1fd Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 16 Jul 2017 16:54:09 +0300 Subject: Register a service worker. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 0f0618284..a88d0498b 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "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-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", + "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", "docs": "npm-run-all docs-compile docs-lint", -- cgit v1.2.3 From f82230769489896e167a09d4491369dce7de77af Mon Sep 17 00:00:00 2001 From: Albert Willemsen Date: Tue, 15 Aug 2017 13:48:38 +0200 Subject: fixed package.json jspm section. --- package.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index a88d0498b..b703c6af2 100644 --- a/package.json +++ b/package.json @@ -117,13 +117,16 @@ "shim": { "js/bootstrap": { "deps": [ - "jquery" + "jquery", + "popper.js" ], "exports": "$" } }, - "dependencies": { - "jquery": "3" + "dependencies": {}, + "peerDependencies": { + "jquery": "3", + "popper.js": "npm:popper.js@^1.11.1" } } } -- cgit v1.2.3 From b72489a8515a90f3e45baf3d0bf19df9ccafff93 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Tue, 22 Aug 2017 20:28:04 +0200 Subject: Update which required jQuery release folks should use --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index b703c6af2..700990153 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "license": "MIT", "dependencies": {}, "peerDependencies": { - "jquery": ">=3.0.0", + "jquery": "3.0.0 - 4.0.0", "popper.js": "^1.11.0" }, "devDependencies": { -- cgit v1.2.3 From a416d325217db079345d99e7fc71cece8a17e608 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Tue, 22 Aug 2017 21:28:36 +0200 Subject: Update Popper.js to 1.12.3 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 700990153..92ec1b3aa 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "dependencies": {}, "peerDependencies": { "jquery": "3.0.0 - 4.0.0", - "popper.js": "^1.11.0" + "popper.js": "^1.12.3" }, "devDependencies": { "autoprefixer": "^7.1.2", @@ -126,7 +126,7 @@ "dependencies": {}, "peerDependencies": { "jquery": "3", - "popper.js": "npm:popper.js@^1.11.1" + "popper.js": "npm:popper.js@^1.12.3" } } } -- cgit v1.2.3 From 8876334b7fa8d3a042b927553c68754e4bcdd48c Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 26 Aug 2017 12:59:04 +0300 Subject: Fix `npm run docs-github` script. (#23688) `$npm_config_tmp` is a non-existent variable. Also, use double quotes since single ones don't work. Finally, git ignore the temp file. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 92ec1b3aa..e0885bd3d 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "docs-lint": "htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html", "docs-compile": "bundle exec jekyll build", "docs-serve": "bundle exec jekyll serve", - "docs-github": "shx echo 'github: true' > $npm_config_tmp/twbsconfig.yml && npm run docs-compile -- --config _config.yml,$npm_config_tmp/twbsconfig.yml && shx rm $npm_config_tmp/twbsconfig.yml", + "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'", "release-version": "node build/change-version.js", -- cgit v1.2.3 From e60c451e8bcac14a753457ddc020d6a4e05e5463 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 26 Aug 2017 14:57:50 +0300 Subject: Run all lint targets in `test` script. (#23685) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index e0885bd3d..640099946 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,10 @@ "css-prefix-docs": "postcss --config build/postcss.config.js --no-map --replace assets/css/docs.min.css", "css-minify": "cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css", "css-minify-docs": "cleancss --level 1 --source-map --source-map-inline-sources --output assets/css/docs.min.css assets/css/docs.min.css", - "js": "npm-run-all js-lint js-compile js-minify", + "js": "npm-run-all js-lint* js-compile js-minify", "js-docs": "npm-run-all js-lint-docs js-minify-docs", "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/", + "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", -- cgit v1.2.3 From 9936bf59444c402b653f28449529eab83794e911 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Tue, 29 Aug 2017 21:16:00 +0200 Subject: Create a bundled release of Bootstrap with Popper.js inside --- package.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 640099946..6ae3476d1 100644 --- a/package.json +++ b/package.json @@ -33,9 +33,13 @@ "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", + "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", "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 +78,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 +91,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" -- cgit v1.2.3 From c3fe53cd42d8055b596f287e37497bc65d52eecf Mon Sep 17 00:00:00 2001 From: Johann-S Date: Thu, 31 Aug 2017 19:00:51 +0200 Subject: Use rollup to add our copyright instead of a custom script --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 6ae3476d1..73ddb6906 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", -- cgit v1.2.3 From a20f614fe4687033c173de0602d625b5aa6dc34f Mon Sep 17 00:00:00 2001 From: Johann-S Date: Mon, 4 Sep 2017 15:57:07 +0200 Subject: js-minify task should just minify our dist files not our docs.min.js --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 73ddb6906..3c2476227 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "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": "npm-run-all --parallel js-minify-standalone js-minify-bundle", "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", -- cgit v1.2.3 From c770e6883695e8b5d92a1107d3a49b1cb63655b6 Mon Sep 17 00:00:00 2001 From: Tanguy Krotoff Date: Tue, 5 Sep 2017 00:29:05 +0200 Subject: Drop Bower support (#23568) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 3c2476227..564217375 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", -- cgit v1.2.3 From c82110d0218e10fde0762cfdfb318648387909b8 Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Tue, 5 Sep 2017 21:49:29 +0300 Subject: Fix jquery version --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 564217375..0abe31545 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "license": "MIT", "dependencies": {}, "peerDependencies": { - "jquery": "3.0.0 - 4.0.0", + "jquery": "^3.0.0", "popper.js": "^1.12.3" }, "devDependencies": { @@ -118,6 +118,7 @@ "LICENSE" ], "jspm": { + "registry": "npm", "main": "js/bootstrap", "directories": { "lib": "dist" @@ -133,8 +134,8 @@ }, "dependencies": {}, "peerDependencies": { - "jquery": "3", - "popper.js": "npm:popper.js@^1.12.3" + "jquery": "^3.0.0", + "popper.js": "^1.12.3" } } } -- cgit v1.2.3 From 5951508898b1f92d04026c0038dfc3ba95fa0fdf Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 15 Sep 2017 11:37:34 +0100 Subject: Pre-cache key assets with Workboxjs. (#23533) --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 0abe31545..8ad281469 100644 --- a/package.json +++ b/package.json @@ -44,10 +44,11 @@ "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", "docs": "npm-run-all docs-compile docs-lint", "docs-lint": "htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html", - "docs-compile": "bundle exec jekyll build", + "docs-compile": "bundle exec jekyll build && npm run docs-workbox-precache", "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", + "docs-workbox-precache": "node build/workbox.js", "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 ..", @@ -99,7 +100,8 @@ "rollup-plugin-node-resolve": "^3.0.0", "shelljs": "^0.7.8", "shx": "^0.2.2", - "uglify-js": "^3.0.24" + "uglify-js": "^3.0.24", + "workbox-build": "^2.0.1" }, "engines": { "node": ">=4" -- cgit v1.2.3 From 0705ee807018848661f4724d9607ae6f1d9031d6 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 15 Sep 2017 13:49:51 +0300 Subject: Update babel-eslint to v8.0.0 and all devDependencies and gems. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 8ad281469..c01e87b4d 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "devDependencies": { "autoprefixer": "^7.1.2", "babel-cli": "^6.24.1", - "babel-eslint": "^7.2.3", + "babel-eslint": "^8.0.0", "babel-plugin-external-helpers": "^6.22.0", "babel-plugin-transform-es2015-modules-strip": "^0.1.1", "babel-preset-es2015": "^6.24.1", -- cgit v1.2.3 From f17b165f0fa2ff7b9537cfc368796aa92ae91139 Mon Sep 17 00:00:00 2001 From: Henry Zhu Date: Sun, 17 Sep 2017 02:40:48 -0400 Subject: Babel 7 (#23966) * use .babelrc.js, compile bundled/non-bundled with loose mode * add back helper, exclude typeof transform --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index c01e87b4d..e8990e958 100644 --- a/package.json +++ b/package.json @@ -33,9 +33,9 @@ "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-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-compile-standalone": "ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js", + "js-compile-bundle": "ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js", + "js-compile-plugins": "PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps", "js-minify": "npm-run-all --parallel js-minify-standalone js-minify-bundle", "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", @@ -76,11 +76,11 @@ }, "devDependencies": { "autoprefixer": "^7.1.2", - "babel-cli": "^6.24.1", + "babel-cli": "7.0.0-beta.0", "babel-eslint": "^8.0.0", - "babel-plugin-external-helpers": "^6.22.0", + "babel-plugin-external-helpers": "7.0.0-beta.0", "babel-plugin-transform-es2015-modules-strip": "^0.1.1", - "babel-preset-es2015": "^6.24.1", + "babel-preset-env": "2.0.0-beta.0", "clean-css-cli": "^4.1.6", "eslint": "^4.2.0", "grunt": "^1.0.1", @@ -95,7 +95,7 @@ "postcss-cli": "^4.1.0", "qunit-phantomjs-runner": "^2.3.0", "qunitjs": "^2.4.0", - "rollup": "^0.49.2", + "rollup": "^0.50.0", "rollup-plugin-babel": "^3.0.2", "rollup-plugin-node-resolve": "^3.0.0", "shelljs": "^0.7.8", -- cgit v1.2.3 From 2dcce4ec30c1bdd981ec210553fa496716cff604 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Sun, 17 Sep 2017 08:59:08 +0200 Subject: Use cross-env to allow folks to build our js on their OS --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index e8990e958..a22761353 100644 --- a/package.json +++ b/package.json @@ -33,9 +33,9 @@ "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-standalone": "ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js", - "js-compile-bundle": "ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js", - "js-compile-plugins": "PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps", + "js-compile-standalone": "cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js", + "js-compile-bundle": "cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js", + "js-compile-plugins": "cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps", "js-minify": "npm-run-all --parallel js-minify-standalone js-minify-bundle", "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", @@ -82,6 +82,7 @@ "babel-plugin-transform-es2015-modules-strip": "^0.1.1", "babel-preset-env": "2.0.0-beta.0", "clean-css-cli": "^4.1.6", + "cross-env": "^5.0.5", "eslint": "^4.2.0", "grunt": "^1.0.1", "grunt-cli": "^1.2.0", -- cgit v1.2.3 From eb2a6f2efdbc25aa06b98ead9c6254a9eb3df319 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 17 Sep 2017 20:27:30 +0300 Subject: Update package-lock.json. (#23975) --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index a22761353..df0894d6e 100644 --- a/package.json +++ b/package.json @@ -76,11 +76,11 @@ }, "devDependencies": { "autoprefixer": "^7.1.2", - "babel-cli": "7.0.0-beta.0", + "babel-cli": "^7.0.0-beta.0", "babel-eslint": "^8.0.0", - "babel-plugin-external-helpers": "7.0.0-beta.0", + "babel-plugin-external-helpers": "^7.0.0-beta.0", "babel-plugin-transform-es2015-modules-strip": "^0.1.1", - "babel-preset-env": "2.0.0-beta.0", + "babel-preset-env": "^2.0.0-beta.0", "clean-css-cli": "^4.1.6", "cross-env": "^5.0.5", "eslint": "^4.2.0", -- cgit v1.2.3 From 2e2ea74254ff640927af1f5427d2449cfac847b6 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 26 Sep 2017 13:08:02 +0300 Subject: Move the workbox build to a `postdocs-compile` script. (#24106) This way, it's run for us automatically after `docs-compile`. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index df0894d6e..6cced3006 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,8 @@ "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", "docs": "npm-run-all docs-compile docs-lint", "docs-lint": "htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html", - "docs-compile": "bundle exec jekyll build && npm run docs-workbox-precache", + "docs-compile": "bundle exec jekyll build", + "postdocs-compile": "npm run docs-workbox-precache", "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", -- cgit v1.2.3 From f17443748dd266c0dc766e5252d7e4bcf9d04086 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 17 Sep 2017 08:39:45 +0300 Subject: Move Autoprefixer's config in package.json. This is so other plugins can use it too. --- package.json | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 6cced3006..28ec33b5d 100644 --- a/package.json +++ b/package.json @@ -121,6 +121,16 @@ "scss/**/*.scss", "LICENSE" ], + "browserslist": [ + "Chrome >= 45", + "Firefox ESR", + "Edge >= 12", + "Explorer >= 10", + "iOS >= 9", + "Safari >= 9", + "Android >= 4.4", + "Opera >= 30" + ], "jspm": { "registry": "npm", "main": "js/bootstrap", -- cgit v1.2.3 From e8d9a034d075f79bd8e1613d480bd37b24598a27 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 17 Sep 2017 08:42:53 +0300 Subject: Add eslint-plugin-compat. We can check for browser compatibility on lint time now. --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 28ec33b5d..9bd1c6f39 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "clean-css-cli": "^4.1.6", "cross-env": "^5.0.5", "eslint": "^4.2.0", + "eslint-plugin-compat": "^1.0.4", "grunt": "^1.0.1", "grunt-cli": "^1.2.0", "grunt-saucelabs": "^9.0.0", -- cgit v1.2.3 From fe06814f3e3c72f36bb2ab96df206cc564fb74b0 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 28 Sep 2017 15:35:23 +0300 Subject: Move uglify-js's config back to CLI. (#24147) We need to pass different options and this seems cleaner at this point. In order for docs.min.js to keeps all comments, we don't pass `compress`. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 9bd1c6f39..601dd09f7 100644 --- a/package.json +++ b/package.json @@ -37,9 +37,9 @@ "js-compile-bundle": "cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js", "js-compile-plugins": "cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps", "js-minify": "npm-run-all --parallel js-minify-standalone js-minify-bundle", - "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-minify-standalone": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --output dist/js/bootstrap.min.js dist/js/bootstrap.js", + "js-minify-bundle": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js", + "js-minify-docs": "uglifyjs --mangle --comments \"/^!/\" --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", "docs": "npm-run-all docs-compile docs-lint", -- cgit v1.2.3 From 502ac7ee4d13669e644b9181f1e014ce0ea1f089 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 28 Sep 2017 17:25:28 +0300 Subject: Lint docs js too and use `strict consistently. (#24160) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 601dd09f7..85a641b34 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "js": "npm-run-all js-lint* js-compile js-minify", "js-docs": "npm-run-all js-lint-docs js-minify-docs", "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-lint-docs": "eslint --config js/tests/.eslintrc.json assets/js/ docs/ sw.js", "js-compile": "npm-run-all --parallel js-compile-*", "js-compile-standalone": "cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js", "js-compile-bundle": "cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js", -- cgit v1.2.3 From 210bb221a8905e0482f939a7e03256de701a60c7 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Thu, 28 Sep 2017 14:55:15 +0200 Subject: Use jsunitsaucelabs to run our unit tests on Saucelabs --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 85a641b34..9ab637cb0 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "js-minify-bundle": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js", "js-minify-docs": "uglifyjs --mangle --comments \"/^!/\" --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", + "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\" & node build/saucelabs-unit-test.js", "docs": "npm-run-all docs-compile docs-lint", "docs-lint": "htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html", "docs-compile": "bundle exec jekyll build", @@ -90,6 +90,7 @@ "grunt-cli": "^1.2.0", "grunt-saucelabs": "^9.0.0", "htmllint-cli": "^0.0.6", + "jsunitsaucelabs": "^1.0.0", "node-sass": "^4.5.3", "nodemon": "^1.11.0", "npm-run-all": "^4.0.2", -- cgit v1.2.3 From b23ff97a8586fe0be4006be3710507d45470654d Mon Sep 17 00:00:00 2001 From: Johann-S Date: Thu, 28 Sep 2017 17:01:06 +0300 Subject: Specify Travis job ID. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 9ab637cb0..3e5736f18 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "grunt-cli": "^1.2.0", "grunt-saucelabs": "^9.0.0", "htmllint-cli": "^0.0.6", - "jsunitsaucelabs": "^1.0.0", + "jsunitsaucelabs": "^1.1.0", "node-sass": "^4.5.3", "nodemon": "^1.11.0", "npm-run-all": "^4.0.2", -- cgit v1.2.3 From 2244d03b3471bbd13c93b718a6a9271d8733f5a9 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 28 Sep 2017 17:54:01 +0300 Subject: Remove grunt-saucelabs and Grunt. --- package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 3e5736f18..067646c36 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "css-minify-docs": "cleancss --level 1 --source-map --source-map-inline-sources --output assets/css/docs.min.css assets/css/docs.min.css", "js": "npm-run-all js-lint* js-compile js-minify", "js-docs": "npm-run-all js-lint-docs js-minify-docs", - "js-lint": "eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/ Gruntfile.js", + "js-lint": "eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/", "js-lint-docs": "eslint --config js/tests/.eslintrc.json assets/js/ docs/ sw.js", "js-compile": "npm-run-all --parallel js-compile-*", "js-compile-standalone": "cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js", @@ -86,9 +86,6 @@ "cross-env": "^5.0.5", "eslint": "^4.2.0", "eslint-plugin-compat": "^1.0.4", - "grunt": "^1.0.1", - "grunt-cli": "^1.2.0", - "grunt-saucelabs": "^9.0.0", "htmllint-cli": "^0.0.6", "jsunitsaucelabs": "^1.1.0", "node-sass": "^4.5.3", @@ -113,7 +110,6 @@ "files": [ ".babelrc", ".eslintignore", - "Gruntfile.js", "Gemfile", "dist", "build", -- cgit v1.2.3 From 54d45072810f5cda4f3c75eba6d9acd70274a963 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Thu, 28 Sep 2017 18:18:20 +0300 Subject: Use sauce_browsers.json. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 067646c36..1d5d1d982 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "eslint": "^4.2.0", "eslint-plugin-compat": "^1.0.4", "htmllint-cli": "^0.0.6", - "jsunitsaucelabs": "^1.1.0", + "jsunitsaucelabs": "^1.2.0", "node-sass": "^4.5.3", "nodemon": "^1.11.0", "npm-run-all": "^4.0.2", -- cgit v1.2.3 From 202cd09407b8845fd54789997701419124946dde Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 1 Oct 2017 11:09:45 +0300 Subject: Tweak npm scripts. (#24146) * make `css` and `js` "super" scripts which will run both main and docs scripts * make `js-minify` run all js minify tasks * use parallel in more places --- package.json | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 1d5d1d982..d0dfbe9d8 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,9 @@ ], "scripts": { "bash": "bash", - "css": "npm-run-all css-lint css-compile css-prefix css-minify", - "css-docs": "npm-run-all css-lint-docs css-compile-docs css-prefix-docs css-minify-docs", + "css": "npm-run-all --parallel css-lint* css-compile* --sequential css-prefix* css-minify*", + "css-main": "npm-run-all --parallel css-lint css-compile --sequential css-prefix css-minify", + "css-docs": "npm-run-all --parallel css-lint-docs css-compile-docs --sequential css-prefix-docs css-minify-docs", "css-lint": "bundle exec scss-lint --config .scss-lint.yml scss/*.scss", "css-lint-docs": "bundle exec scss-lint --config .scss-lint.yml --exclude assets/scss/docs.scss assets/scss/*.scss", "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css", @@ -28,7 +29,8 @@ "css-prefix-docs": "postcss --config build/postcss.config.js --no-map --replace assets/css/docs.min.css", "css-minify": "cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css", "css-minify-docs": "cleancss --level 1 --source-map --source-map-inline-sources --output assets/css/docs.min.css assets/css/docs.min.css", - "js": "npm-run-all js-lint* js-compile js-minify", + "js": "npm-run-all js-lint* js-compile* js-minify*", + "js-main": "npm-run-all js-lint js-compile js-minify", "js-docs": "npm-run-all js-lint-docs js-minify-docs", "js-lint": "eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/", "js-lint-docs": "eslint --config js/tests/.eslintrc.json assets/js/ docs/ sw.js", @@ -36,28 +38,28 @@ "js-compile-standalone": "cross-env ROLLUP=true rollup --environment BUNDLE:false --config build/rollup.config.js", "js-compile-bundle": "cross-env ROLLUP=true rollup --environment BUNDLE:true --config build/rollup.config.js", "js-compile-plugins": "cross-env PLUGINS=true babel js/src/ --out-dir js/dist/ --source-maps", - "js-minify": "npm-run-all --parallel js-minify-standalone js-minify-bundle", + "js-minify": "npm-run-all --parallel js-minify-*", "js-minify-standalone": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --output dist/js/bootstrap.min.js dist/js/bootstrap.js", "js-minify-bundle": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --output dist/js/bootstrap.bundle.min.js dist/js/bootstrap.bundle.js", "js-minify-docs": "uglifyjs --mangle --comments \"/^!/\" --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\" & node build/saucelabs-unit-test.js", - "docs": "npm-run-all docs-compile docs-lint", - "docs-lint": "htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html", + "docs": "npm-run-all --parallel css-docs js-docs --sequential docs-compile docs-lint", "docs-compile": "bundle exec jekyll build", "postdocs-compile": "npm run docs-workbox-precache", - "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-lint": "htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html", + "docs-serve": "bundle exec jekyll serve", "docs-upload-preview": "build/upload-preview.sh", "docs-workbox-precache": "node build/workbox.js", "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", - "test": "npm-run-all dist js-test docs", + "dist": "npm-run-all --parallel css js", + "test": "npm-run-all dist --parallel js-test --sequential docs-compile docs-lint", "watch": "npm-run-all --parallel watch-css watch-js", - "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css && npm run css-docs\"", - "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile-plugins\"" + "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css\"", + "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm-run-all --parallel js-compile-*\"" }, "style": "dist/css/bootstrap.css", "sass": "scss/bootstrap.scss", -- cgit v1.2.3 From a143f82ccd1113540f98bb43af4be25abbd4c91c Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 27 Sep 2017 16:20:46 +0300 Subject: Add bundlesize. --- package.json | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index d0dfbe9d8..8f7196851 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ ], "scripts": { "bash": "bash", + "bundlesize": "bundlesize", "css": "npm-run-all --parallel css-lint* css-compile* --sequential css-prefix* css-minify*", "css-main": "npm-run-all --parallel css-lint css-compile --sequential css-prefix css-minify", "css-docs": "npm-run-all --parallel css-lint-docs css-compile-docs --sequential css-prefix-docs css-minify-docs", @@ -56,7 +57,7 @@ "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", - "test": "npm-run-all dist --parallel js-test --sequential docs-compile docs-lint", + "test": "npm-run-all dist --parallel js-test --sequential docs-compile docs-lint bundlesize", "watch": "npm-run-all --parallel watch-css watch-js", "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css\"", "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm-run-all --parallel js-compile-*\"" @@ -84,6 +85,7 @@ "babel-plugin-external-helpers": "^7.0.0-beta.0", "babel-plugin-transform-es2015-modules-strip": "^0.1.1", "babel-preset-env": "^2.0.0-beta.0", + "bundlesize": "^0.14.4", "clean-css-cli": "^4.1.6", "cross-env": "^5.0.5", "eslint": "^4.2.0", @@ -131,6 +133,28 @@ "Android >= 4.4", "Opera >= 30" ], + "bundlesize": [ + { + "path": "./dist/css/bootstrap*.css", + "maxSize": "25 kB" + }, + { + "path": "./dist/js/bootstrap.bundle.js", + "maxSize": "50 kB" + }, + { + "path": "./dist/js/bootstrap.bundle.min.js", + "maxSize": "25 kB" + }, + { + "path": "./dist/js/bootstrap.js", + "maxSize": "20 kB" + }, + { + "path": "./dist/js/bootstrap.min.js", + "maxSize": "15 kB" + } + ], "jspm": { "registry": "npm", "main": "js/bootstrap", -- cgit v1.2.3 From 44dcc8d719a9f3a45915db1f6136457682d7c628 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 27 Sep 2017 16:47:38 +0300 Subject: Make Node.js 6 the minimum version. Also, be consistent with Node.js' name. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 8f7196851..de3c35934 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "workbox-build": "^2.0.1" }, "engines": { - "node": ">=4" + "node": ">=6" }, "files": [ ".babelrc", -- cgit v1.2.3 From 49ce5f3a645402c18d75d7d3e4769cde3a9deb7b Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 2 Oct 2017 22:03:12 +0300 Subject: Tweak bundlesize's targets. (#24203) Separate CSS targets and tighten a couple others targets. --- package.json | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index de3c35934..48bbb7668 100644 --- a/package.json +++ b/package.json @@ -135,12 +135,32 @@ ], "bundlesize": [ { - "path": "./dist/css/bootstrap*.css", + "path": "./dist/css/bootstrap-grid.css", + "maxSize": "5 kB" + }, + { + "path": "./dist/css/bootstrap-grid.min.css", + "maxSize": "5 kB" + }, + { + "path": "./dist/css/bootstrap-reboot.css", + "maxSize": "5 kB" + }, + { + "path": "./dist/css/bootstrap-reboot.min.css", + "maxSize": "5 kB" + }, + { + "path": "./dist/css/bootstrap.css", "maxSize": "25 kB" }, + { + "path": "./dist/css/bootstrap.min.css", + "maxSize": "20 kB" + }, { "path": "./dist/js/bootstrap.bundle.js", - "maxSize": "50 kB" + "maxSize": "45 kB" }, { "path": "./dist/js/bootstrap.bundle.min.js", -- cgit v1.2.3 From 7b766e1ad53b0c22de42dac04d2472f287334e2a Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 3 Oct 2017 06:34:56 +0300 Subject: Switch to stylelint. (#23572) --- package.json | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 48bbb7668..3a123a78e 100644 --- a/package.json +++ b/package.json @@ -22,10 +22,10 @@ "css": "npm-run-all --parallel css-lint* css-compile* --sequential css-prefix* css-minify*", "css-main": "npm-run-all --parallel css-lint css-compile --sequential css-prefix css-minify", "css-docs": "npm-run-all --parallel css-lint-docs css-compile-docs --sequential css-prefix-docs css-minify-docs", - "css-lint": "bundle exec scss-lint --config .scss-lint.yml scss/*.scss", - "css-lint-docs": "bundle exec scss-lint --config .scss-lint.yml --exclude assets/scss/docs.scss assets/scss/*.scss", "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css", "css-compile-docs": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 assets/scss/docs.scss assets/css/docs.min.css", + "css-lint": "stylelint --config build/.stylelintrc --syntax scss scss/**/*.scss", + "css-lint-docs": "stylelint --config build/.stylelintrc --syntax scss assets/scss/*.scss", "css-prefix": "postcss --config build/postcss.config.js --replace dist/css/*.css", "css-prefix-docs": "postcss --config build/postcss.config.js --no-map --replace assets/css/docs.min.css", "css-minify": "cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css", @@ -105,6 +105,11 @@ "rollup-plugin-node-resolve": "^3.0.0", "shelljs": "^0.7.8", "shx": "^0.2.2", + "stylelint": "^8.1.1", + "stylelint-config-recommended-scss": "^2.0.0", + "stylelint-config-standard": "^17.0.0", + "stylelint-order": "^0.7.0", + "stylelint-scss": "^2.1.0", "uglify-js": "^3.0.24", "workbox-build": "^2.0.1" }, @@ -119,9 +124,7 @@ "build", "js/.eslintrc.json", "js/**/*.js", - ".scss-lint.yml", - "scss/**/*.scss", - "LICENSE" + "scss/**/*.scss" ], "browserslist": [ "Chrome >= 45", -- cgit v1.2.3