Skip to content

Commit

Permalink
Merge pull request #147 from paulcpederson/master
Browse files Browse the repository at this point in the history
move to http-server
  • Loading branch information
nikolaswise committed Apr 16, 2015
2 parents d03658c + 7d9e6f8 commit 88f91d5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
21 changes: 11 additions & 10 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ module.exports = function(grunt) {
pkg: grunt.file.readJSON('package.json'),

// Running a development server
'connect': {
server: {
options: {
port: 8888,
hostname: 'local.arcgis.com',
base: 'docs/build'
}
'http-server': {
'dev': {
root: 'docs/build',
port: 8888,
host: 'local.arcgis.com',
cache: 0,
showDir : true,
autoIndex: true,
ext: 'html',
runInBackground: true
}
},

Expand Down Expand Up @@ -68,7 +71,6 @@ module.exports = function(grunt) {
}
},


// Check Javascript for errors
'jshint': {
all: ['lib/js/calcite-web.js']
Expand Down Expand Up @@ -101,7 +103,6 @@ module.exports = function(grunt) {
}
},


// Create minified version of build css
'cssmin': {
target: {
Expand Down Expand Up @@ -287,7 +288,7 @@ module.exports = function(grunt) {
'concat:doc',
'sass:doc',
'copy:doc',
'connect',
'http-server',
'watch'
]);

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"grunt-concurrent": "^0.5.0",
"grunt-contrib-compress": "^0.11.0",
"grunt-contrib-concat": "^0.5.0",
"grunt-contrib-connect": "^0.8.0",
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-cssmin": "^0.11.0",
"grunt-contrib-imagemin": "^0.8.1",
Expand All @@ -54,15 +53,16 @@
"grunt-contrib-watch": "^0.6.1",
"grunt-gh-pages": "^0.9.1",
"grunt-github-releaser": "^0.1.17",
"grunt-http-server": "^1.2.0",
"grunt-newer": "^0.7.0",
"grunt-prompt": "^1.2.1",
"grunt-sass": "^0.18.0",
"grunt-shell": "~1.1.2",
"js-yaml": "^3.2.3",
"jsonfile": "^2.0.0",
"marked": "^0.3.3",
"matchdep": "^0.3.0",
"patterns-color": "git+ssh://[email protected]:Esri/Patterns-Color.git#v0.0.2",
"s3": "^4.3.1",
"grunt-shell": "~1.1.2"
"s3": "^4.3.1"
}
}

0 comments on commit 88f91d5

Please sign in to comment.