Merge pull request #237 from AtomLinter/arcanemagus/update-deps

Update dependencies and fix CI

Author: Arcanemagus

.circleci/config.yml

@@ -22,8 +22,11 @@ defaults: &defaults
         name: Node.js version
         command: node --version
     - run:
-        name: Install sass-lint
-        command: sudo npm install -g sass-lint
+        name: Install sass-lint globally
+        command: |
+          sudo npm install --global sass-lint && \
+          sudo rm -Rf ~/.npm
+        # Removes the .npm folder as the cache is partially polluted as root
     - run:
         name: Sass Lint version
         command: sass-lint --version
@@ -36,9 +39,6 @@ defaults: &defaults
     - run:
         name: APM version
         command: ${APM_SCRIPT_PATH} --version
-    - run:
-        name: Cleaning package
-        command: ${APM_SCRIPT_PATH} clean
     - run:
         name: Package APM package dependencies
         command: |
@@ -50,14 +50,17 @@ defaults: &defaults
     - run:
         name: Package dependencies
         command: ${APM_SCRIPT_PATH} install
+    - run:
+        name: Cleaning package
+        command: ${APM_SCRIPT_PATH} clean
     - run:
         name: Package specs
         command: ${ATOM_SCRIPT_PATH} --test spec
     # Cache node_modules
     - save_cache:
         paths:
           - node_modules
-        key: v1-dependencies-{{ checksum "package.json" }}
+        key: v2-dependencies-{{ .Branch }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json"}}
 
 jobs:
   checkout_code:
@@ -69,10 +72,15 @@ jobs:
       # Restore node_modules from the last build
       - restore_cache:
           keys:
-          # Get latest cache for this package.json
-          - v1-dependencies-{{ checksum "package.json" }}
-          # Fallback to the last available cache
-          - v1-dependencies
+          # Get latest cache for this package.json and pacakge-lock.json
+          - v2-dependencies-{{ .Branch }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json"}}
+          # Fallback to the current package.json
+          - v2-dependencies-{{ .Branch }}-{{ checksum "package.json" }}-
+          # Fallback to the last build for this branch
+          - v2-dependencies-{{ .Branch }}-
+          # Fallback to the last available master branch cache
+          - v2-dependencies-master-
+          # Don't go further down to prevent dependency issues from other branches
       # Save project state for next steps
       - persist_to_workspace:
           root: /tmp

.travis.yml

@@ -8,7 +8,7 @@ os:
 
 # Installed for linting the project
 language: node_js
-node_js: "6"
+node_js: "10"
 
 install:
   - npm install -g sass-lint

appveyor.yml

@@ -9,7 +9,7 @@ environment:
 
 install:
   # Install Node.js to run any configured linters
-  - ps: Install-Product node 6
+  - ps: Install-Product node 10
   - npm install -g sass-lint
 
 ### Generic setup follows ###

lib/helpers.js

@@ -115,7 +115,7 @@ export default {
    * @param  {number} severity severity from the sass-lint linter
    * @return {string}          severity for the Linter API
    */
-  getSeverity: severity => (severityMap.has(severity)
+  getSeverity: (severity) => (severityMap.has(severity)
     ? severityMap.get(severity)
     : 'info'
   ),

lib/main.js

@@ -71,7 +71,7 @@ export default {
   },
 
   deactivate() {
-    idleCallbacks.forEach(callbackID => window.cancelIdleCallback(callbackID));
+    idleCallbacks.forEach((callbackID) => window.cancelIdleCallback(callbackID));
     idleCallbacks.clear();
     return this.subs.dispose();
   },
@@ -96,7 +96,7 @@ export default {
     }
     if ((this.globalPath === '') && (prefixPath === null)) {
       const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-      const env = Object.assign({}, consistentEnv());
+      const env = { ...consistentEnv() };
       try {
         prefixPath = spawnSync(npmCommand, [
           'get',