diff --git a/.gitignore b/.gitignore index 3dd7dbed..59ec0cb3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ -build/ +/build/ +/node_modules/ +/npm-debug.log +/release/npm/README.md csslint.pnproj -node_modules/ -npm-debug.log -release/npm/README.md # Diff files *.orig diff --git a/Gruntfile.js b/Gruntfile.js index d7058ec5..63ed5d3e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -137,12 +137,16 @@ module.exports = function(grunt) { } }, copy: { - release: { - files: { - "<%= build_dir %>": "release", - "release/npm/README.md": "README.md", - "release/npm/package.json": "package.json" - } + build: { + expand: true, + cwd: "<%= build_dir %>/", + src: "**/*", + dest: "release/" + }, + npm: { + expand: true, + src: ["README.md", "package.json"], + dest: "release/npm/" } }, includereplace: { @@ -155,10 +159,12 @@ module.exports = function(grunt) { prefix: "@", suffix: "@" }, - // Files to perform replacements and includes with - src: "<%= build_dir %>/**/*.*", - // Destinaion directory to copy files to - dest: "release/" + files: [{ + expand: true, + cwd: "<%= build_dir %>/", + src: "**/*", + dest: "release/" + }] } }, jshint: { @@ -166,16 +172,16 @@ module.exports = function(grunt) { jshintrc: ".jshintrc" }, gruntfile: { - src: ["Gruntfile.js","tasks/*.js"] + src: ["Gruntfile.js", "tasks/*.js"] }, demo: { src: "demos/*.js" }, all: { - src: ["src/**/*.js"] + src: "src/**/*.js" }, tests: { - src: ["tests/**/*.js"] + src: "tests/**/*.js" } }, watch: { @@ -223,12 +229,12 @@ module.exports = function(grunt) { // Default task. grunt.registerTask("default", ["test"]); - //Alias for + // Alias for grunt.registerTask("lint", ["jshint"]); - //Testing + // Testing grunt.registerTask("test", ["clean:build", "jshint", "concat", "yuitest"]); grunt.registerTask("rhino", ["clean:build", "jshint", "concat", "test_rhino"]); - grunt.registerTask("release", ["test", "clean:release", "copy:release", "includereplace:release", "changelog"]); + grunt.registerTask("release", ["test", "clean:release", "copy", "includereplace:release", "changelog"]); }; diff --git a/package.json b/package.json index eee7f7c6..92375710 100644 --- a/package.json +++ b/package.json @@ -26,17 +26,17 @@ "test": "grunt test" }, "dependencies": { - "clone": "~0.1.11", - "parserlib": "~0.2.4" + "clone": "~1.0.0", + "parserlib": "~0.2.5" }, "devDependencies": { - "grunt": "~0.4.4", - "grunt-contrib-clean": "~0.5.0", - "grunt-contrib-concat": "~0.4.0", - "grunt-contrib-copy": "~0.5.0", - "grunt-contrib-jshint": "~0.10.0", + "grunt": "~0.4.5", + "grunt-contrib-clean": "~0.6.0", + "grunt-contrib-concat": "~0.5.1", + "grunt-contrib-copy": "~0.8.0", + "grunt-contrib-jshint": "~0.11.0", "grunt-contrib-watch": "~0.6.1", - "grunt-include-replace": "~1.2.0", + "grunt-include-replace": "~3.0.0", "yuitest": "~0.7.9" }, "engines": {