craftingguide/website
1
0
Fork 0
Code Pull Requests Actions Activity

Fix problems with Gruntfile and local dependencies

Browse Source
This commit is contained in:
Andrew Miner
2015-03-27 12:50:21 -07:00
parent 2bc809fde1
commit 409fbe3cf0
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.coffee
+3 -4
View File
@@ -43,7 +43,6 @@ module.exports = (grunt)->
clean: clean:
dist: ['./dist'] dist: ['./dist']
deps: ['./node_modules/crafting-guide-common']
copy: copy:
jquery_ui_images: jquery_ui_images:
@@ -159,13 +158,13 @@ module.exports = (grunt)->
grunt.registerTask 'build', [ 'rsync:non_html', 'copy', 'sass:build', 'jade', 'browserify', 'exorcise' ] grunt.registerTask 'build', [ 'rsync:non_html', 'copy', 'sass:build', 'jade', 'browserify', 'exorcise' ]
grunt.registerTask 'dist', ['test', 'clean:dist', 'build', 'rsync:static', 'sass:dist', 'uglify'] grunt.registerTask 'dist', ['test', 'clean', 'build', 'rsync:static', 'sass:dist', 'uglify']
grunt.registerTask 'clean-watch', ['clean:dist', 'build', 'watch'] grunt.registerTask 'clean-watch', ['clean', 'build', 'watch']
grunt.registerTask 'use-local-deps', -> grunt.registerTask 'use-local-deps', ->
grunt.file.mkdir './node_modules' grunt.file.mkdir './node_modules'
grunt.file.delete './node_modules/crafting-guide-common' grunt.file.delete './node_modules/crafting-guide-common', force:true
fs.symlinkSync '../../crafting-guide-common/', './node_modules/crafting-guide-common' fs.symlinkSync '../../crafting-guide-common/', './node_modules/crafting-guide-common'
grunt.registerTask 'test', ['mochaTest'] grunt.registerTask 'test', ['mochaTest']
scripts/deploy
+1 -1
View File
@@ -23,7 +23,7 @@ if [[ "$TARGET" == "new" ]]; then
if grunt dist; then if grunt dist; then
echo "Preparing to upload to S3..." echo "Preparing to upload to S3..."
s3cmd sync -r --delete-removed --add-header="cache-control:max-age=1800" "$ROOT/" "s3://new.$SITE/" s3cmd sync -r --delete-removed --add-header="cache-control:max-age=1800" "$ROOT/" "s3://new.$SITE/"
grunt clean build grunt clean:dist build
else else
echo "Aborting deployment" echo "Aborting deployment"
fi fi