fix some bugs

gdh1995 · Oct 18, 2020 · cc46d81 · cc46d81
1 parent 45e9e2d
commit cc46d81
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/background/main.ts b/background/main.ts
@@ -1,5 +1,6 @@
 import { runtimeError_, getTabUrl, tabsGet, browserTabs, tabsCreate, browserSessions, browser_ } from "./browser"
 import { contentPayload, cPort, needIcon_, reqH_, settings, set_cPort, set_needIcon_, set_visualWordsRe_ } from "./store"
+import "./ui_css"
 import {
   framesForTab, indexFrame, findCPort, framesForOmni, OnConnect, isExtIdAllowed, getPortUrl, showHUD, complainLimits
 } from "./ports"

diff --git a/background/ui_css.ts b/background/ui_css.ts
@@ -29,7 +29,8 @@ const StyleCacheId_ = settings.CONST_.VerCode_ + ","
 
 const loadCSS = (action: MergeAction, cssStr?: string): SettingsNS.MergedCustomCSS | void => {
   if (action === MergeAction.virtual) {
-    return mergeCSS(cssStr!, MergeAction.virtual)
+    mergeCSS(cssStr!, MergeAction.virtual)
+    return
   }
   {
     let findCSSStr: string | null | false

diff --git a/gulpfile.js b/gulpfile.js
@@ -291,7 +291,7 @@ var Tasks = {
     var exArgs = { nameCache: gulpUtils.loadNameCache("bg", cacheNames, getNameCacheFilePath),
         nameCachePath: getNameCacheFilePath("bg") };
     var deepcopy = require("deepcopy");
-    if (exArgs.nameCache.vars && exArgs.nameCache.props) {
+    if (!FORCED_NO_MINIFY && exArgs.nameCache.vars && exArgs.nameCache.props) {
       let {vars: {props: vars}, props: {props: props}} = exArgs.nameCache;
       var browser = getNonNullBuildItem("BTypes");
       if ("$OnOther" in vars
@@ -941,6 +941,7 @@ function loadTerserConfig(reload) {
       a.mangle = false;
       a.format.beautify = true
       a.format.indent_level = 2
+      a.compress.sequences = false
     }
     a.ecma = outputES6 ? 6 : 5
   }