Skip to content

Commit

Permalink
Merge pull request #495 from chmelevskij/master
Browse files Browse the repository at this point in the history
chore: use node 14
  • Loading branch information
haslinghuis authored Jan 30, 2022
2 parents 5eed5da + 1fc8583 commit ba7470b
Show file tree
Hide file tree
Showing 7 changed files with 653 additions and 385 deletions.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
14.18.2
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ git:
language: node_js

node_js:
- 8.11.2
- 14.8.2

before_install:
- npm i -g [email protected]
Expand Down
22 changes: 11 additions & 11 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ stages:
vmImage: 'windows-2022'

steps:
- task: UseNode@1
- task: NodeTool@0
inputs:
version: '10.16.3'
displayName: 'Install Node.js 10.16.3'
- script: yarn install
versionSpec: '14.18.2'
displayName: 'Install Node.js 14.18.2'
- script: yarn install --ignore-optional
displayName: 'Run yarn install'
- script: yarn gulp release --win64
displayName: 'Run yarn release for win64'
Expand All @@ -71,10 +71,10 @@ stages:
vmImage: 'macos-10.15'

steps:
- task: UseNode@1
- task: NodeTool@0
inputs:
version: '10.16.3'
displayName: 'Install Node.js 10.16.3'
versionSpec: '14.18.2'
displayName: 'Install Node.js 14.18.2'
- script: npm install -g gulp
displayName: 'Install Gulp'
- script: yarn install
Expand All @@ -96,11 +96,11 @@ stages:
vmImage: '$(linuxVmImage)'

steps:
- task: UseNode@1
- task: NodeTool@0
inputs:
version: '10.16.3'
displayName: 'Install Node.js 10.16.3'
- script: yarn install
versionSpec: '14.18.2'
displayName: 'Install Node.js 14.18.2'
- script: yarn install --ignore-optional
displayName: 'Run yarn install'
- script: yarn gulp release --linux64
displayName: 'Run yarn release for linux'
Expand Down
31 changes: 31 additions & 0 deletions gulp-appdmg.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

const appdmg = require('appdmg');
const through = require('through2');
const gutil = require('gulp-util');

const PluginError = gutil.PluginError;
const PLUGIN_NAME = 'gulp-appdmg';

module.exports = function(options) {
const stream = through.obj(function(file, encoding, next) {
next();
}, function(callback) {
const self = this;
const ee = appdmg(options);

ee.on('progress', function(info) {
gutil.log(info.current + '/' + info.total + ' ' + info.type + ' ' + (info.title || info.status));
});

ee.on('error', function(err) {
self.emit('error', new PluginError(PLUGIN_NAME, err));
callback();
});

ee.on('finish', callback);
});

// returning the file stream
stream.resume();
return stream;
};
4 changes: 1 addition & 3 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

const pkg = require('./package.json');

const child_process = require('child_process');
const fs = require('fs');
const path = require('path');

Expand All @@ -15,7 +14,6 @@ const buildRpm = require('rpm-builder')
const commandExistsSync = require('command-exists').sync;

const gulp = require('gulp');
const concat = require('gulp-concat');
const yarn = require("gulp-yarn");
const rename = require('gulp-rename');
const os = require('os');
Expand Down Expand Up @@ -517,7 +515,7 @@ function release_rpm(arch, appDirectory, done) {

// Create distribution package for macOS platform
function release_osx64(appDirectory) {
var appdmg = require('gulp-appdmg');
var appdmg = require('./gulp-appdmg');

// The appdmg does not generate the folder correctly, manually
createDirIfNotExists(RELEASE_DIR);
Expand Down
18 changes: 8 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"default_locale": "en",
"scripts": {
"start": "gulp debug",
"postinstall": "platform-dependent-modules",
"gulp": "gulp",
"release": "gulp release"
},
Expand All @@ -35,27 +34,26 @@
"command-exists": "^1.2.8",
"del": "^5.0.0",
"gulp": "^4.0.1",
"gulp-concat": "~2.6.1",
"gulp-debian": "~0.1.8",
"gulp-rename": "^2.0.0",
"gulp-yarn": "^2.0.0",
"gulp-util": "3.0.8",
"gulp-yarn": "^3.0.0",
"gulp-zip": "^5.0.0",
"inflection": "1.12.0",
"nw-builder": "^3.5.7",
"os": "^0.1.1",
"platform-dependent-modules": "0.0.14",
"rpm-builder": "^1.0.0",
"temp": "^0.9.0",
"through2": "4.0.2",
"yarn": "^1.22.0"
},
"optionalDependencies": {
"appdmg": "^0.6.2"
},
"resolutions": {
"**/**/lodash.template": "^4.5.0"
},
"config": {
"platformDependentModules": {
"darwin": [
"[email protected]"
]
}
"engines": {
"node": "14.x"
}
}
Loading

0 comments on commit ba7470b

Please sign in to comment.