mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
Updated node and dependencies
This commit is contained in:
parent
280dd1a809
commit
1b99a22c1d
44
Gruntfile.js
44
Gruntfile.js
@ -27,7 +27,7 @@ module.exports = function(grunt) {
|
|||||||
filesSrc : ['test/integration/casperjs/*_test.js'],
|
filesSrc : ['test/integration/casperjs/*_test.js'],
|
||||||
options : {
|
options : {
|
||||||
args : {
|
args : {
|
||||||
baseUrl : 'http://localhost:' + '<%= connect.test.options.port %>/src/',
|
baseUrl : 'http://localhost:' + '<%= express.test.options.port %>/',
|
||||||
mode : '?debug',
|
mode : '?debug',
|
||||||
delay : delay
|
delay : delay
|
||||||
},
|
},
|
||||||
@ -39,6 +39,16 @@ module.exports = function(grunt) {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
var getExpressConfig = function (source, port, host) {
|
||||||
|
return {
|
||||||
|
options: {
|
||||||
|
port: port,
|
||||||
|
hostname : host || 'localhost',
|
||||||
|
bases: [source]
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
grunt.initConfig({
|
grunt.initConfig({
|
||||||
clean: {
|
clean: {
|
||||||
before: ['dest'],
|
before: ['dest'],
|
||||||
@ -62,29 +72,10 @@ module.exports = function(grunt) {
|
|||||||
'!src/js/lib/**/*.js' // Exclude lib folder (note the leading !)
|
'!src/js/lib/**/*.js' // Exclude lib folder (note the leading !)
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
connect : {
|
|
||||||
test : {
|
|
||||||
options : {
|
|
||||||
base : '.',
|
|
||||||
port : 4321
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
express: {
|
express: {
|
||||||
regular: {
|
test: getExpressConfig('src', 9991),
|
||||||
options: {
|
regular: getExpressConfig('dest', 9001),
|
||||||
port: 9001,
|
debug: getExpressConfig('src', 9901)
|
||||||
hostname : 'localhost',
|
|
||||||
bases: ['dest']
|
|
||||||
}
|
|
||||||
},
|
|
||||||
debug: {
|
|
||||||
options: {
|
|
||||||
port: 9901,
|
|
||||||
hostname : 'localhost',
|
|
||||||
bases: ['src']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
open : {
|
open : {
|
||||||
regular : {
|
regular : {
|
||||||
@ -106,7 +97,7 @@ module.exports = function(grunt) {
|
|||||||
},
|
},
|
||||||
ghost : {
|
ghost : {
|
||||||
'default' : getGhostConfig(5000),
|
'default' : getGhostConfig(5000),
|
||||||
local : getGhostConfig(50)
|
'local' : getGhostConfig(50)
|
||||||
},
|
},
|
||||||
concat : {
|
concat : {
|
||||||
js : {
|
js : {
|
||||||
@ -262,7 +253,6 @@ module.exports = function(grunt) {
|
|||||||
grunt.loadNpmTasks('grunt-closure-tools');
|
grunt.loadNpmTasks('grunt-closure-tools');
|
||||||
grunt.loadNpmTasks('grunt-contrib-clean');
|
grunt.loadNpmTasks('grunt-contrib-clean');
|
||||||
grunt.loadNpmTasks('grunt-contrib-concat');
|
grunt.loadNpmTasks('grunt-contrib-concat');
|
||||||
grunt.loadNpmTasks('grunt-contrib-connect');
|
|
||||||
grunt.loadNpmTasks('grunt-contrib-copy');
|
grunt.loadNpmTasks('grunt-contrib-copy');
|
||||||
grunt.loadNpmTasks('grunt-contrib-jshint');
|
grunt.loadNpmTasks('grunt-contrib-jshint');
|
||||||
grunt.loadNpmTasks('grunt-contrib-uglify');
|
grunt.loadNpmTasks('grunt-contrib-uglify');
|
||||||
@ -279,10 +269,10 @@ module.exports = function(grunt) {
|
|||||||
grunt.registerTask('lint', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint']);
|
grunt.registerTask('lint', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint']);
|
||||||
|
|
||||||
// Validate & Test
|
// Validate & Test
|
||||||
grunt.registerTask('test', ['lint', 'compile', 'connect:test', 'ghost:default']);
|
grunt.registerTask('test', ['lint', 'compile', 'express:test', 'ghost:default']);
|
||||||
|
|
||||||
// Validate & Test (faster version) will NOT work on travis !!
|
// Validate & Test (faster version) will NOT work on travis !!
|
||||||
grunt.registerTask('precommit', ['lint', 'compile', 'connect:test', 'ghost:local']);
|
grunt.registerTask('precommit', ['lint', 'compile', 'express:test', 'ghost:local']);
|
||||||
|
|
||||||
// Compile JS code (eg verify JSDoc annotation and types, no actual minified code generated).
|
// Compile JS code (eg verify JSDoc annotation and types, no actual minified code generated).
|
||||||
grunt.registerTask('compile', ['closureCompiler:compile', 'clean:after']);
|
grunt.registerTask('compile', ['closureCompiler:compile', 'clean:after']);
|
||||||
|
21
package.json
21
package.json
@ -3,7 +3,7 @@
|
|||||||
"name": "piskel",
|
"name": "piskel",
|
||||||
"main": "./dest/index.html",
|
"main": "./dest/index.html",
|
||||||
"description": "Web based 2d animations editor",
|
"description": "Web based 2d animations editor",
|
||||||
"version": "0.1.0",
|
"version": "0.1.1",
|
||||||
"homepage": "http://github.com/juliandescottes/piskel",
|
"homepage": "http://github.com/juliandescottes/piskel",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@ -14,22 +14,21 @@
|
|||||||
"start": "nodewebkit"
|
"start": "nodewebkit"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"grunt": "~0.4.1",
|
"grunt": "~0.4.5",
|
||||||
"grunt-contrib-clean": "0.5.0",
|
"grunt-contrib-clean": "0.5.0",
|
||||||
"grunt-contrib-connect": "0.3.0",
|
"grunt-contrib-concat": "0.5.0",
|
||||||
"grunt-contrib-concat": "0.1.2",
|
|
||||||
"grunt-contrib-copy": "0.5.0",
|
"grunt-contrib-copy": "0.5.0",
|
||||||
"grunt-contrib-jshint": "0.5.4",
|
"grunt-contrib-jshint": "0.10.0",
|
||||||
"grunt-contrib-uglify": "0.2.2",
|
"grunt-contrib-uglify": "0.5.0",
|
||||||
"grunt-contrib-watch": "0.6.1",
|
"grunt-contrib-watch": "0.6.1",
|
||||||
"grunt-express": "1.0",
|
"grunt-express": "1.4.1",
|
||||||
"grunt-replace": "0.7.8",
|
"grunt-replace": "0.7.8",
|
||||||
"grunt-ghost": "1.0.12",
|
"grunt-ghost": "1.1.0",
|
||||||
"grunt-open": "0.2.3",
|
"grunt-open": "0.2.3",
|
||||||
"grunt-leading-indent": "0.1.0",
|
"grunt-leading-indent": "0.1.0",
|
||||||
"grunt-closure-tools": "~0.8.3",
|
"grunt-closure-tools": "~0.9.7",
|
||||||
"grunt-node-webkit-builder": "0.1.19",
|
"grunt-node-webkit-builder": "0.1.21",
|
||||||
"nodewebkit": "0.8.4",
|
"nodewebkit": "~0.9.2-8",
|
||||||
"dateformat" : "1.0.8-1.2.3"
|
"dateformat" : "1.0.8-1.2.3"
|
||||||
},
|
},
|
||||||
"window": {
|
"window": {
|
||||||
|
Loading…
Reference in New Issue
Block a user