Skip to content

Commit

Permalink
Merge pull request #3227 from uswds/dw-test-codeclimate
Browse files Browse the repository at this point in the history
Run prettier on project js [and test codeclimate]
  • Loading branch information
thisisdano committed Nov 20, 2019
2 parents 4e50b1b + c3b8460 commit 9d783d4
Show file tree
Hide file tree
Showing 38 changed files with 833 additions and 891 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -69,7 +69,7 @@ jobs:

workflows:
version: 2
build-and-publish-if-master:
circle-uswds:
jobs:
- build
- deploy:
Expand Down
25 changes: 3 additions & 22 deletions .codeclimate.yml
@@ -1,30 +1,11 @@
engines:
csslint:
enabled: false

eslint:
enabled: false

version: "2"
plugins:
duplication:
enabled: true
config:
languages:
- javascript

nodesecurity:
enabled: false

golint:
enabled: false

rubocop:
enabled: false

ratings:
paths:
- src/js/**/*.js

exclude_paths:
exclude_patterns:
- config/**/*.js
- dist/**/*.js
- spec/**/*
Expand Down
6 changes: 1 addition & 5 deletions config/gulp/browsers.js
@@ -1,5 +1 @@
module.exports = [
'> 2%',
'Last 2 versions',
'IE 11',
];
module.exports = ["> 2%", "Last 2 versions", "IE 11"];
59 changes: 24 additions & 35 deletions config/gulp/build.js
@@ -1,56 +1,45 @@
const gulp = require('gulp');
const del = require('del');
const dutil = require('./doc-util');
const cFlags = require('./cflags');
const gulp = require("gulp");
const del = require("del");
const dutil = require("./doc-util");
const cFlags = require("./cflags");

