aboutsummaryrefslogtreecommitdiff
path: root/Gruntfile.js
diff options
context:
space:
mode:
authorPierre Vanduynslager <[email protected]>2017-04-08 18:43:25 -0400
committerGitHub <[email protected]>2017-04-08 18:43:25 -0400
commitfe72daf2b34263d3cfc9bc77e9998cd22adfa34d (patch)
tree15dc9fc6fcb513362ba112d52ab01b568b423709 /Gruntfile.js
parentf5cc59145642d78d7abbdf38fee1905786da5367 (diff)
parentfeb35b94a61c4d6016be8d1773a79a6bbe57d856 (diff)
downloadbootstrap-fe72daf2b34263d3cfc9bc77e9998cd22adfa34d.tar.xz
bootstrap-fe72daf2b34263d3cfc9bc77e9998cd22adfa34d.zip
Merge branch 'v4-dev' into dropdown-keyboard
Diffstat (limited to 'Gruntfile.js')
-rw-r--r--Gruntfile.js11
1 files changed, 1 insertions, 10 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 428ef2d5b..7675e2f17 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -16,17 +16,8 @@ module.exports = function (grunt) {
return string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&')
}
- var path = require('path')
var isTravis = require('is-travis')
- var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' })
-
- Object.keys(configBridge.paths).forEach(function (key) {
- configBridge.paths[key].forEach(function (val, i, arr) {
- arr[i] = path.join('./docs', val)
- })
- })
-
// Project configuration.
grunt.initConfig({
@@ -75,7 +66,7 @@ module.exports = function (grunt) {
},
dist: {
options: {
- extends: '../../js/.babelrc'
+ extends: '../../.babelrc'
},
files: {
'<%= concat.bootstrap.dest %>' : '<%= concat.bootstrap.dest %>'