Skip to content

Commit 4bd46fc

Browse files
authored
Merge pull request #8239 from NuGet/dev
[ReleasePrep][2020.10.05]RI of dev into master
2 parents 8d57188 + 82b1d22 commit 4bd46fc

91 files changed

Lines changed: 799 additions & 12195 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Don't run ESLint on external script files. We depend on Component Governance to scan and detect unacceptable or
2+
# vulnerable script versions.
3+
#
4+
# Prepend each file with a globbing '**/' because our official builds run in a complex way that makes it hard to depend
5+
# on specific relative paths.
6+
**/src/NuGetGallery/Scripts/gallery/jquery-3.4.1.js
7+
**/src/NuGetGallery/Scripts/gallery/knockout-3.5.1.js
8+
**/src/NuGetGallery/Scripts/gallery/moment-2.18.1.js

src/Bootstrap/Gruntfile.js

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ module.exports = function (grunt) {
1717

1818
var fs = require('fs');
1919
var path = require('path');
20-
var generateGlyphiconsData = require('./grunt/bs-glyphicons-data-generator.js');
21-
var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js');
22-
var getLessVarsData = function () {
23-
var filePath = path.join(__dirname, 'less/variables.less');
24-
var fileContent = fs.readFileSync(filePath, { encoding: 'utf8' });
25-
var parser = new BsLessdocParser(fileContent);
26-
return { sections: parser.parseFile() };
27-
};
28-
var generateRawFiles = require('./grunt/bs-raw-files-generator.js');
29-
var generateCommonJSModule = require('./grunt/bs-commonjs-generator.js');
3020
var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' });
3121

3222
Object.keys(configBridge.paths).forEach(function (key) {
@@ -198,7 +188,7 @@ module.exports = function (grunt) {
198188
require('time-grunt')(grunt);
199189

200190
// JS distribution task.
201-
grunt.registerTask('dist-js', ['concat', 'uglify:core', 'commonjs']);
191+
grunt.registerTask('dist-js', ['concat', 'uglify:core']);
202192

203193
// CSS distribution task.
204194
grunt.registerTask('dist-css', ['less:core', 'less:theme', 'postcss:core', 'postcss:theme', 'cssmin:core', 'cssmin:theme']);
@@ -209,23 +199,5 @@ module.exports = function (grunt) {
209199
// Default task.
210200
grunt.registerTask('default', ['clean:dist', 'copy:fonts', 'dist-css', 'dist-js', 'copy:gallerycss', 'copy:galleryjs']);
211201

212-
grunt.registerTask('build-glyphicons-data', function () {
213-
generateGlyphiconsData.call(this, grunt);
214-
});
215-
216-
// task for building customizer
217-
grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']);
218-
grunt.registerTask('build-customizer-html');
219-
grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () {
220-
var banner = grunt.template.process('<%= banner %>');
221-
generateRawFiles(grunt, banner);
222-
});
223-
224-
grunt.registerTask('commonjs', 'Generate CommonJS entrypoint module in dist dir.', function () {
225-
var srcFiles = grunt.config.get('concat.core.src');
226-
var destFilepath = 'dist/js/npm.js';
227-
generateCommonJSModule(grunt, srcFiles, destFilepath);
228-
});
229-
230202
grunt.registerTask('prep-release', ['dist']);
231203
};

src/Bootstrap/dist/css/bootstrap.css

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Bootstrap/dist/js/npm.js

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

src/Bootstrap/grunt/bs-commonjs-generator.js

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

src/Bootstrap/grunt/bs-glyphicons-data-generator.js

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

0 commit comments

Comments
 (0)