Skip to content

Commit ce2e944

Browse files
authored
Strip out UMD & CJS in favor of ES6 modules (#20072)
1 parent 9ddd62d commit ce2e944

26 files changed

+1
-7702
lines changed

Gruntfile.js

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ module.exports = function (grunt) {
2323
var autoprefixerSettings = require('./grunt/autoprefixer-settings.js');
2424
var autoprefixer = require('autoprefixer')(autoprefixerSettings);
2525

26-
var generateCommonJSModule = require('./grunt/bs-commonjs-generator.js');
2726
var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' });
2827

2928
Object.keys(configBridge.paths).forEach(function (key) {
@@ -86,24 +85,6 @@ module.exports = function (grunt) {
8685
files: {
8786
'<%= concat.bootstrap.dest %>' : '<%= concat.bootstrap.dest %>'
8887
}
89-
},
90-
umd: {
91-
options: {
92-
modules: 'umd'
93-
},
94-
files: {
95-
'dist/js/umd/util.js' : 'js/src/util.js',
96-
'dist/js/umd/alert.js' : 'js/src/alert.js',
97-
'dist/js/umd/button.js' : 'js/src/button.js',
98-
'dist/js/umd/carousel.js' : 'js/src/carousel.js',
99-
'dist/js/umd/collapse.js' : 'js/src/collapse.js',
100-
'dist/js/umd/dropdown.js' : 'js/src/dropdown.js',
101-
'dist/js/umd/modal.js' : 'js/src/modal.js',
102-
'dist/js/umd/scrollspy.js' : 'js/src/scrollspy.js',
103-
'dist/js/umd/tab.js' : 'js/src/tab.js',
104-
'dist/js/umd/tooltip.js' : 'js/src/tooltip.js',
105-
'dist/js/umd/popover.js' : 'js/src/popover.js'
106-
}
10788
}
10889
},
10990

@@ -410,7 +391,7 @@ module.exports = function (grunt) {
410391
grunt.registerTask('test', testSubtasks);
411392

412393
// JS distribution task.
413-
grunt.registerTask('dist-js', ['babel:dev', 'concat', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']);
394+
grunt.registerTask('dist-js', ['babel:dev', 'concat', 'babel:dist', 'stamp', 'uglify:core']);
414395

415396
grunt.registerTask('test-scss', ['scsslint:core']);
416397

@@ -430,16 +411,6 @@ module.exports = function (grunt) {
430411
// Default task.
431412
grunt.registerTask('default', ['clean:dist', 'test']);
432413

433-
grunt.registerTask('commonjs', ['babel:umd', 'npm-js']);
434-
435-
grunt.registerTask('npm-js', 'Generate npm-js entrypoint module in dist dir.', function () {
436-
var srcFiles = Object.keys(grunt.config.get('babel.umd.files')).map(function (filename) {
437-
return './' + path.join('umd', path.basename(filename))
438-
})
439-
var destFilepath = 'dist/js/npm.js';
440-
generateCommonJSModule(grunt, srcFiles, destFilepath);
441-
});
442-
443414
// Docs task.
444415
grunt.registerTask('docs-css', ['postcss:docs', 'postcss:examples', 'cssmin:docs']);
445416
grunt.registerTask('lint-docs-css', ['scsslint:docs']);

dist/js/npm.js

Lines changed: 0 additions & 12 deletions
This file was deleted.

dist/js/umd/alert.js

Lines changed: 0 additions & 211 deletions
This file was deleted.

0 commit comments

Comments
 (0)