Skip to content

Bump gulp from 3.9.1 to 4.0.2 in /js #400

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.

Sign up for GitHub

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

Merged
phil-davis merged 3 commits into from
Sep 14, 2021
Merged

Bump gulp from 3.9.1 to 4.0.2 in /js #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc3c187
Bump gulp from 3.9.1 to 4.0.2 in /js
dependabot[bot] Sep 14, 2021
cf070df
Adjust for latest JS packages
phil-davis Sep 14, 2021
702fbb5
Use nodejs:14 for JS tests in CI
phil-davis Sep 14, 2021
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
2 changes: 1 addition & 1 deletion .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] + [
Expand Down
2 changes: 1 addition & 1 deletion js/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ownCloud notes",
"name": "owncloud-notes",
"version": "0.0.1",
"dependencies": {
"angular": "1.4.*",
Expand Down
10 changes: 5 additions & 5 deletions js/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -58,15 +56,15 @@ 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');
del(buildFolder);
});


gulp.task('test-all', ['test', 'test-php', 'test-php-integration']);

gulp.task('test', function (done) {
'use strict';
var karma = require('karma');
Expand All @@ -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)
Expand Down
15 changes: 8 additions & 7 deletions js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "^3.9.0",
"gulp-cli": "^2.0.1",
"gulp-concat": "^2.6.0",
"gulp-jshint": "^1.11.2",
"gulp": "^4.0.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": "*",
Expand Down