Consolidate some dev dependencies and use more maintained versions

This commit is contained in:
wood
2019-03-25 22:47:33 -07:00
committed by Gregg Van Hove
parent 8ca4463e01
commit 873a237e3d
6 changed files with 19 additions and 22 deletions

View File

@@ -8,14 +8,14 @@ module.exports = function(grunt) {
concat: require('./grunt/config/concat.js'), concat: require('./grunt/config/concat.js'),
sass: require('./grunt/config/sass.js'), sass: require('./grunt/config/sass.js'),
compress: require('./grunt/config/compress.js'), compress: require('./grunt/config/compress.js'),
imageEmbed: require('./grunt/config/imageEmbed.js') cssUrlEmbed: require('./grunt/config/cssUrlEmbed.js')
}); });
require('load-grunt-tasks')(grunt); require('load-grunt-tasks')(grunt);
grunt.loadTasks('grunt/tasks'); 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'); var version = require('./grunt/tasks/version.js');
@@ -27,7 +27,7 @@ module.exports = function(grunt) {
'Builds and lints jasmine.js, jasmine-html.js, jasmine.css', 'Builds and lints jasmine.js, jasmine-html.js, jasmine.css',
[ [
'sass:dist', 'sass:dist',
"imageEmbed:dist", "cssUrlEmbed",
'jshint:beforeConcat', 'jshint:beforeConcat',
'concat', 'concat',
'jshint:afterConcat' 'jshint:afterConcat'

View File

@@ -0,0 +1,7 @@
module.exports = {
encodeWithBaseDir: {
files: {
"lib/jasmine-core/jasmine.css": ["lib/jasmine-core/jasmine.css"]
}
}
};

View File

@@ -1,7 +0,0 @@
module.exports = {
dist: {
src: [ "lib/jasmine-core/jasmine.css" ],
dest: "lib/jasmine-core/jasmine.css",
baseDir: "images"
}
};

File diff suppressed because one or more lines are too long

View File

@@ -22,13 +22,12 @@
"ejs": "^2.5.5", "ejs": "^2.5.5",
"express": "^4.16.4", "express": "^4.16.4",
"fast-glob": "^2.2.6", "fast-glob": "^2.2.6",
"glob": "^7.1.3",
"grunt": "^1.0.4", "grunt": "^1.0.4",
"grunt-cli": "^1.3.2", "grunt-cli": "^1.3.2",
"grunt-contrib-compress": "^1.3.0", "grunt-contrib-compress": "^1.3.0",
"grunt-contrib-concat": "^1.0.1", "grunt-contrib-concat": "^1.0.1",
"grunt-contrib-jshint": "^2.0.0", "grunt-contrib-jshint": "^2.0.0",
"grunt-image-embed": "^0.3.3", "grunt-css-url-embed": "^1.11.1",
"grunt-sass": "^3.0.2", "grunt-sass": "^3.0.2",
"jasmine": "^3.3.1", "jasmine": "^3.3.1",
"jsdom": "^13.1.0", "jsdom": "^13.1.0",

View File

@@ -1,8 +1,6 @@
(function() { (function() {
var path = require("path"), var path = require("path"),
fs = require("fs"); fg = require("fast-glob");
var glob = require("glob");
var jasmineUnderTestRequire = require(path.join(__dirname, "../../src/core/requireCore.js")); var jasmineUnderTestRequire = require(path.join(__dirname, "../../src/core/requireCore.js"));
@@ -16,12 +14,12 @@
} }
function getSourceFiles() { function getSourceFiles() {
var src_files = ['core/**/*.js', 'version.js']; var src_files = ['core/**/*.js', 'version.js'].map(function(file) {
src_files.forEach(function(file) { return path.join(__dirname, "../../", 'src/', file);
var filePath = path.join(__dirname, "../../", 'src/', file); });
glob.sync(filePath).forEach(function(resolvedFile) {
require(resolvedFile); fg.sync(src_files).forEach(function(resolvedFile) {
}); require(resolvedFile);
}); });
} }