Skip to content

Commit f69cf12

Browse files
committed
Merge pull request #512 from XhmikosR/deps
Update dependencies.
2 parents 5c473a6 + dbe5273 commit f69cf12

File tree

3 files changed

+34
-28
lines changed

3 files changed

+34
-28
lines changed

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
build/
1+
/build/
2+
/node_modules/
3+
/npm-debug.log
4+
/release/npm/README.md
25
csslint.pnproj
3-
node_modules/
4-
npm-debug.log
5-
release/npm/README.md
66

77
# Diff files
88
*.orig

Gruntfile.js

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,16 @@ module.exports = function(grunt) {
137137
}
138138
},
139139
copy: {
140-
release: {
141-
files: {
142-
"<%= build_dir %>": "release",
143-
"release/npm/README.md": "README.md",
144-
"release/npm/package.json": "package.json"
145-
}
140+
build: {
141+
expand: true,
142+
cwd: "<%= build_dir %>/",
143+
src: "**/*",
144+
dest: "release/"
145+
},
146+
npm: {
147+
expand: true,
148+
src: ["README.md", "package.json"],
149+
dest: "release/npm/"
146150
}
147151
},
148152
includereplace: {
@@ -155,27 +159,29 @@ module.exports = function(grunt) {
155159
prefix: "@",
156160
suffix: "@"
157161
},
158-
// Files to perform replacements and includes with
159-
src: "<%= build_dir %>/**/*.*",
160-
// Destinaion directory to copy files to
161-
dest: "release/"
162+
files: [{
163+
expand: true,
164+
cwd: "<%= build_dir %>/",
165+
src: "**/*",
166+
dest: "release/"
167+
}]
162168
}
163169
},
164170
jshint: {
165171
options: {
166172
jshintrc: ".jshintrc"
167173
},
168174
gruntfile: {
169-
src: ["Gruntfile.js","tasks/*.js"]
175+
src: ["Gruntfile.js", "tasks/*.js"]
170176
},
171177
demo: {
172178
src: "demos/*.js"
173179
},
174180
all: {
175-
src: ["src/**/*.js"]
181+
src: "src/**/*.js"
176182
},
177183
tests: {
178-
src: ["tests/**/*.js"]
184+
src: "tests/**/*.js"
179185
}
180186
},
181187
watch: {
@@ -223,12 +229,12 @@ module.exports = function(grunt) {
223229
// Default task.
224230
grunt.registerTask("default", ["test"]);
225231

226-
//Alias for
232+
// Alias for
227233
grunt.registerTask("lint", ["jshint"]);
228234

229-
//Testing
235+
// Testing
230236
grunt.registerTask("test", ["clean:build", "jshint", "concat", "yuitest"]);
231237
grunt.registerTask("rhino", ["clean:build", "jshint", "concat", "test_rhino"]);
232238

233-
grunt.registerTask("release", ["test", "clean:release", "copy:release", "includereplace:release", "changelog"]);
239+
grunt.registerTask("release", ["test", "clean:release", "copy", "includereplace:release", "changelog"]);
234240
};

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
"test": "grunt test"
2727
},
2828
"dependencies": {
29-
"clone": "~0.1.11",
30-
"parserlib": "~0.2.4"
29+
"clone": "~1.0.0",
30+
"parserlib": "~0.2.5"
3131
},
3232
"devDependencies": {
33-
"grunt": "~0.4.4",
34-
"grunt-contrib-clean": "~0.5.0",
35-
"grunt-contrib-concat": "~0.4.0",
36-
"grunt-contrib-copy": "~0.5.0",
37-
"grunt-contrib-jshint": "~0.10.0",
33+
"grunt": "~0.4.5",
34+
"grunt-contrib-clean": "~0.6.0",
35+
"grunt-contrib-concat": "~0.5.1",
36+
"grunt-contrib-copy": "~0.8.0",
37+
"grunt-contrib-jshint": "~0.11.0",
3838
"grunt-contrib-watch": "~0.6.1",
39-
"grunt-include-replace": "~1.2.0",
39+
"grunt-include-replace": "~3.0.0",
4040
"yuitest": "~0.7.9"
4141
},
4242
"engines": {

0 commit comments

Comments
 (0)