Skip to content

Commit d854163

Browse files
committed
Upgrade to gulp v4
Allow running on Node.js 10.x Also upgrade other dev dependencies
1 parent fa4cf7b commit d854163

File tree

3 files changed

+1843
-1093
lines changed

3 files changed

+1843
-1093
lines changed

gulpfile.js

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,42 @@ const {
1616

1717
const libraries = getLibraries();
1818

19-
libraries.forEach(library =>
20-
gulp.task(library.path, () => {
21-
const mainFileStream = gulp.src(library.manifest.files);
22-
const resourceZipStream = gulp
23-
.src(library.manifest.resources || [])
24-
.pipe(zip('Resources.zip'));
19+
function makePackageTask(library) {
20+
const packageFn = function() {
21+
const resourceZipStream =
22+
library.manifest.resources && library.manifest.resources.length
23+
? gulp
24+
.src(library.manifest.resources)
25+
.pipe(zip('Resources.zip'))
26+
: null;
2527

2628
const templateData = {
2729
version: library.version,
2830
versionFolder: formatVersionFolder(library.version),
2931
};
30-
const packageFilesStream = gulp
32+
const filesStream = gulp
3133
.src(['LICENSE.htm', 'CHANGES.htm', '*.dnn'], {
3234
cwd: library.path,
3335
})
34-
.pipe(ejs(templateData, { delimiter: '~' }));
36+
.pipe(ejs(templateData, { delimiter: '~' }))
37+
.pipe(gulp.src(library.manifest.files));
3538

36-
return mergeStream(
37-
mainFileStream,
38-
resourceZipStream,
39-
packageFilesStream
40-
)
39+
const packageStream = resourceZipStream
40+
? mergeStream(filesStream, resourceZipStream)
41+
: filesStream;
42+
43+
return packageStream
4144
.pipe(zip(`${library.name}_${library.version}.zip`))
4245
.pipe(gulp.dest('./_InstallPackages/'));
43-
})
44-
);
46+
};
4547

46-
const libraryTaskNames = libraries.map(library => library.path);
48+
packageFn.displayName = `Generate ${library.name}_${library.version}.zip`;
49+
return packageFn;
50+
}
4751

48-
gulp.task('default', libraryTaskNames);
52+
const defaultTask = gulp.parallel(...libraries.map(makePackageTask));
4953

50-
gulp.task('outdated', () => {
54+
function outdated() {
5155
const allUpgradesPromises = libraries.map(library =>
5256
getUpgradeVersions(library).then(upgrades =>
5357
Object.assign(library, { upgrades })
@@ -70,10 +74,10 @@ gulp.task('outdated', () => {
7074
log.info(`
7175
${formatPackageUpgrades(validUpgrades)}`);
7276
});
73-
});
77+
}
7478

75-
['patch', 'minor', 'major'].forEach(upgradeType =>
76-
gulp.task(`upgrade-${upgradeType}`, () => {
79+
function makeUpgradeTask(upgradeType) {
80+
const upgradeFn = function() {
7781
const allUpgradesPromises = libraries.map(library =>
7882
getUpgradeVersions(library).then(upgrades =>
7983
Object.assign(library, { upgrades })
@@ -152,5 +156,23 @@ ${formatPackageUpgrades(validUpgrades)}`);
152156
)
153157
);
154158
});
155-
})
156-
);
159+
};
160+
161+
upgradeFn.displayName = `Apply ${upgradeType} upgrades`;
162+
163+
return upgradeFn;
164+
}
165+
166+
const upgradePatch = makeUpgradeTask('patch');
167+
const upgradeMinor = makeUpgradeTask('minor');
168+
const upgradeMajor = makeUpgradeTask('major');
169+
const upgrade = gulp.series(upgradePatch, upgradeMinor, upgradeMajor);
170+
171+
module.exports = {
172+
outdated,
173+
upgradePatch,
174+
upgradeMinor,
175+
upgradeMajor,
176+
upgrade,
177+
default: defaultTask,
178+
};

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"scripts": {
99
"package": "gulp",
1010
"outdated": "gulp outdated",
11-
"upgrade": "gulp upgrade-patch && gulp upgrade-minor && gulp upgrade-major",
11+
"upgrade": "gulp upgradePatch && gulp upgradeMinor && gulp upgradeMajor",
1212
"new": "yo ./_new"
1313
},
1414
"dependencies": {
@@ -80,20 +80,20 @@
8080
"zeroclipboard": "2.3.0"
8181
},
8282
"devDependencies": {
83-
"chalk": "^2.4.1",
83+
"chalk": "^2.4.2",
8484
"cliui": "4.1.0",
8585
"cross-spawn": "6.0.5",
86-
"fancy-log": "1.3.2",
87-
"glob": "^7.1.2",
88-
"globby": "^8.0.1",
89-
"gulp": "^3.9.1",
90-
"gulp-ejs": "^3.1.3",
91-
"gulp-zip": "^4.1.0",
92-
"lodash": "4.17.10",
86+
"fancy-log": "1.3.3",
87+
"glob": "^7.1.3",
88+
"globby": "^9.0.0",
89+
"gulp": "^4.0.0",
90+
"gulp-ejs": "^3.3.0",
91+
"gulp-zip": "^4.2.0",
92+
"lodash": "4.17.11",
9393
"merge-stream": "^1.0.1",
94-
"package-json": "^4.0.1",
95-
"semver": "5.5.0",
96-
"yeoman-generator": "^2.0.5",
97-
"yo": "^2.0.2"
94+
"package-json": "^6.0.0",
95+
"semver": "5.6.0",
96+
"yeoman-generator": "^3.2.0",
97+
"yo": "^2.0.5"
9898
}
9999
}

0 commit comments

Comments
 (0)