Merge branch 'release/1.6.0'

indiana-university · May 29, 2019 · a59c7b9 · a59c7b9
2 parents 57307ff + 8f218b4
commit a59c7b9
Show file tree

Hide file tree

Showing 32 changed files with 3,535 additions and 1,937 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,12 +18,12 @@ aliases:
   # Cache Management
   - &restore-node-modules
     keys:
-      - v1-node-modules-{{ checksum "package.json" }}
+      - v2-node-modules-{{ checksum "package.json" }}
 
   - &save-node-modules
     paths:
       - node_modules
-    key: v1-node-modules-{{ checksum "package.json" }}
+    key: v2-node-modules-{{ checksum "package.json" }}
 
   # Branch Filtering
   - &filter-only-master
@@ -40,7 +40,7 @@ aliases:
 defaults: &defaults
   working_directory: ~/rivet-source
   docker:
-    - image: circleci/node:7.10
+    - image: circleci/node:10
 
 jobs:
   build:

diff --git a/.eslintrc b/.eslintrc
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  'extends': 'eslint-config-rivet'
+}
diff --git a/gulpfile.js b/gulpfile.js
@@ -104,12 +104,19 @@ function prefixReleaseCSS() {
  * JS tasks
  */
 
-function lintJS() {
+function lintJSWatch() {
   return src(["src/js/**/*.js", "!node_modules/**", "!src/js/vendor.js"])
     .pipe(eslint())
     .pipe(eslint.format());
 }
 
+function lintJSBuild() {
+  return src(["src/js/**/*.js", "!node_modules/**", "!src/js/vendor.js"])
+    .pipe(eslint())
+    .pipe(eslint.format())
+    .pipe(eslint.failAfterError());
+}
+
 function concatJS() {
   return src([
     "src/js/polyfills/closest.js",
@@ -132,7 +139,7 @@ function vendorJS() {
 }
 
 function watchJS(callback) {
-  watch("src/js/**/*.js", { ignoreInitial: false }, series(concatJS, vendorJS));
+  watch("src/js/**/*.js", { ignoreInitial: false }, series(lintJSWatch, concatJS, vendorJS));
   callback();
 }
 
@@ -214,6 +221,7 @@ function example(callback) {
 
 exports.release = series(
   compileSass,
+  lintJSBuild,
   concatJS,
   compileCSS,
   prefixReleaseCSS,
@@ -229,6 +237,7 @@ exports.release = series(
 
 exports.build = series(
   compileSass,
+  lintJSBuild,
   concatJS,
   vendorJS,
   fractalBuild,
@@ -239,6 +248,7 @@ exports.fractalBuild = fractalBuild;
 
 exports.headless = series(compileSass,
   lintSass,
+  lintJSWatch,
   concatJS,
   fractalHeadless,
   watchSass,
@@ -248,6 +258,7 @@ exports.headless = series(compileSass,
 exports.default = series(
   compileSass,
   lintSass,
+  lintJSWatch,
   concatJS,
   fractalStart,
   watchSass,