Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(build): update deps, karma and nw config #1049

Closed
wants to merge 39 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
11e0066
Replace phantomjs with phantomjs-prebuilt
ayushmanchhabra Feb 11, 2022
b96ea85
Remove yarn.lock
ayushmanchhabra Feb 11, 2022
9bbc9d2
Switch to Chromium Headless with Karma for testing
ayushmanchhabra Feb 11, 2022
bb4c4fe
Use fork of grunt-nw-builder and update nwjs versions in grunt
ayushmanchhabra Feb 11, 2022
ee7cb3d
Update Node version to v14 for Travis CI
ayushmanchhabra Feb 11, 2022
65f58e5
Update dependencies
ayushmanchhabra Feb 11, 2022
dd5a22e
Bump nwjs version to `0.63.1` for macOS
ayushmanchhabra May 1, 2022
cee46e0
chore(deps): update major and non-major deps
ayushmanchhabra May 6, 2022
67fd248
chore(ci): update node lts
ayushmanchhabra May 6, 2022
84801f4
feat: add edge and firefox headless to karma config
ayushmanchhabra May 7, 2022
842f8fc
chore(deps): replace `date-format` with `date-fns`
ayushmanchhabra Jun 4, 2022
e4c7117
chore: only run tests on chrome for now
ayushmanchhabra Jun 4, 2022
0706b86
chore(deps): update remaining deps
ayushmanchhabra Jun 4, 2022
b1a5f6c
fix(build): run and build for desktop
ayushmanchhabra Jun 5, 2022
f84ab10
fix(build): update logo file path
ayushmanchhabra Jun 5, 2022
9927ea5
fix(build): do not build osx32 for now
ayushmanchhabra Jun 5, 2022
ba80ed0
chore(deps): remove `nw`
ayushmanchhabra Jun 5, 2022
283cfd2
chore(deps): update deps to latest
ayushmanchhabra Jun 10, 2022
6e7da1d
chore(ci): run tests using github actions
ayushmanchhabra Jun 10, 2022
ed178ed
fix(ci): typo
ayushmanchhabra Jun 10, 2022
73bf64f
fix(ci): formatting
ayushmanchhabra Jun 10, 2022
5395569
chore(ci): add `workflow_dispatch`
ayushmanchhabra Jun 10, 2022
0f133cd
chore(ci): run ci on all branches and commits
ayushmanchhabra Jun 10, 2022
002df7c
chore(ci): remove github actions
ayushmanchhabra Jun 10, 2022
471f433
chore(deps): bump to latest
ayushmanchhabra Jun 23, 2022
8d81ab9
chore(deps): bump to latest
ayushmanchhabra Jul 3, 2022
c6904e1
chore(deps): bump to latest
ayushmanchhabra Jul 24, 2022
6decb5e
chore(deps): bump nw to latest
ayushmanchhabra Jul 25, 2022
99fbfb1
chore(ci): link `grunt build` to `npm run build`
ayushmanchhabra Jul 30, 2022
a7c9780
revert changes to travis config
ayushmanchhabra Aug 3, 2022
49eeab6
chore(deps): bump to latest
ayushmanchhabra Aug 13, 2022
bc2a4ec
chore(deps): update lock file
ayushmanchhabra Aug 13, 2022
5e3a594
chore(deps): remove unused package `grunt-jscs`
ayushmanchhabra Aug 13, 2022
b8d03ab
chore(deps): update lock file
ayushmanchhabra Aug 13, 2022
d5ac147
Bump js-yaml from 3.4.6 to 3.14.1 (#7)
dependabot[bot] Aug 16, 2022
014b91b
Bump underscore from 1.6.0 to 1.13.4 (#8)
dependabot[bot] Aug 16, 2022
87f3133
Bump lodash from 3.10.1 to 4.17.21 (#9)
dependabot[bot] Aug 16, 2022
ca771c0
chore(deps): bump to latest
ayushmanchhabra Aug 31, 2022
5a16ede
Merge branch 'dev-1047' of github.com:ayushmxn/piskel into dev-1047
ayushmanchhabra Aug 31, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 15 additions & 29 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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'}
]
Expand Down Expand Up @@ -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/"]
}
}
});

Expand All @@ -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
Expand Down
27 changes: 25 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -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('/');};
Expand Down Expand Up @@ -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,
});
};
Loading