mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
Merge 5a16ede4ee into 21b8bdd0f3
This commit is contained in:
Ayushman Chhabra
GitHub
commit
d012ef2e91
44
Gruntfile.js
44
Gruntfile.js
@ -10,8 +10,8 @@ module.exports = function(grunt) {
|
||||
};
|
||||
|
||||
// create a version based on the build timestamp
|
||||
var dateFormat = require('dateformat');
|
||||
var version = '-' + dateFormat(new Date(), "yyyy-mm-dd-hh-MM");
|
||||
var { format } = require('date-fns');
|
||||
var version = `-${format(new Date(), "yyyy-MM-dd-HH-mm")}`;
|
||||
var releaseVersion = require('./package.json').version;
|
||||
|
||||
/**
|
||||
@ -219,6 +219,7 @@ module.exports = function(grunt) {
|
||||
{src: ['dest/tmp/index.html'], dest: 'dest/prod/index.html'},
|
||||
{src: ['src/logo.png'], dest: 'dest/prod/logo.png'},
|
||||
{src: ['src/js/lib/gif/gif.ie.worker.js'], dest: 'dest/prod/js/lib/gif/gif.ie.worker.js'},
|
||||
{src: ['./package.json'], dest: 'dest/prod/package.json'},
|
||||
{expand: true, src: ['img/**'], cwd: 'src/', dest: 'dest/prod/', filter: 'isFile'},
|
||||
{expand: true, src: ['css/fonts/**'], cwd: 'src/', dest: 'dest/prod/', filter: 'isFile'}
|
||||
]
|
||||
@ -270,38 +271,24 @@ module.exports = function(grunt) {
|
||||
*/
|
||||
|
||||
nwjs: {
|
||||
windows : {
|
||||
run: {
|
||||
options: {
|
||||
downloadUrl: 'https://dl.nwjs.io/',
|
||||
version : "0.19.4",
|
||||
build_dir: './dest/desktop/', // destination folder of releases.
|
||||
win: true,
|
||||
linux32: true,
|
||||
linux64: true,
|
||||
version : "0.67.1",
|
||||
buildDir: './dest/desktop/', // destination folder of releases.
|
||||
flavor: "normal",
|
||||
mode: "run",
|
||||
files: './dest/prod/**/*',
|
||||
},
|
||||
src: ['./dest/prod/**/*', "./package.json", "!./dest/desktop/"]
|
||||
},
|
||||
macos : {
|
||||
build: {
|
||||
options: {
|
||||
downloadUrl: 'https://dl.nwjs.io/',
|
||||
osx64: true,
|
||||
version : "0.19.4",
|
||||
build_dir: './dest/desktop/',
|
||||
version : "0.67.1",
|
||||
buildDir: './dest/desktop/', // destination folder of releases.
|
||||
flavor: "normal",
|
||||
platforms: ['linux', 'osx64', 'win'],
|
||||
files: './dest/prod/**/*',
|
||||
},
|
||||
src: ['./dest/prod/**/*', "./package.json", "!./dest/desktop/"]
|
||||
},
|
||||
macos_old : {
|
||||
options: {
|
||||
downloadUrl: 'https://dl.nwjs.io/',
|
||||
osx64: true,
|
||||
version : "0.12.3",
|
||||
build_dir: './dest/desktop/old',
|
||||
flavor: "normal",
|
||||
},
|
||||
src: ['./dest/prod/**/*', "./package.json", "!./dest/desktop/"]
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@ -328,9 +315,8 @@ module.exports = function(grunt) {
|
||||
grunt.registerTask('merge-statics', ['concat:js', 'concat:css', 'uglify']);
|
||||
grunt.registerTask('build', ['clean:prod', 'sprite', 'merge-statics', 'build-index.html', 'replace:mainPartial', 'replace:css', 'copy:prod']);
|
||||
grunt.registerTask('build-dev', ['clean:dev', 'sprite', 'build-index.html', 'copy:dev']);
|
||||
grunt.registerTask('desktop', ['clean:desktop', 'default', 'nwjs:windows']);
|
||||
grunt.registerTask('desktop-mac', ['clean:desktop', 'default', 'nwjs:macos']);
|
||||
grunt.registerTask('desktop-mac-old', ['clean:desktop', 'default', 'replace:desktop', 'nwjs:macos_old']);
|
||||
grunt.registerTask('desktop-run', ['clean:desktop', 'default', 'nwjs:run']);
|
||||
grunt.registerTask('desktop-build', ['clean:desktop', 'default', 'nwjs:build']);
|
||||
|
||||
// SERVER TASKS
|
||||
// Start webserver and watch for changes
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
// Karma configuration
|
||||
// Generated on Tue Jul 22 2014 23:49:26 GMT+0200 (Romance Daylight Time)
|
||||
|
||||
const puppeteer = require('puppeteer');
|
||||
process.env.CHROME_BIN = puppeteer.executablePath();
|
||||
// process.env.EDGE_BIN = puppeteer.executablePath();
|
||||
|
||||
module.exports = function(config) {
|
||||
|
||||
var mapToSrcFolder = function (path) {return ['src', path].join('/');};
|
||||
@ -64,11 +68,30 @@ module.exports = function(config) {
|
||||
|
||||
// start these browsers
|
||||
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
|
||||
browsers: ['PhantomJS'],
|
||||
// browsers: [
|
||||
// 'ChromeHeadless',
|
||||
// // 'EdgeHeadless',
|
||||
// // 'FirefoxHeadless',
|
||||
// ],
|
||||
|
||||
// https://github.com/karma-runner/karma-chrome-launcher/issues/158#issuecomment-339265457
|
||||
browsers: ['ChromeHeadlessNoSandbox'],
|
||||
customLaunchers: {
|
||||
ChromeHeadlessNoSandbox: {
|
||||
base: 'ChromeHeadless',
|
||||
flags: ['--no-sandbox']
|
||||
}
|
||||
},
|
||||
|
||||
plugins: [
|
||||
'karma-chrome-launcher',
|
||||
// '@chiragrupani/karma-chromium-edge-launcher',
|
||||
// 'karma-firefox-launcher',
|
||||
'karma-jasmine',
|
||||
],
|
||||
|
||||
// Continuous Integration mode
|
||||
// if true, Karma captures browsers, runs the tests and exits
|
||||
singleRun: true
|
||||
singleRun: true,
|
||||
});
|
||||
};
|
||||
|
||||
15451
package-lock.json
generated
Normal file
15451
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
54
package.json
54
package.json
@ -20,58 +20,60 @@
|
||||
"piskel-root": "./misc/scripts/piskel-root",
|
||||
"piskel-cli": "./cli/index.js"
|
||||
},
|
||||
"main": "./dest/prod/index.html",
|
||||
"main": "./index.html",
|
||||
"scripts": {
|
||||
"test": "grunt test",
|
||||
"dev": "grunt play",
|
||||
"start": "grunt build && nw",
|
||||
"build": "grunt build",
|
||||
"preversion": "grunt test build",
|
||||
"postversion": "git push && git push --tags && npm publish",
|
||||
"release": "grunt && node ./bin/copy-to-piskel-website",
|
||||
"build": "grunt desktop",
|
||||
"build:mac": "grunt desktop-mac",
|
||||
"desktop:run": "grunt desktop-run",
|
||||
"desktop:build": "grunt desktop-build",
|
||||
"format": "grunt eslint --fix"
|
||||
},
|
||||
"devDependencies": {
|
||||
"dateformat": "4.5.1",
|
||||
"fs-extra": "10.0.0",
|
||||
"grunt": "1.4.1",
|
||||
"grunt-casperjs": "^2.2.1",
|
||||
"grunt-cli": "^1.4.3",
|
||||
"grunt-contrib-clean": "2.0.0",
|
||||
"grunt-contrib-concat": "1.0.1",
|
||||
"@chiragrupani/karma-chromium-edge-launcher": "2.2.2",
|
||||
"date-fns": "2.29.2",
|
||||
"fs-extra": "10.1.0",
|
||||
"grunt": "1.5.3",
|
||||
"grunt-casperjs": "2.2.1",
|
||||
"grunt-cli": "1.4.3",
|
||||
"grunt-contrib-clean": "2.0.1",
|
||||
"grunt-contrib-concat": "2.1.0",
|
||||
"grunt-contrib-connect": "3.0.0",
|
||||
"grunt-contrib-copy": "1.0.0",
|
||||
"grunt-contrib-jshint": "3.0.0",
|
||||
"grunt-contrib-uglify": "5.0.1",
|
||||
"grunt-contrib-watch": "^1.1.0",
|
||||
"grunt-eslint": "23.0.0",
|
||||
"grunt-contrib-jshint": "3.2.0",
|
||||
"grunt-contrib-uglify": "5.2.2",
|
||||
"grunt-contrib-watch": "1.1.0",
|
||||
"grunt-eslint": "24.0.0",
|
||||
"grunt-include-replace": "5.0.0",
|
||||
"grunt-jscs": "3.0.1",
|
||||
"grunt-karma": "4.0.2",
|
||||
"grunt-leading-indent": "0.2.0",
|
||||
"grunt-nw-builder": "3.1.0",
|
||||
"grunt-nw-builder": "3.8.2",
|
||||
"grunt-replace": "2.0.2",
|
||||
"grunt-spritesmith": "^6.9.0",
|
||||
"jasmine-core": "3.8.0",
|
||||
"karma": "6.3.4",
|
||||
"karma-jasmine": "4.0.1",
|
||||
"grunt-spritesmith": "6.10.0",
|
||||
"jasmine-core": "4.3.0",
|
||||
"karma": "6.4.0",
|
||||
"karma-chrome-launcher": "3.1.1",
|
||||
"karma-firefox-launcher": "2.1.2",
|
||||
"karma-jasmine": "5.1.0",
|
||||
"karma-phantomjs-launcher": "1.0.4",
|
||||
"load-grunt-tasks": "5.1.0",
|
||||
"nw": "0.54.0",
|
||||
"phantomjs": "2.1.7",
|
||||
"phantomjs-polyfill-object-assign": "0.0.2",
|
||||
"promise-polyfill": "8.2.0",
|
||||
"phantomjs-prebuilt": "2.1.16",
|
||||
"promise-polyfill": "8.2.3",
|
||||
"puppeteer": "17.0.0",
|
||||
"rmdir": "1.2.0"
|
||||
},
|
||||
"window": {
|
||||
"title": "Piskel",
|
||||
"icon": "dest/prod/logo.png",
|
||||
"icon": "./logo.png",
|
||||
"toolbar": false,
|
||||
"width": 1000,
|
||||
"height": 700
|
||||
},
|
||||
"dependencies": {
|
||||
"minimist": "^1.2.5"
|
||||
"minimist": "1.2.6"
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user