Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit 8e4ae79

Browse files
committed
Update dependencies to latest versions
The dependencies and dev dependencies have been updated to the latest versions available as of 2016-05-18. This includes replacing grunt-jasmine-node (no longer maintained) with grunt-jasmine-nodejs. Updates to the test specs and spec runners were necessary to ensure that the specs run properly in the latest version of Jasmine and in the IGB. The previous setup of bundling the test specs was removed to help with spec troubleshooting in the IGB.
1 parent fc719cf commit 8e4ae79

24 files changed

Lines changed: 10853 additions & 8927 deletions

.jshintrc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@
1919
"quotmark": "double",
2020
"undef": true,
2121
"unused": true,
22-
"strict": true,
22+
"globalstrict": true,
2323
// "maxparams": 0,
2424
// "maxdepth": 0,
2525
// "maxstatements": 0,
2626
// "maxcomplexity": 0,
2727
// "maxlen": 0,
2828

2929
/* relaxing */
30+
"strict": false,
3031
"asi": false,
3132
"boss": false,
3233
// "debug": false,
@@ -79,7 +80,7 @@
7980
"describe": false,
8081
"expect": false,
8182
"it": false,
82-
"runs": false,
83-
"waitsFor": false
83+
"fail": false,
84+
"JSON": false
8485
}
8586
}

Gruntfile.js

Lines changed: 24 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,70 @@
1-
"use strict";
2-
31
module.exports = function(grunt) {
42
// configure grunt
53
grunt.initConfig({
64
pkg: grunt.file.readJSON("package.json"),
75
jshint: {
6+
options: {
7+
jshintrc: true
8+
},
89
files: [
910
"**/*.js",
1011
"!node_modules/**/*",
1112
"!libs/**/*",
1213
"!dist/**/*"
13-
],
14-
options: {
15-
jshintrc: ".jshintrc"
16-
}
14+
]
1715
},
18-
jasmine_node: {
19-
specFolders: ["test/spec"]
16+
jasmine_nodejs: {
17+
main: {
18+
specs: ["test/spec/**"]
19+
}
2020
},
2121
browserify: {
2222
main: {
23-
src: ["./src/EVEoj.js"],
24-
dest: "./dist/<%= pkg.name %>.js",
23+
src: ["src/EVEoj.js"],
24+
dest: "dist/<%= pkg.name %>.js",
2525
options: {
26-
bundleOptions: {
26+
browserifyOptions: {
2727
debug: true,
2828
standalone: "<%= pkg.name %>"
2929
}
3030
}
31-
},
32-
test: {
33-
src: ["test/spec/*.spec.js"],
34-
dest: "dist/test_bundle.js",
35-
options: {
36-
bundleOptions: {
37-
debug: true,
38-
external: ["src/**/*.js"]
39-
}
40-
}
4131
}
4232
},
4333
uglify: {
4434
main: {
4535
files: {
46-
"./dist/<%= pkg.name %>.min.js": ["./libs/bluebird-2.2.2-core.js", "./dist/<%= pkg.name %>.js"]
36+
"./dist/<%= pkg.name %>.min.js": ["./libs/bluebird-3.3.5-core.js", "./dist/<%= pkg.name %>.js"]
4737
}
4838
}
4939
},
50-
watchify: {
51-
main: {
52-
options: {
53-
standalone: "<%= pkg.name %>",
54-
debug: true
55-
},
56-
src: "./src/EVEoj.js",
57-
dest: "./dist/<%= pkg.name %>.js"
58-
},
59-
test: {
60-
options: {
61-
external: ["src/**/*.js"],
62-
debug: true
63-
},
64-
src: "test/spec/**/*.js",
65-
dest: "dist/test_bundle.js"
66-
}
67-
},
6840
jasmine: {
6941
src: "dist/EVEoj.js",
7042
options: {
71-
specs: "dist/test_bundle.js",
72-
vendor: ["libs/jquery-1.11.1.js", "libs/bluebird-2.2.2-core.js"]
43+
"--local-to-remote-url-access": true,
44+
specs: ["test/spec/*.js"],
45+
helpers: ["test/testprops.js"],
46+
vendor: ["libs/jquery-1.12.3.js", "libs/bluebird-3.3.5-core.js"]
7347
}
7448
}
7549
});
7650

7751
// Load plug-ins
78-
grunt.loadNpmTasks("grunt-contrib-watch");
7952
grunt.loadNpmTasks("grunt-contrib-jasmine");
8053
grunt.loadNpmTasks("grunt-browserify");
8154
grunt.loadNpmTasks("grunt-contrib-jshint");
82-
grunt.loadNpmTasks("grunt-jasmine-node");
55+
grunt.loadNpmTasks("grunt-jasmine-nodejs");
8356
grunt.loadNpmTasks("grunt-contrib-uglify");
84-
grunt.loadNpmTasks("grunt-watchify");
8557

8658
// define tasks
8759
grunt.registerTask("default", [
8860
"jshint",
89-
"jasmine_node",
61+
"jasmine_nodejs",
62+
"browserify",
63+
"jasmine"
64+
]);
65+
grunt.registerTask("dist", [
66+
"jshint",
9067
"browserify",
91-
"jasmine",
9268
"uglify"
9369
]);
94-
};
70+
};

0 commit comments

Comments
 (0)