Merge pull request #194 from atom-ide-community/upstream_master

Author: aminya

apm/package-lock.json

@@ -43,7 +43,7 @@
     "chart.js": "^2.3.0",
     "clear-cut": "^2.0.2",
     "coffee-script": "1.12.7",
-    "color": "^0.7.3",
+    "color": "3.1.2",
     "command-palette": "https://www.atom.io/api/packages/command-palette/versions/0.43.5/tarball",
     "dalek": "file:packages/dalek",
     "dedent": "^0.7.0",
@@ -89,7 +89,7 @@
     "language-go": "https://www.atom.io/api/packages/language-go/versions/0.47.2/tarball",
     "language-html": "https://www.atom.io/api/packages/language-html/versions/0.53.1/tarball",
     "language-hyperlink": "https://www.atom.io/api/packages/language-hyperlink/versions/0.17.1/tarball",
-    "language-java": "https://www.atom.io/api/packages/language-java/versions/0.31.5/tarball",
+    "language-java": "https://www.atom.io/api/packages/language-java/versions/0.32.0/tarball",
     "language-javascript": "https://www.atom.io/api/packages/language-javascript/versions/0.134.1/tarball",
     "language-json": "https://www.atom.io/api/packages/language-json/versions/1.0.5/tarball",
     "language-less": "https://www.atom.io/api/packages/language-less/versions/0.34.3/tarball",
@@ -135,7 +135,7 @@
     "open-on-github": "https://www.atom.io/api/packages/open-on-github/versions/1.3.2/tarball",
     "package-generator": "https://www.atom.io/api/packages/package-generator/versions/1.3.0/tarball",
     "pathwatcher": "8.1.0",
-    "postcss": "8.0.9",
+    "postcss": "8.1.1",
     "postcss-selector-parser": "2.2.1",
     "prebuild-install": "5.3.5",
     "property-accessors": "^1.1.3",
@@ -147,7 +147,7 @@
     "semver": "7.3.2",
     "service-hub": "^0.7.4",
     "settings-view": "https://www.atom.io/api/packages/settings-view/versions/0.261.5/tarball",
-    "sinon": "9.0.3",
+    "sinon": "9.1.0",
     "snippets": "https://www.atom.io/api/packages/snippets/versions/1.5.1/tarball",
     "solarized-dark-syntax": "file:packages/solarized-dark-syntax",
     "solarized-light-syntax": "file:packages/solarized-light-syntax",
@@ -240,7 +240,7 @@
     "language-go": "0.47.2",
     "language-html": "0.53.1",
     "language-hyperlink": "0.17.1",
-    "language-java": "0.31.5",
+    "language-java": "0.32.0",
     "language-javascript": "0.134.1",
     "language-json": "1.0.5",
     "language-less": "0.34.3",

package-lock.json

@@ -40,7 +40,7 @@ const EXCLUDE_REGEXPS_SOURCES = [
     path.join('get-parameter-names', 'node_modules', '.bin', 'testla')
   ),
   escapeRegExp(path.join('jasmine-reporters', 'ext')),
-  escapeRegExp(path.join('node_modules', 'nan')),
+  escapeRegExp(path.join('node_modules', 'nan')) + '\\b',
   escapeRegExp(path.join('node_modules', 'native-mate')),
   escapeRegExp(path.join('build', 'binding.Makefile')),
   escapeRegExp(path.join('build', 'config.gypi')),

package.json

@@ -18,6 +18,7 @@ module.exports = class Color {
         if (Array.isArray(value)) {
           return null;
         }
+        value = Object.values(value);
         break;
       default:
         return null;
@@ -28,7 +29,7 @@ module.exports = class Color {
     }
 
     try {
-      var parsedColor = new ParsedColor(value);
+      var parsedColor = ParsedColor(value);
     } catch (error) {
       return null;
     }