openstack
/
openstack-health
Code Issues Proposed changes

WIP: Fix gulp 

Change-Id: I368beadca9184654d1727579e7cd9274b53192d6
This commit is contained in:
lpiwowar 2022-01-19 16:41:12 +01:00
parent a25e4d491c
commit e6a5a43247
12 changed files with 84 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/styles/_typography.scss
View File

@ -30,13 +30,13 @@ p {
}
h1 {
@extend .heading.-large;
@extend .heading,.-large;
}
h2 {
@extend .heading.-medium;
@extend .heading,.-medium;
}
h3 {
@extend .heading.-small;
}
@extend .heading,.-small;
}

17
gulp/tasks/clean.js
View File

@ -4,8 +4,19 @@ var config = require('../config');
var gulp = require('gulp');
var del = require('del');
/*
function clean2() {
return del(['docs', 'coverage', 'build', 'release']);
}
function build(cb) {
gulp.series(clean2);
cb();
}
gulp.task('clean', build);
*/
gulp.task('clean', function(cb) {
del([config.dist.root], cb);
return del([config.dist.root], cb);
});

6
gulp/tasks/deploy.js
View File

@ -1,9 +1,11 @@
'use strict';
var gulp = require('gulp');
//var prod = gulp.task('prod', function(done) { done() });
gulp.task('deploy', ['prod'], function() {
gulp.task('prod', function(cb) {
//gulp.task('deploy', gulp.series('prod', function() {
// Any deployment logic should go here
cb();
});

13
gulp/tasks/development.js
View File

@ -3,14 +3,17 @@
var gulp = require('gulp');
var runSequence = require('run-sequence');
gulp.task('dev', ['clean'], function(cb) {
// gulp.task('clean', function(done) { done();});
gulp.task('dev', gulp.series('clean', function(cb) {
cb = cb || function() {};
global.isProd = false;
runSequence(
['styles', 'fonts', 'images', 'data', 'views', 'dev-resources'],
'browserify', 'watch', cb);
});
// runSequence(
// ['styles', 'fonts', 'images', 'data', 'views', 'dev-resources'],
// 'browserify', 'watch', cb);
gulp.series('styles', 'fonts', 'images', 'data', 'views', 'dev-resources', 'browserify', 'watch', cb);
}));

12
gulp/tasks/production.js
View File

@ -3,14 +3,16 @@
var gulp = require('gulp');
var runSequence = require('run-sequence');
gulp.task('prod', ['clean'], function(cb) {
gulp.task('prod', gulp.series('clean', function(cb) {
cb = cb || function() {};
global.isProd = true;
runSequence(
['styles', 'fonts', 'images', 'views'],
'browserify', 'gzip', cb);
//runSequence(
// ['styles', 'fonts', 'images', 'views'],
// 'browserify', 'gzip', cb);
});
gulp.series('styles', 'fonts', 'images', 'views', 'browserify', 'gzip')();
cb();
}));

8
gulp/tasks/protractor.js
View File

@ -2,14 +2,16 @@
var gulp = require('gulp');
var protractor = require('gulp-protractor').protractor;
var webdriver = require('gulp-protractor').webdriver;
var webdriver = require('gulp-protractor').webdriver_standalone;
var webdriverUpdate = require('gulp-protractor').webdriver_update;
var config = require('../config');
var server = require("./server");
gulp.task('webdriver-update', webdriverUpdate);
gulp.task('webdriver', webdriver);
gulp.task('protractor', ['webdriver-update', 'webdriver', 'server'], function() {
console.log(require('gulp-protractor'));
gulp.task('protractor', gulp.series('webdriver-update', 'webdriver', 'server', function() {
return gulp.src('test/e2e/**/*.js')
.pipe(protractor({
@ -24,4 +26,4 @@ gulp.task('protractor', ['webdriver-update', 'webdriver', 'server'], function()
process.exit();
});
});
}));

4
gulp/tasks/reports.js
View File

@ -3,9 +3,9 @@
var config = require('../config');
var gulp = require('gulp');
gulp.task('reports', ['prod'], function() {
gulp.task('reports', gulp.series('prod', function() {
return gulp.src(config.reports.src)
.pipe(gulp.dest(config.reports.dest));
});
}));

4
gulp/tasks/styles.js
View File

@ -2,14 +2,14 @@
var config = require('../config');
var gulp = require('gulp');
var sass = require('gulp-sass');
var sass = require('gulp-sass')(require('sass'));
var gulpif = require('gulp-if');
var handleErrors = require('../util/handleErrors');
var browserSync = require('browser-sync');
var autoprefixer = require('gulp-autoprefixer');
gulp.task('styles', function () {
// const sass = require('gulp-sass')(require('sass'));
return gulp.src(config.styles.src)
.pipe(sass({
sourceComments: global.isProd ? 'none' : 'map',

4
gulp/tasks/test.js
View File

@ -3,8 +3,8 @@
var gulp = require('gulp');
var runSequence = require('run-sequence');
gulp.task('test', ['server'], function() {
gulp.task('test', gulp.series('server', function() {
return runSequence('unit', 'protractor');
});
}));

5
gulp/tasks/unit.js
View File

@ -3,8 +3,9 @@
var gulp = require('gulp');
var karma = require('gulp-karma');
var config = require('../config');
var views = require('./views');
gulp.task('unit', ['views'], function() {
gulp.task('unit', gulp.series('views', function() {
// Nonsensical source to fall back to files listed in karma.conf.js,
// see https://github.com/lazd/gulp-karma/issues/9
@ -18,4 +19,4 @@ gulp.task('unit', ['views'], function() {
throw err;
});
});
}));

4
gulp/tasks/watch.js
View File

@ -3,7 +3,7 @@
var config = require('../config');
var gulp = require('gulp');
gulp.task('watch', ['browserSync', 'server'], function() {
gulp.task('watch', gulp.series('browserSync', 'server', function() {
// Scripts are automatically watched and rebundled by Watchify inside Browserify task
gulp.watch(config.styles.src, ['styles']);
@ -13,4 +13,4 @@ gulp.task('watch', ['browserSync', 'server'], function() {
gulp.watch(config.devResources.src, ['dev-resources']);
gulp.watch(config.views.watch, ['views']);
});
}));

62
package.json
View File

@ -6,19 +6,19 @@
"repository": "none",
"license": "Apache 2.0",
"devDependencies": {
"angular": "1.7.5",
"angular": "^1.8.2",
"angular-fontawesome": "^1.0.0",
"angular-mocks": "1.7.5",
"angular-ui-bootstrap": "^2.5.0",
"angular-ui-router": "^0.4.2",
"angularjs-filters": "^0.0.2",
"ansi-colors": "^1.1.0",
"babelify": "^5.0.4",
"babelify": "^10.0.0",
"bootstrap": "^3.3.5",
"brfs": "^1.2.0",
"browser-sync": "^2.7.6",
"browserify": "^5.10.0",
"browserify-istanbul": "^0.2.0",
"browserify": "^17.0.0",
"browserify-istanbul": "^3.0.1",
"browserify-ngannotate": "^0.1.0",
"browserify-shim": "^3.8.10",
"bulk-require": "^0.2.1",
@ -29,39 +29,39 @@
"d3-interpolate": "^1.1.1",
"d3-scale": "^1.0.3",
"d3-time-format": "^2.0.2",
"del": "^0.1.3",
"eslint": "1.5.1",
"eslint-config-openstack": "1.2.2",
"del": "^6.0.0",
"eslint": "^8.7.0",
"eslint-config-openstack": "^1.2.1",
"eslint-plugin-angular": "0.12.0",
"express": "^4.7.2",
"fancy-log": "^1.3.2",
"gulp": "^3.8.8",
"gulp-angular-templatecache": "^1.3.0",
"gulp": "^4.0.2",
"gulp-angular-templatecache": "^3.0.0",
"gulp-autoprefixer": "^2.0.0",
"gulp-changed": "^1.0.0",
"gulp-changed": "^4.0.3",
"gulp-concat": "^2.6.0",
"gulp-filter": "^3.0.1",
"gulp-gzip": "^0.0.8",
"gulp-if": "^1.2.5",
"gulp-filter": "^7.0.0",
"gulp-gzip": "^1.4.2",
"gulp-if": "^3.0.0",
"gulp-karma": "0.0.4",
"gulp-notify": "^2.0.0",
"gulp-protractor": "0.0.11",
"gulp-notify": "^4.0.0",
"gulp-protractor": "^4.1.1",
"gulp-rename": "^1.2.0",
"gulp-replace": "^0.5.4",
"gulp-sass": "^4.0.1",
"gulp-sass": "^5.1.0",
"gulp-sourcemaps": "^1.3.0",
"gulp-streamify": "0.0.5",
"gulp-uglify": "^1.0.1",
"isparta": "^3.0.3",
"gulp-streamify": "^1.0.2",
"gulp-uglify": "^3.0.2",
"isparta": "^4.1.1",
"jasmine-ajax": "^3.1.1",
"jasmine-core": "^2.3.4",
"jasmine-fixture": "^1.3.2",
"karma": "~2.0.0",
"karma-babel-preprocessor": "^4.0.1",
"karma-browserify": "^4.0.0",
"karma-firefox-launcher": "^2.1.0",
"karma": "^6.3.11",
"karma-babel-preprocessor": "^8.0.1",
"karma-browserify": "^8.1.0",
"karma-cli": "0.0.4",
"karma-coverage": "0.2.6",
"karma-coverage": "^2.1.0",
"karma-firefox-launcher": "^2.1.0",
"karma-jasmine": "^0.3.6",
"karma-spec-reporter": "0.0.20",
"karma-subunit-reporter": "0.0.4",
@ -70,14 +70,15 @@
"nprogress": "^0.2.0",
"nvd3": "^1.8.4",
"pretty-hrtime": "^1.0.0",
"protractor": "^2.2.0",
"protractor": "^7.0.0",
"protractor-http-mock": "^0.1.18",
"run-sequence": "^1.1.2",
"tiny-lr": "^0.1.6",
"uglifyify": "^3.0.1",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.1.0",
"watchify": "^3.3.1"
"tiny-lr": "^2.0.0",
"uglifyify": "^5.0.2",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0",
"watchify": "^4.0.0",
"sass": "1.49.0"
},
"scripts": {
"pretest": "npm install",
@ -86,7 +87,6 @@
"test": "gulp unit && gulp reports",
"lint": "eslint ./"
},
"dependencies": {},
"browserify": {
"transform": [
"browserify-shim"