From 1ac84d2b5b9026782e27d86300952d5fbc759fce Mon Sep 17 00:00:00 2001
From: eight <eight04@gmail.com>
Date: Sun, 2 Sep 2018 17:03:12 +0800
Subject: [PATCH] Fix: csslint-loader -> parserlib-loader

---
 background/csslint-loader.js   | 41 ----------------------------------
 background/parserlib-loader.js |  9 ++++++++
 js/usercss.js                  |  2 +-
 3 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 background/csslint-loader.js
 create mode 100644 background/parserlib-loader.js

diff --git a/background/csslint-loader.js b/background/csslint-loader.js
deleted file mode 100644
index dfe7811f..00000000
--- a/background/csslint-loader.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/* global importScripts parserlib CSSLint parseMozFormat */
-'use strict';
-
-const CSSLINT_PATH = '/vendor-overwrites/csslint/';
-importScripts(CSSLINT_PATH + 'parserlib.js');
-
-parserlib.css.Tokens[parserlib.css.Tokens.COMMENT].hide = false;
-
-self.onmessage = ({data}) => {
-
-  const {action = 'run'} = data;
-
-  if (action === 'parse') {
-    if (!self.parseMozFormat) self.importScripts('/js/moz-parser.js');
-    self.postMessage(parseMozFormat(data));
-    return;
-  }
-
-  if (!self.CSSLint) self.importScripts(CSSLINT_PATH + 'csslint.js');
-
-  switch (action) {
-    case 'getAllRuleIds':
-      // the functions are non-tranferable and we need only an id
-      self.postMessage(CSSLint.getRules().map(rule => rule.id));
-      return;
-
-    case 'getAllRuleInfos':
-      // the functions are non-tranferable
-      self.postMessage(CSSLint.getRules().map(rule => JSON.parse(JSON.stringify(rule))));
-      return;
-
-    case 'run': {
-      const {code, config} = data;
-      const results = CSSLint.verify(code, config).messages
-        //.filter(m => !m.message.includes('/*[[') && !m.message.includes(']]*/'))
-        .map(m => Object.assign(m, {rule: {id: m.rule.id}}));
-      self.postMessage(results);
-      return;
-    }
-  }
-};
diff --git a/background/parserlib-loader.js b/background/parserlib-loader.js
new file mode 100644
index 00000000..8275e8fd
--- /dev/null
+++ b/background/parserlib-loader.js
@@ -0,0 +1,9 @@
+/* global importScripts parserlib CSSLint parseMozFormat */
+'use strict';
+
+importScripts('/vendor-overwrites/csslint/parserlib.js', '/js/moz-parser.js');
+parserlib.css.Tokens[parserlib.css.Tokens.COMMENT].hide = false;
+
+self.onmessage = ({data}) => {
+  self.postMessage(parseMozFormat(data));
+};
diff --git a/js/usercss.js b/js/usercss.js
index 9d54bc01..804a3025 100644
--- a/js/usercss.js
+++ b/js/usercss.js
@@ -599,7 +599,7 @@ var usercss = (() => {
 
   function invokeWorker(message) {
     if (!worker.queue) {
-      worker.instance = new Worker('/background/csslint-loader.js');
+      worker.instance = new Worker('/background/parserlib-loader.js');
       worker.queue = [];
       worker.instance.onmessage = ({data}) => {
         worker.queue.shift().resolve(data.__ERROR__ ? Promise.reject(data.__ERROR__) : data);