From fc3c187bf10a6814db953b86456ddd0be38247ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Sep 2021 07:36:48 +0000 Subject: [PATCH 1/3] Bump gulp from 3.9.1 to 4.0.2 in /js Bumps [gulp](https://github.com/gulpjs/gulp) from 3.9.1 to 4.0.2. - [Release notes](https://github.com/gulpjs/gulp/releases) - [Changelog](https://github.com/gulpjs/gulp/blob/master/CHANGELOG.md) - [Commits](https://github.com/gulpjs/gulp/compare/v3.9.1...v4.0.2) --- updated-dependencies: - dependency-name: gulp dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/package.json b/js/package.json index ba57e08c..63940d3a 100644 --- a/js/package.json +++ b/js/package.json @@ -13,7 +13,7 @@ "devDependencies": { "bower": "^1.8.4", "del": "^6.0.0", - "gulp": "^3.9.0", + "gulp": "^4.0.2", "gulp-cli": "^2.0.1", "gulp-concat": "^2.6.0", "gulp-jshint": "^1.11.2", From cf070df0115d86f699e14ac111ba0fd14e7557bc Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 14 Sep 2021 16:07:57 +0545 Subject: [PATCH 2/3] Adjust for latest JS packages --- js/bower.json | 2 +- js/gulpfile.js | 10 +++++----- js/package.json | 13 +++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/js/bower.json b/js/bower.json index 70dafcfa..ea4506b2 100644 --- a/js/bower.json +++ b/js/bower.json @@ -1,5 +1,5 @@ { - "name": "ownCloud notes", + "name": "owncloud-notes", "version": "0.0.1", "dependencies": { "angular": "1.4.*", diff --git a/js/gulpfile.js b/js/gulpfile.js index 527fe007..e2de7e70 100644 --- a/js/gulpfile.js +++ b/js/gulpfile.js @@ -27,8 +27,6 @@ var wrappers = '(function(angular, $, requestToken, mdEdit, undefined){'+ /** * Task definitions */ -gulp.task('default', ['lint', 'build']); - gulp.task('lint', function () { 'use strict'; var jshint = require('gulp-jshint'); @@ -58,6 +56,8 @@ gulp.task('build', function () { .pipe(gulp.dest(buildFolder)); }); +gulp.task('default', gulp.series('lint', 'build')); + gulp.task('clean', function () { 'use strict'; var del = require('del'); @@ -65,8 +65,6 @@ gulp.task('clean', function () { }); -gulp.task('test-all', ['test', 'test-php', 'test-php-integration']); - gulp.task('test', function (done) { 'use strict'; var karma = require('karma'); @@ -93,9 +91,11 @@ gulp.task('test-php-integration', function () { .pipe(phpunit(phpunitBinary)); }); +gulp.task('test-all', gulp.series('test', 'test-php', 'test-php-integration')); + // watch tasks -gulp.task('watch', ['default'], function () { +gulp.task('watch', gulp.series('default'), function () { 'use strict'; gulp.watch(sources.js .concat(sources.tests) diff --git a/js/package.json b/js/package.json index 63940d3a..5c6a64ed 100644 --- a/js/package.json +++ b/js/package.json @@ -11,19 +11,20 @@ "bugs": "https://github.com/owncloud/notes/issues", "dependencies": {}, "devDependencies": { - "bower": "^1.8.4", + "bower": "^1.8.12", "del": "^6.0.0", "gulp": "^4.0.2", - "gulp-cli": "^2.0.1", - "gulp-concat": "^2.6.0", - "gulp-jshint": "^1.11.2", + "gulp-cli": "^2.3.0", + "gulp-concat": "^2.6.1", + "gulp-jshint": "^2.1.0", "gulp-ng-annotate": "^2.1.0", "gulp-phpunit": "^0.26.0", "gulp-sourcemaps": "^3.0.0", "gulp-uglify": "^3.0.2", "gulp-wrap": "^0.15.0", - "jasmine-core": "^3.1.0", - "jshint-stylish": "^2.0.1", + "jasmine-core": "^3.9.0", + "jshint": "^2.13.1", + "jshint-stylish": "^2.2.1", "karma": "^6.3.4", "karma-jasmine": "^4.0.1", "karma-phantomjs-launcher": "*", From 702fbb56b39b20e5c49b426ab04241a28f69050a Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 14 Sep 2021 16:13:17 +0545 Subject: [PATCH 3/3] Use nodejs:14 for JS tests in CI --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 19cebaf3..ea1ae1af 100644 --- a/.drone.star +++ b/.drone.star @@ -591,7 +591,7 @@ def javascript(ctx, withCoverage): [ { "name": "js-tests", - "image": "owncloudci/php:8.0", + "image": "owncloudci/nodejs:14", "pull": "always", "environment": params["extraEnvironment"], "commands": params["extraCommandsBeforeTestRun"] + [