Merge branch 'master' into modular-spacing-tweak-b

* master: 72 main nav (#264)
SU-SWS · Mar 6, 2019 · 5abf6ea · 5abf6ea
2 parents 51197f7 + 33d92a7
commit 5abf6ea
Show file tree

Hide file tree

Showing 41 changed files with 2,470 additions and 140 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -3,7 +3,7 @@ engines:
   # https://docs.codeclimate.com/docs/eslint
   # ES Linting requires an .eslintrc file to tweak checks.
   eslint:
-    enabled: false
+    enabled: true
   markdownlint:
     enabled: true
     checks:
@@ -80,5 +80,7 @@ exclude_patterns:
 - "node_modules"
 - "styleguide"
 - "kss/**/*"
-- "core/js"
 - "core/scss/core/_normalize.scss"
+- "Gruntfile.js"
+- "composer.json"
+- "package.json"
diff --git a/.eslintrc b/.eslintrc
@@ -1,13 +1,36 @@
 {
   "extends": "eslint:recommended",
   "env": {
-    "browser": true
+    "browser": true,
+    "es6": true
   },
   "globals": {
     "domready": true
   },
+  "ecmaFeatures": {
+    "arrowFunctions": true,
+    "blockBindings": true,
+    "classes": true,
+    "defaultParameters": true,
+    "destructuring": true,
+    "forOf": true,
+    "generators": true,
+    "modules": true,
+    "objectLiteralComputedProperties": true,
+    "objectLiteralDuplicateProperties": true,
+    "objectLiteralShorthandMethods": true,
+    "objectLiteralShorthandProperties": true,
+    "regexUFlag": true,
+    "regexYFlag": true,
+    "restParams": true,
+    "spread": true,
+    "superInFunctions": true,
+    "templateStrings": true,
+    "unicodeCodePointEscapes": true,
+    "globalReturn": true
+  },
   "rules": {
-    // Errors.
+    "max-len": [2, 80, 2, {"ignoreUrls": true}],
     "array-bracket-spacing": [2, "never"],
     "block-scoped-var": 2,
     "brace-style": [2, "stroustrup", {"allowSingleLine": true}],
@@ -73,7 +96,6 @@
     "spaced-comment": [2, "always"],
     "strict": [2, "function"],
     "yoda": [2, "never"],
-    // Warnings.
     "max-nested-callbacks": [1, 3],
     "valid-jsdoc": [1, {
       "prefer": {

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -46,13 +46,6 @@ module.exports = function(grunt) {
       },
       target: ['core/scss/\*\*/\*.scss']
     },
-    uglify: {
-      my_target: {
-        files: {
-          'core/js/decanter.min.js': 'core/js/decanter.js',
-        }
-      }
-    },
     postcss: {
       options: {
         map: true, // inline sourcemaps
@@ -76,8 +69,7 @@ module.exports = function(grunt) {
         }
       },
       jsmin: {
-        files: ['core/**/*.js'],
-        tasks: ['uglify']
+        files: ['core/**/*.js']
       },
       twig: {
         files: ['**/*.twig', '**/*.json'],
@@ -143,7 +135,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-run');
   grunt.loadNpmTasks('grunt-browser-sync');
   grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-sass');
   grunt.loadNpmTasks('grunt-sass-lint');
   grunt.loadNpmTasks('grunt-contrib-watch');
@@ -152,9 +143,9 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-copy');
 
   grunt.registerTask('deploy', ['styleguide', 'deploy_site:styleguide', 'clean:postdeploy']);
-  grunt.registerTask('styleguide', ['compile', 'uglify', 'clean:styleguide', 'run:styleguide', 'copy:styleguide']);
+  grunt.registerTask('styleguide', ['compile', 'clean:styleguide', 'run:styleguide', 'copy:styleguide']);
   grunt.registerTask('compile', ['sass:dist', 'postcss:dist']);
   grunt.registerTask('dev', ['styleguide', 'browserSync', 'watch']);
-  grunt.registerTask('default', ['watch']);
+  grunt.registerTask('default', ['dev']);
 
 }