Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Update to working phantomjs dependency #3363

Merged
merged 5 commits into from

2 participants

@jasonsanjose
Owner

Pegs dev dependencies for all grunt task related deps. Explicitly pull in phantomjs and grunt-lib-phantomjs as dependencies to avoid tilde version ranges in grunt-contrib-jasmine.

Confirmed phantomjs works again on mac 10.7 with node 0.8.22 and win 7 with node 0.10.1.

@gruehle gruehle was assigned
@jasonsanjose

Assigning to @gruehle.

@gruehle
Owner

Works great on OSX 10.8, Win 7 and Win 8.

Should we do similar version pinning in brackets-shell?

@gruehle gruehle merged commit 2e34974 into from
@gruehle gruehle deleted the branch
@jasonsanjose

Good idea. Submitted adobe/brackets-shell#233.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 36 additions and 18 deletions.
  1. +18 −4 Gruntfile.js
  2. +9 −7 package.json
  3. +9 −7 src/config.json
View
22 Gruntfile.js
@@ -64,9 +64,21 @@ module.exports = function (grunt) {
]
},
watch: {
+ all : {
+ files: ['**/*', '!**/node_modules/**'],
+ tasks: ['jshint']
+ },
+ grunt : {
+ files: ['<%= meta.grunt %>', 'tasks/**/*'],
+ tasks: ['jshint:grunt']
+ },
+ src : {
+ files: ['<%= meta.src %>', 'src/**/*'],
+ tasks: ['jshint:src']
+ },
test : {
- files: ['Gruntfile.js', '<%= meta.src %>', '<%= meta.test %>'],
- tasks: 'test'
+ files: ['<%= meta.test %>', 'test/**/*'],
+ tasks: ['jshint:test']
}
},
/* FIXME (jasonsanjose): how to handle extension tests */
@@ -110,11 +122,13 @@ module.exports = function (grunt) {
},
jshint: {
all: [
- 'Gruntfile.js',
+ '<%= meta.grunt %>',
'<%= meta.src %>',
'<%= meta.test %>'
],
- grunt: "<%= meta.grunt %>",
+ grunt: '<%= meta.grunt %>',
+ src: '<%= meta.src %>',
+ test: '<%= meta.test %>',
/* use strict options to mimic JSLINT until we migrate to JSHINT in Brackets */
options: {
jshintrc: '.jshintrc'
View
16 package.json
@@ -13,13 +13,15 @@
"SHA": ""
},
"devDependencies": {
- "grunt": "~0.4.0",
- "grunt-cli": "~0.1.0",
- "grunt-contrib-jshint": "~0.2.0",
- "grunt-contrib-watch": "~0.2.0",
- "grunt-contrib-jasmine": "~0.4.0",
- "grunt-template-jasmine-requirejs": "~0.1.0",
- "q": "~0.9.0"
+ "grunt": "0.4.1",
+ "grunt-cli": "0.1.6",
+ "phantomjs": "1.9.0-1",
+ "grunt-lib-phantomjs": "0.3.0",
+ "grunt-contrib-jshint": "0.2.0",
+ "grunt-contrib-watch": "0.3.1",
+ "grunt-contrib-jasmine": "0.4.2",
+ "grunt-template-jasmine-requirejs": "0.1.0",
+ "q": "0.9.2"
},
"scripts": {
"postinstall": "grunt install",
View
16 src/config.json
@@ -27,13 +27,15 @@
"SHA": ""
},
"devDependencies": {
- "grunt": "~0.4.0",
- "grunt-cli": "~0.1.0",
- "grunt-contrib-jshint": "~0.2.0",
- "grunt-contrib-watch": "~0.2.0",
- "grunt-contrib-jasmine": "~0.4.0",
- "grunt-template-jasmine-requirejs": "~0.1.0",
- "q": "~0.9.0"
+ "grunt": "0.4.1",
+ "grunt-cli": "0.1.6",
+ "phantomjs": "1.9.0-1",
+ "grunt-lib-phantomjs": "0.3.0",
+ "grunt-contrib-jshint": "0.2.0",
+ "grunt-contrib-watch": "0.3.1",
+ "grunt-contrib-jasmine": "0.4.2",
+ "grunt-template-jasmine-requirejs": "0.1.0",
+ "q": "0.9.2"
},
"scripts": {
"postinstall": "grunt install",
Something went wrong with that request. Please try again.