chore: use licia module directly

liriliri · Sep 10, 2021 · 4d16ffe · 4d16ffe
1 parent d43ec69
commit 4d16ffe
Show file tree

Hide file tree

Showing 14 changed files with 2,675 additions and 8,633 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eustia.js b/.eustia.js
@@ -1,10 +1,8 @@
 module.exports = {
-  eruda: {
+  fione: {
     library: ['fione', 'node_modules/eustia-module'],
     files: 'src/**/*.js',
-    ignore: 'src/**/stringify.js',
-    output: 'src/lib/util.js',
-    exclude: ['createCfg'],
+    output: 'src/lib/fione.js',
     format: 'es',
   },
   test: {

diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,4 @@
-src/lib/util.js
 test/util.js
+src/lib/fione.js
 eruda.js
 eruda.min.js
diff --git a/src/Console/Log.js b/src/Console/Log.js
@@ -8,7 +8,6 @@ import {
   isPrimitive,
   wrap,
   defaults,
-  getObjType,
   isEl,
   toStr,
   toNum,
@@ -35,6 +34,7 @@ import {
   nextTick,
   linkify,
 } from '../lib/util'
+import { getObjType } from '../lib/fione'
 import evalCss from '../lib/evalCss'
 
 export default class Log extends Emitter {

diff --git a/src/Elements/Elements.js b/src/Elements/Elements.js
@@ -17,7 +17,6 @@ import {
   isFn,
   isBool,
   safeGet,
-  pxToNum,
   isNaN,
   isNum,
   nextTick,
@@ -29,6 +28,7 @@ import {
   lowerCase,
   pick,
 } from '../lib/util'
+import { pxToNum } from '../lib/fione'
 import { isErudaEl } from '../lib/extraUtil'
 import evalCss from '../lib/evalCss'
 

diff --git a/src/Elements/Highlight.js b/src/Elements/Highlight.js
@@ -1,4 +1,5 @@
-import { $, pxToNum, isStr, each, trim } from '../lib/util'
+import { $, isStr, each, trim } from '../lib/util'
+import { pxToNum } from '../lib/fione'
 import evalCss from '../lib/evalCss'
 
 export default class Highlight {

diff --git a/src/EntryBtn/EntryBtn.js b/src/EntryBtn/EntryBtn.js
@@ -1,7 +1,8 @@
 import Draggabilly from 'draggabilly'
 import emitter from '../lib/emitter'
 import Settings from '../Settings/Settings'
-import { Emitter, nextTick, pxToNum, orientation } from '../lib/util'
+import { Emitter, nextTick, orientation } from '../lib/util'
+import { pxToNum } from '../lib/fione'
 import evalCss from '../lib/evalCss'
 
 export default class EntryBtn extends Emitter {

diff --git a/src/Network/Network.js b/src/Network/Network.js
@@ -1,5 +1,6 @@
 import Tool from '../DevTools/Tool'
-import { getFileName, isEmpty, $, ms, trim, each, last } from '../lib/util'
+import { isEmpty, $, ms, trim, each, last } from '../lib/util'
+import { getFileName } from '../lib/fione'
 import evalCss from '../lib/evalCss'
 import chobitsu from 'chobitsu'
 

diff --git a/src/Resources/Resources.js b/src/Resources/Resources.js
@@ -3,7 +3,6 @@ import Settings from '../Settings/Settings'
 import {
   $,
   unique,
-  safeStorage,
   each,
   isStr,
   startWith,
@@ -20,6 +19,7 @@ import {
   filter,
   map,
 } from '../lib/util'
+import { safeStorage } from '../lib/fione'
 import { isErudaEl } from '../lib/extraUtil'
 import evalCss from '../lib/evalCss'
 import chobitsu from 'chobitsu'

diff --git a/src/Snippets/defSnippets.js b/src/Snippets/defSnippets.js
@@ -3,7 +3,6 @@ import emitter from '../lib/emitter'
 import {
   Url,
   now,
-  safeStorage,
   each,
   isStr,
   startWith,
@@ -12,6 +11,7 @@ import {
   loadJs,
   trim,
 } from '../lib/util'
+import { safeStorage } from '../lib/fione'
 import { isErudaEl } from '../lib/extraUtil'
 import evalCss from '../lib/evalCss'
 

diff --git a/src/eruda.js b/src/eruda.js
@@ -12,7 +12,7 @@ import Settings from './Settings/Settings'
 import emitter from './lib/emitter'
 import logger from './lib/logger'
 import extraUtil from './lib/extraUtil'
-import util from './lib/util'
+import * as util from './lib/util'
 import {
   isFn,
   isNum,