Browse Source

chore: Updated fuse-box to 2.1.0

NGPixel 8 years ago
parent
commit
4adf994c90
4 changed files with 25 additions and 9 deletions
  1. 7 1
      client/scss/components/editor.scss
  2. 1 2
      fuse.js
  3. 1 1
      package.json
  4. 16 5
      yarn.lock

+ 7 - 1
client/scss/components/editor.scss

@@ -374,11 +374,17 @@ main > .ace-container {
   background-color: mc('blue-grey', '100');
 
   &-item {
-    background-color: mc('blue-grey', '50');
+    background-color: mc('blue-grey', '500');
+    padding: 5px;
 
     &:first-child {
       margin-top: 60px;
     }
+
+    & + .editor-sd-item {
+      margin-top: 5px;
+    }
+
   }
 
 }

+ 1 - 2
fuse.js

@@ -83,7 +83,6 @@ globalTasks.then(() => {
     homeDir: './client',
     output: './assets/js/$name.min.js',
     alias: ALIASES,
-    shim: SHIMS,
     plugins: [
       fsbx.EnvPlugin({ NODE_ENV: (dev) ? 'development' : 'production' }),
       fsbx.VuePlugin(),
@@ -106,7 +105,7 @@ globalTasks.then(() => {
     })
   }
 
-  const bundleApp = fuse.bundle('app').instructions('> index.js')
+  const bundleApp = fuse.bundle('app').shim(SHIMS).instructions('> index.js')
   const bundleSetup = fuse.bundle('configure').instructions('> configure.js')
 
   switch (mode) {

+ 1 - 1
package.json

@@ -139,7 +139,7 @@
     "eslint-plugin-node": "^5.0.0",
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-standard": "^3.0.1",
-    "fuse-box": "^2.0.2",
+    "fuse-box": "^2.1.0",
     "i18next-xhr-backend": "^1.4.2",
     "jest": "^20.0.4",
     "jquery": "^3.2.1",

+ 16 - 5
yarn.lock

@@ -1124,6 +1124,10 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
+chain-able@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/chain-able/-/chain-able-1.0.1.tgz#b48ac9bdc18f2192ec730abc66609f90aab5605f"
+
 chalk@1.1.3, chalk@^1.0.0, chalk@^1.1, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -2513,6 +2517,12 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
+fliplog@^0.3.10:
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/fliplog/-/fliplog-0.3.10.tgz#e8b9c1ecfd38b9b2fffa3339b380d605e379c29f"
+  dependencies:
+    chain-able "^1.0.1"
+
 follow-redirects@1.2.3, follow-redirects@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.3.tgz#01abaeca85e3609837d9fcda3167a7e42fdaca21"
@@ -2618,9 +2628,9 @@ functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
 
-fuse-box@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/fuse-box/-/fuse-box-2.0.2.tgz#f1171f1c7d5a584dc8151dbfbb50f739c1477b82"
+fuse-box@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fuse-box/-/fuse-box-2.1.0.tgz#df468f0dea9567b2119829d99c6c5da18485bfa2"
   dependencies:
     acorn "^4.0.3"
     acorn-es7 "^0.1.0"
@@ -2633,6 +2643,7 @@ fuse-box@^2.0.2:
     concat-with-sourcemaps "^1.0.4"
     escodegen "^1.8.1"
     express "^4.14.0"
+    fliplog "^0.3.10"
     fs-extra "^2.0.0"
     fuse-tools "^1.0.4"
     glob "^7.1.1"
@@ -4606,11 +4617,11 @@ mute-stream@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
 
-mute-stream@0.0.6:
+mute-stream@0.0.6, mute-stream@~0.0.4:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db"
 
-mute-stream@0.0.7, mute-stream@~0.0.4:
+mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"