Merge branch 'hotfix/#20'

6XGate · Jan 14, 2020 · 6ebd319 · 6ebd319
2 parents a02c34a + 66f2863
commit 6ebd319
Show file tree

Hide file tree

Showing 7 changed files with 464 additions and 420 deletions.
diff --git a/build/webpack-packer.js b/build/webpack-packer.js
@@ -145,6 +145,16 @@ class Packer {
                     },
                 },
             },
+            scss: {
+                loader:  "sass-loader",
+                options: {
+                    sourceMap:      true,
+                    implementation: require("sass"),
+                    sassOptions:    {
+                        fiber: require("fibers"),
+                    },
+                },
+            },
             file: {
                 loader:  "file-loader",
                 options: {
@@ -174,14 +184,23 @@ class Packer {
                 ],
             },
             sass: {
-                test: (/\.s[ac]ss$/u),
+                test: (/\.sass$/u),
                 use:  [
                     loaders.style,
                     loaders.css,
                     loaders.resolveUrl,
                     loaders.sass,
                 ],
             },
+            scss: {
+                test: (/\.scss$/u),
+                use:  [
+                    loaders.style,
+                    loaders.css,
+                    loaders.resolveUrl,
+                    loaders.scss,
+                ],
+            },
             vue: {
                 test: (/\.vue$/u),
                 use:  [loaders.vue],
@@ -455,6 +474,7 @@ class Packer {
                     this[myRules].typeScript,
                     this[myRules].css,
                     this[myRules].sass,
+                    this[myRules].scss,
                     this[myRules].vue,
                     this[myRules].images,
                     this[myRules].fonts,

diff --git a/electron.packer.js b/electron.packer.js
@@ -29,6 +29,7 @@ packager.source(".").target("linux", "armhf").
         new RegExp("^/render", "u"),
         new RegExp("^/build", "u"),
         new RegExp("^/bridgecmdr$", "u"),
+        new RegExp("^/@types", "u"),
         new RegExp("^/[^/]+\\.txt$", "u"),
         new RegExp("^/[^/]+\\.md", "u"),
         new RegExp("^/[^/]+\\.dic", "u"),