Skip to content

Commit 8f37fa4

Browse files
authored
Updating Node and Gulp for v12 (#263)
* update gulp to v4 and node to v12 * update bundler to 2.2
1 parent e6030eb commit 8f37fa4

File tree

6 files changed

+3852
-1845
lines changed

6 files changed

+3852
-1845
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ node_modules
1414
/compliance/*/cache
1515
/compliance/*/data
1616
/compliance/*/*.gz
17+
.bundle

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ DEPENDENCIES
6363
rouge
6464

6565
BUNDLED WITH
66-
1.16.2
66+
2.2.14

gulpfile.js

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,45 @@
22

33
const path = require('path');
44
const gulp = require('gulp');
5-
const gutil = require('gulp-util');
65
const sass = require('gulp-sass');
76
const sourcemaps = require('gulp-sourcemaps');
87
const exec = require('child_process').exec;
98

109
const PORT = process.env.PORT || '8000';
10+
1111
const USWDS_DIST = 'node_modules/uswds/dist';
1212
const USWDS_DIST_DIR = path.join(__dirname, ...USWDS_DIST.split('/'));
1313

14+
const PROJECT_SASS_SRC = "./assets/sass/**/*.scss";
15+
const PROJECT_CSS_DEST = './assets/css'
16+
17+
const PROJECT_ASSETS_SRC = `${USWDS_DIST}/@(js|fonts|img)/**/**`
18+
const PROJECT_ASSETS_DEST = './assets/vendor/uswds'
19+
20+
1421
gulp.task('copy-uswds-assets', () => {
15-
return gulp.src(`${USWDS_DIST}/@(js|fonts|img)/**/**`)
16-
.pipe(gulp.dest('./assets/vendor/uswds'));
22+
return gulp.src(PROJECT_ASSETS_SRC)
23+
.pipe(gulp.dest(PROJECT_ASSETS_DEST));
1724
});
1825

19-
gulp.task('sass', () => {
20-
return gulp.src('./assets/sass/**/*.scss')
26+
gulp.task('build-sass', () => {
27+
return gulp.src(PROJECT_SASS_SRC)
2128
.pipe(sourcemaps.init())
2229
.pipe(sass({
2330
includePaths: [
2431
path.join(USWDS_DIST_DIR, 'scss'),
2532
]
2633
}).on('error', sass.logError))
2734
.pipe(sourcemaps.write())
28-
.pipe(gulp.dest('./assets/css'));
35+
.pipe(gulp.dest(PROJECT_CSS_DEST));
2936
});
3037

31-
gulp.task('watch', ['default'], () => {
32-
gulp.watch('./assets/sass/**/*.scss', ['sass']);
38+
/** entry points **/
39+
40+
// gulp.task('init', gulp.series('copy-uswds-assets'));
41+
42+
gulp.task('watch', () => {
43+
gulp.watch(PROJECT_SASS_SRC, gulp.series('copy-uswds-assets','build-sass'));
3344
});
3445

35-
gulp.task('default', ['sass', 'copy-uswds-assets']);
46+
gulp.task('default', gulp.series('copy-uswds-assets', 'build-sass'));

manifest.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)