gulp.task('clean-dist', (done) => {
gulp.task("clean-dist", done => {
if (!cFlags.cleanup) {
dutil.logMessage(
'clean-dist',
'Skipping cleaning up the distribution directories.',
"clean-dist",
"Skipping cleaning up the distribution directories."
);
return done();
}
dutil.logMessage('clean-dist', 'Removing distribution directories.');
dutil.logMessage("clean-dist", "Removing distribution directories.");

return del('dist');
return del("dist");
});

gulp.task("docs", done => {
dutil.logMessage("docs", "Copying documentation dist dir");

gulp.task('docs', (done) => {
dutil.logMessage('docs', 'Copying documentation dist dir');

const stream = gulp.src([
'README.md',
'LICENSE.md',
'CONTRIBUTING.md',
])
.pipe(gulp.dest('dist'));
const stream = gulp
.src(["README.md", "LICENSE.md", "CONTRIBUTING.md"])
.pipe(gulp.dest("dist"));

done();
return stream;
});


gulp.task('build',
gulp.task(
"build",
gulp.series(
(done) => {
done => {
dutil.logIntroduction();
dutil.logMessage(
'build',
'Creating distribution directories.',
);
dutil.logMessage("build", "Creating distribution directories.");
done();
},
'clean-dist',
'docs',
gulp.parallel(
'sass',
'javascript',
'images',
'fonts',
),
"clean-dist",
"docs",
gulp.parallel("sass", "javascript", "images", "fonts"),
// We need to copy the Sass to dist *after* the sass task, to ensure
// that vendor libraries have been copied to the Sass directory first.
'copy-dist-sass',
));
"copy-dist-sass"
)
);
2 changes: 1 addition & 1 deletion config/gulp/cflags.js
@@ -1,4 +1,4 @@
module.exports = {
test: true,
cleanup: true,
cleanup: true
};
88 changes: 25 additions & 63 deletions config/gulp/doc-util.js
@@ -1,102 +1,64 @@
const log = require('fancy-log');
const colors = require('ansi-colors');
const notifier = require('node-notifier');
const pkg = require('../../package.json');
const log = require("fancy-log");
const colors = require("ansi-colors");
const notifier = require("node-notifier");
const pkg = require("../../package.json");

const shellPrefix = '$';
const shellPrefix = "$";

function drawFlag() {
log(
colors.white(''),
);
log(
colors.white('* * * * * ========================'),
);
log(
colors.white('* * * * * ========================'),
);
log(
colors.white('* * * * * ========================'),
);
log(
colors.white('* * * * * ========================'),
);
log(
colors.white('=================================='),
);
log(
colors.white('=================================='),
);
log(
colors.white('=================================='),
);
log(
colors.white(''),
);
log(colors.white(""));
log(colors.white("* * * * * ========================"));
log(colors.white("* * * * * ========================"));
log(colors.white("* * * * * ========================"));
log(colors.white("* * * * * ========================"));
log(colors.white("=================================="));
log(colors.white("=================================="));
log(colors.white("=================================="));
log(colors.white(""));
}

function notify(title, message, wait) {
notifier.notify({
title,
message,
icon: 'src/img/favicons/favicon-192.png',
wait,
icon: "src/img/favicons/favicon-192.png",
wait
});
}

module.exports = {
pkg: {
name: pkg.name,
version: pkg.version,
version: pkg.version
},

dirName: `${pkg.name}-${pkg.version}`,

logIntroduction(message) {
const introMessage = message || 'USWDS';
log(
colors.yellow(`${introMessage} v${pkg.version}`),
);
const introMessage = message || "USWDS";
log(colors.yellow(`${introMessage} v${pkg.version}`));
drawFlag();
},

logCommand(name, message) {
log(
shellPrefix,
colors.cyan(name),
colors.magenta(message),
);
log(shellPrefix, colors.cyan(name), colors.magenta(message));
},


logHelp(name, message) {
log(
shellPrefix,
colors.cyan(name),
colors.yellow(message),
);
log(shellPrefix, colors.cyan(name), colors.yellow(message));
},

logData(name, message) {
log(
colors.cyan(name),
colors.yellow(message),
);
log(colors.cyan(name), colors.yellow(message));
},

logError(name, message) {
log(
colors.red(name),
colors.yellow(message),
);
log(colors.red(name), colors.yellow(message));
notify(`${this.dirName} gulp ${name}`, message, true);
},

logMessage(name, message) {
log(
colors.cyan(name),
colors.green(message),
);
log(colors.cyan(name), colors.green(message));
notify(`${this.dirName} gulp ${name}`, message, false);
},
}
};
19 changes: 8 additions & 11 deletions config/gulp/flags.js
@@ -1,20 +1,17 @@
const gulp = require('gulp');
const dutil = require('./doc-util');
const cFlags = require('./cflags');
const gulp = require("gulp");
const dutil = require("./doc-util");
const cFlags = require("./cflags");

gulp.task('no-test', (done) => {
dutil.logMessage(
'no-test',
'Disabling linting and tests for all assets.',
);
gulp.task("no-test", done => {
dutil.logMessage("no-test", "Disabling linting and tests for all assets.");
cFlags.test = false;
done();
});

gulp.task('no-cleanup', (done) => {
gulp.task("no-cleanup", done => {
dutil.logMessage(
'no-cleanup',
'Disabling cleanup of distribution directories.',
"no-cleanup",
"Disabling cleanup of distribution directories."
);
cFlags.cleanup = false;
done();
Expand Down
13 changes: 6 additions & 7 deletions config/gulp/fonts.js
@@ -1,12 +1,11 @@
const gulp = require('gulp');
const dutil = require('./doc-util');
const gulp = require("gulp");
const dutil = require("./doc-util");

const task = 'fonts';
const task = "fonts";

gulp.task(task, (done) => {
dutil.logMessage(task, 'Copying Fonts');
const stream = gulp.src('src/fonts/**/*')
.pipe(gulp.dest('dist/fonts'));
gulp.task(task, done => {
dutil.logMessage(task, "Copying Fonts");
const stream = gulp.src("src/fonts/**/*").pipe(gulp.dest("dist/fonts"));

done();
return stream;
Expand Down
13 changes: 6 additions & 7 deletions config/gulp/images.js
@@ -1,12 +1,11 @@
const gulp = require('gulp');
const dutil = require('./doc-util');
const gulp = require("gulp");
const dutil = require("./doc-util");

const task = 'images';
const task = "images";

gulp.task(task, (done) => {
dutil.logMessage(task, 'Copying Images');
const stream = gulp.src('src/img/**/*')
.pipe(gulp.dest('dist/img'));
gulp.task(task, done => {
dutil.logMessage(task, "Copying Images");
const stream = gulp.src("src/img/**/*").pipe(gulp.dest("dist/img"));

done();
return stream;
Expand Down

0 comments on commit 9d783d4

Please sign in to comment.