Skip to content

Commit

Permalink
Consolidate some dev dependencies and use more maintained versions
Browse files Browse the repository at this point in the history
  • Loading branch information
wood authored and Gregg Van Hove committed Mar 27, 2019
1 parent 8ca4463 commit 873a237
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 22 deletions.
6 changes: 3 additions & 3 deletions Gruntfile.js
Expand Up @@ -8,14 +8,14 @@ module.exports = function(grunt) {
concat: require('./grunt/config/concat.js'),
sass: require('./grunt/config/sass.js'),
compress: require('./grunt/config/compress.js'),
imageEmbed: require('./grunt/config/imageEmbed.js')
cssUrlEmbed: require('./grunt/config/cssUrlEmbed.js')
});

require('load-grunt-tasks')(grunt);

grunt.loadTasks('grunt/tasks');

grunt.registerTask('default', ['jshint:all', 'sass:dist', "imageEmbed:dist"]);
grunt.registerTask('default', ['jshint:all', 'sass:dist', "cssUrlEmbed"]);

var version = require('./grunt/tasks/version.js');

Expand All @@ -27,7 +27,7 @@ module.exports = function(grunt) {
'Builds and lints jasmine.js, jasmine-html.js, jasmine.css',
[
'sass:dist',
"imageEmbed:dist",
"cssUrlEmbed",
'jshint:beforeConcat',
'concat',
'jshint:afterConcat'
Expand Down
7 changes: 7 additions & 0 deletions grunt/config/cssUrlEmbed.js
@@ -0,0 +1,7 @@
module.exports = {
encodeWithBaseDir: {
files: {
"lib/jasmine-core/jasmine.css": ["lib/jasmine-core/jasmine.css"]
}
}
};
7 changes: 0 additions & 7 deletions grunt/config/imageEmbed.js

This file was deleted.

2 changes: 1 addition & 1 deletion lib/jasmine-core/jasmine.css

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions package.json
Expand Up @@ -22,13 +22,12 @@
"ejs": "^2.5.5",
"express": "^4.16.4",
"fast-glob": "^2.2.6",
"glob": "^7.1.3",
"grunt": "^1.0.4",
"grunt-cli": "^1.3.2",
"grunt-contrib-compress": "^1.3.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-jshint": "^2.0.0",
"grunt-image-embed": "^0.3.3",
"grunt-css-url-embed": "^1.11.1",
"grunt-sass": "^3.0.2",
"jasmine": "^3.3.1",
"jsdom": "^13.1.0",
Expand Down
16 changes: 7 additions & 9 deletions spec/helpers/nodeDefineJasmineUnderTest.js
@@ -1,8 +1,6 @@
(function() {
var path = require("path"),
fs = require("fs");

var glob = require("glob");
fg = require("fast-glob");

var jasmineUnderTestRequire = require(path.join(__dirname, "../../src/core/requireCore.js"));

Expand All @@ -16,12 +14,12 @@
}

function getSourceFiles() {
var src_files = ['core/**/*.js', 'version.js'];
src_files.forEach(function(file) {
var filePath = path.join(__dirname, "../../", 'src/', file);
glob.sync(filePath).forEach(function(resolvedFile) {
require(resolvedFile);
});
var src_files = ['core/**/*.js', 'version.js'].map(function(file) {
return path.join(__dirname, "../../", 'src/', file);
});

fg.sync(src_files).forEach(function(resolvedFile) {
require(resolvedFile);
});
}

Expand Down

0 comments on commit 873a237

Please sign in to comment.