chore: remove fione submodule

liriliri · Dec 4, 2022 · 339553e · 339553e
1 parent 5fe32e5
commit 339553e
Show file tree

Hide file tree

Showing 12 changed files with 115 additions and 2,319 deletions.
diff --git a/.eustia.js b/.eustia.js
@@ -1,10 +1,4 @@
 module.exports = {
-  fione: {
-    library: ['fione', 'node_modules/eustia-module'],
-    files: 'src/**/*.js',
-    output: 'src/lib/fione.js',
-    format: 'es',
-  },
   test: {
     library: ['node_modules/eustia-module'],
     files: ['test/*.js', 'test/*.html'],

diff --git a/.gitmodules b/.gitmodules
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,3 @@
 test/util.js
-src/lib/fione.js
 eruda.js
 eruda.min.js
diff --git a/fione b/fione
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "build:analyser": "webpack --config build/webpack.analyser.js",
     "dev": "webpack-dev-server --config build/webpack.dev.js --host 0.0.0.0",
     "test": "karma start",
-    "format": "lsla prettier *.{js,ts} src/**/*.{js,scss,css} build/*.js test/*.{js,html} --write",
+    "format": "lsla prettier \"*.{js,ts}\" \"src/**/*.{js,scss,css}\" \"build/*.js\" \"test/*.{js,html}\" --write",
     "lint": "eslint src/**/*.js",
     "lint:fix": "npm run lint -- --fix",
     "es5": "es-check es5 dist/eruda.js",

diff --git a/src/Elements/Elements.js b/src/Elements/Elements.js
@@ -3,32 +3,30 @@ import CssStore from './CssStore'
 import Highlight from './Highlight'
 import Select from './Select'
 import Settings from '../Settings/Settings'
-import {
-  $,
-  keys,
-  MutationObserver,
-  each,
-  toStr,
-  isEl,
-  isStr,
-  map,
-  escape,
-  startWith,
-  isFn,
-  isBool,
-  safeGet,
-  isNaN,
-  isNum,
-  nextTick,
-  Emitter,
-  contain,
-  unique,
-  isNull,
-  trim,
-  lowerCase,
-  pick,
-} from '../lib/util'
-import { pxToNum } from '../lib/fione'
+import $ from 'licia/$'
+import keys from 'licia/keys'
+import MutationObserver from 'licia/MutationObserver'
+import each from 'licia/each'
+import toStr from 'licia/toStr'
+import isEl from 'licia/isEl'
+import isStr from 'licia/isStr'
+import map from 'licia/map'
+import escape from 'licia/escape'
+import startWith from 'licia/startWith'
+import isFn from 'licia/isFn'
+import isBool from 'licia/isBool'
+import safeGet from 'licia/safeGet'
+import isNaN from 'licia/isNaN'
+import isNum from 'licia/isNum'
+import nextTick from 'licia/nextTick'
+import Emitter from 'licia/Emitter'
+import contain from 'licia/contain'
+import unique from 'licia/unique'
+import isNull from 'licia/isNull'
+import trim from 'licia/trim'
+import lowerCase from 'licia/lowerCase'
+import pick from 'licia/pick'
+import { pxToNum } from '../lib/util'
 import { isErudaEl } from '../lib/extraUtil'
 import evalCss from '../lib/evalCss'
 

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

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

diff --git a/src/Resources/Resources.js b/src/Resources/Resources.js
@@ -1,25 +1,23 @@
 import Tool from '../DevTools/Tool'
 import Settings from '../Settings/Settings'
-import {
-  $,
-  unique,
-  each,
-  isStr,
-  startWith,
-  trim,
-  orientation,
-  sameOrigin,
-  ajax,
-  MutationObserver,
-  toArr,
-  concat,
-  isNull,
-  lowerCase,
-  contain,
-  filter,
-  map,
-} from '../lib/util'
-import { safeStorage } from '../lib/fione'
+import $ from 'licia/$'
+import unique from 'licia/unique'
+import each from 'licia/each'
+import isStr from 'licia/isStr'
+import startWith from 'licia/startWith'
+import trim from 'licia/trim'
+import orientation from 'licia/orientation'
+import sameOrigin from 'licia/sameOrigin'
+import ajax from 'licia/ajax'
+import MutationObserver from 'licia/MutationObserver'
+import toArr from 'licia/toArr'
+import concat from 'licia/concat'
+import isNull from 'licia/isNull'
+import lowerCase from 'licia/lowerCase'
+import contain from 'licia/contain'
+import filter from 'licia/filter'
+import map from 'licia/map'
+import { safeStorage } from '../lib/util'
 import { isErudaEl } from '../lib/extraUtil'
 import evalCss from '../lib/evalCss'
 import chobitsu from '../lib/chobitsu'

diff --git a/src/Snippets/defSnippets.js b/src/Snippets/defSnippets.js
@@ -1,17 +1,15 @@
 import logger from '../lib/logger'
 import emitter from '../lib/emitter'
-import {
-  Url,
-  now,
-  each,
-  isStr,
-  startWith,
-  $,
-  upperFirst,
-  loadJs,
-  trim,
-} from '../lib/util'
-import { safeStorage } from '../lib/fione'
+import Url from 'licia/Url'
+import now from 'licia/now'
+import each from 'licia/each'
+import isStr from 'licia/isStr'
+import startWith from 'licia/startWith'
+import $ from 'licia/$'
+import upperFirst from 'licia/upperFirst'
+import loadJs from 'licia/loadJs'
+import trim from 'licia/trim'
+import { safeStorage } from '../lib/util'
 import { isErudaEl } from '../lib/extraUtil'
 import evalCss from '../lib/evalCss'