Explorar el Código

chore: upgrade packages

Gerald hace 7 años
padre
commit
5111c559ad
Se han modificado 55 ficheros con 414 adiciones y 549 borrados
  1. 1 1
      .eslintrc.js
  2. 11 9
      package.json
  3. 3 1
      scripts/webpack.base.conf.js
  4. 6 6
      scripts/webpack.conf.js
  5. 6 4
      src/background/app.js
  6. 9 3
      src/background/sync/base.js
  7. 3 1
      src/background/sync/dropbox.js
  8. 5 3
      src/background/sync/googledrive.js
  9. 3 1
      src/background/sync/index.js
  10. 5 3
      src/background/sync/onedrive.js
  11. 1 1
      src/background/utils/cache.js
  12. 5 3
      src/background/utils/db.js
  13. 1 26
      src/background/utils/index.js
  14. 25 0
      src/background/utils/message.js
  15. 1 1
      src/background/utils/notifications.js
  16. 2 2
      src/background/utils/options.js
  17. 3 1
      src/background/utils/requests.js
  18. 2 2
      src/background/utils/tabs.js
  19. 1 1
      src/background/utils/tester.js
  20. 2 2
      src/background/utils/update.js
  21. 1 1
      src/background/utils/values.js
  22. 3 2
      src/common/browser.js
  23. 1 1
      src/common/tld.js
  24. 3 3
      src/common/ui/code.vue
  25. 1 1
      src/common/ui/icon.vue
  26. 1 1
      src/common/ui/locale-group.vue
  27. 5 5
      src/confirm/app.js
  28. 8 6
      src/confirm/views/app.vue
  29. 8 4
      src/injected/content/index.js
  30. 1 1
      src/injected/content/tabs.js
  31. 1 1
      src/injected/index.js
  32. 3 1
      src/injected/utils/index.js
  33. 1 1
      src/injected/web/download.js
  34. 3 1
      src/injected/web/index.js
  35. 7 5
      src/options/app.js
  36. 1 1
      src/options/utils/index.js
  37. 3 3
      src/options/views/edit/index.vue
  38. 2 2
      src/options/views/edit/settings.vue
  39. 2 2
      src/options/views/edit/values.vue
  40. 2 2
      src/options/views/feature.vue
  41. 8 8
      src/options/views/script-item.vue
  42. 11 9
      src/options/views/tab-installed.vue
  43. 5 5
      src/options/views/tab-settings/index.vue
  44. 4 4
      src/options/views/tab-settings/vm-blacklist.vue
  45. 4 4
      src/options/views/tab-settings/vm-css.vue
  46. 6 6
      src/options/views/tab-settings/vm-export.vue
  47. 3 3
      src/options/views/tab-settings/vm-import.vue
  48. 5 5
      src/options/views/tab-settings/vm-sync.vue
  49. 5 5
      src/popup/app.js
  50. 3 3
      src/popup/views/app.vue
  51. 1 1
      test/background/script.js
  52. 2 2
      test/background/tester.js
  53. 1 1
      test/common/index.js
  54. 1 1
      test/injected/helpers.js
  55. 203 377
      yarn.lock

+ 1 - 1
.eslintrc.js

@@ -18,7 +18,7 @@ module.exports = {
   'settings': {
     'import/resolver': {
       'webpack': {
-        'config': 'scripts/webpack.conf.js'
+        'config': 'scripts/webpack.base.conf.js'
       }
     }
   },

+ 11 - 9
package.json

@@ -9,7 +9,9 @@
     "analyze": "webpack --profile --json --config scripts/webpack.conf.js | webpack-bundle-size-analyzer",
     "analyze:json": "webpack --profile --json --config scripts/webpack.conf.js > stats.json",
     "i18n": "gulp i18n",
-    "lint": "eslint --ext .js,.vue . && gulp check",
+    "lint": "yarn lint:js && yarn lint:yml",
+    "lint:js": "eslint --ext .js,.vue .",
+    "lint:yml": "gulp check",
     "svgo": "svgo --config .svgo.yml src/resources/icons",
     "pretest": "cross-env NODE_ENV=test webpack --config scripts/webpack.test.conf.js",
     "test": "node dist/test",
@@ -25,11 +27,11 @@
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.6.0",
     "cross-env": "^5.0.5",
-    "css-loader": "^0.28.10",
+    "css-loader": "^1.0.0",
     "del": "^3.0.0",
-    "eslint": "^4.18.1",
-    "eslint-config-airbnb-base": "^12.0.0",
-    "eslint-import-resolver-webpack": "^0.8.3",
+    "eslint": "^5.2.0",
+    "eslint-config-airbnb-base": "^13.0.0",
+    "eslint-import-resolver-webpack": "^0.10.1",
     "eslint-plugin-html": "^4.0.1",
     "eslint-plugin-import": "^2.9.0",
     "extract-text-webpack-plugin": "^3.0.0",
@@ -39,24 +41,24 @@
     "gulp-filter": "^5.0.1",
     "gulp-plumber": "^1.1.0",
     "gulp-uglify": "^3.0.0",
-    "html-webpack-plugin": "^2.30.1",
+    "html-webpack-plugin": "^3.2.0",
     "husky": "^0.15.0-rc.13",
     "js-yaml": "^3.9.1",
     "plugin-error": "^1.0.0",
     "postcss-loader": "^2.0.6",
-    "postcss-scss": "1.0.4",
+    "postcss-scss": "2.0.0",
     "precss": "^3.1.1",
     "svg-sprite-loader": "^3.5.1",
     "svgo": "^1.0.3",
     "tape": "^4.9.0",
     "through2": "^2.0.3",
     "vinyl": "^2.1.0",
-    "vue-loader": "^14.1.1",
+    "vue-loader": "^15.2.6",
     "vue-style-loader": "^4.0.2",
     "vue-template-compiler": "^2.4.2",
     "webpack": "^3.5.6",
     "webpack-bundle-size-analyzer": "^2.7.0",
-    "wrapper-webpack-plugin": "^1.0.0"
+    "wrapper-webpack-plugin": "1"
   },
   "author": "Gerald <[email protected]>",
   "repository": {

+ 3 - 1
scripts/webpack.base.conf.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const webpack = require('webpack');
 const MinifyPlugin = require('babel-minify-webpack-plugin');
+const VueLoaderPlugin = require('vue-loader/lib/plugin');
 const vueLoaderConfig = require('./vue-loader.conf');
 const { isDev, isProd, styleRule, definitions } = require('./utils');
 
@@ -23,7 +24,7 @@ module.exports = {
     modules: [resolve('node_modules')],
     extensions: ['.js', '.vue'],
     alias: {
-      src: resolve('src'),
+      '#': resolve('src'),
     }
   },
   module: {
@@ -53,6 +54,7 @@ module.exports = {
   devtool: isDev ? '#inline-source-map' : false,
   plugins: [
     definePlugin,
+    new VueLoaderPlugin(),
     isProd && new MinifyPlugin(),
   ].filter(Boolean),
 };

+ 6 - 6
scripts/webpack.conf.js

@@ -8,11 +8,11 @@ const base = require('./webpack.base.conf');
 const { isProd, merge, INIT_FUNC_NAME } = require('./utils');
 
 const entry = {
-  'background/app': 'src/background/app.js',
-  'options/app': 'src/options/app.js',
-  'confirm/app': 'src/confirm/app.js',
-  'popup/app': 'src/popup/app.js',
-  injected: 'src/injected/index.js',
+  'background/app': './src/background/app.js',
+  'options/app': './src/options/app.js',
+  'confirm/app': './src/confirm/app.js',
+  'popup/app': './src/popup/app.js',
+  injected: './src/injected/index.js',
 };
 
 const targets = [];
@@ -60,7 +60,7 @@ targets.push(merge(base, {
 
 targets.push(merge(base, {
   entry: {
-    'injected-web': 'src/injected/web',
+    'injected-web': './src/injected/web',
   },
   output: {
     libraryTarget: 'commonjs2',

+ 6 - 4
src/background/app.js

@@ -1,6 +1,6 @@
-import 'src/common/browser';
-import { noop } from 'src/common';
-import { objectGet } from 'src/common/object';
+import '#/common/browser';
+import { noop } from '#/common';
+import { objectGet } from '#/common/object';
 import * as sync from './sync';
 import {
   cache,
@@ -19,7 +19,9 @@ import {
   sortScripts, getValueStoresByIds,
 } from './utils/db';
 import { resetBlacklist } from './utils/tester';
-import { setValueStore, updateValueStore, resetValueOpener, addValueOpener } from './utils/values';
+import {
+  setValueStore, updateValueStore, resetValueOpener, addValueOpener,
+} from './utils/values';
 
 const VM_VER = browser.runtime.getManifest().version;
 

+ 9 - 3
src/background/sync/base.js

@@ -1,6 +1,12 @@
-import { debounce, normalizeKeys, request, noop } from 'src/common';
-import { objectGet, objectSet, objectPick, objectPurify } from 'src/common/object';
-import { getEventEmitter, getOption, setOption, hookOptions, sendMessageOrIgnore } from '../utils';
+import {
+  debounce, normalizeKeys, request, noop,
+} from '#/common';
+import {
+  objectGet, objectSet, objectPick, objectPurify,
+} from '#/common/object';
+import {
+  getEventEmitter, getOption, setOption, hookOptions, sendMessageOrIgnore,
+} from '../utils';
 import {
   getScripts,
   getScriptCode,

+ 3 - 1
src/background/sync/dropbox.js

@@ -1,5 +1,7 @@
 import { loadQuery, dumpQuery } from '../utils';
-import { getURI, getItemFilename, BaseService, isScriptFile, register } from './base';
+import {
+  getURI, getItemFilename, BaseService, isScriptFile, register,
+} from './base';
 
 const config = {
   client_id: 'f0q12zup2uys5w8',

+ 5 - 3
src/background/sync/googledrive.js

@@ -1,10 +1,12 @@
 // Reference:
 // - https://developers.google.com/drive/v3/reference/files
 // - https://github.com/google/google-api-nodejs-client
-import { getUniqId } from 'src/common';
-import { objectGet } from 'src/common/object';
+import { getUniqId } from '#/common';
+import { objectGet } from '#/common/object';
 import { dumpQuery, notify } from '../utils';
-import { getURI, getItemFilename, BaseService, register, isScriptFile } from './base';
+import {
+  getURI, getItemFilename, BaseService, register, isScriptFile,
+} from './base';
 
 const SECRET_KEY = JSON.parse(window.atob('eyJjbGllbnRfc2VjcmV0IjoiTjBEbTZJOEV3bkJaeE1xMUpuMHN3UER0In0='));
 const config = Object.assign({

+ 3 - 1
src/background/sync/index.js

@@ -1,4 +1,6 @@
-import { checkAuthUrl, initialize, sync, getStates, authorize, revoke } from './base';
+import {
+  checkAuthUrl, initialize, sync, getStates, authorize, revoke,
+} from './base';
 import './dropbox';
 import './onedrive';
 import './googledrive';

+ 5 - 3
src/background/sync/onedrive.js

@@ -1,8 +1,10 @@
 // Reference: https://dev.onedrive.com/README.htm
-import { noop } from 'src/common';
-import { objectGet } from 'src/common/object';
+import { noop } from '#/common';
+import { objectGet } from '#/common/object';
 import { dumpQuery } from '../utils';
-import { getURI, getItemFilename, BaseService, isScriptFile, register } from './base';
+import {
+  getURI, getItemFilename, BaseService, isScriptFile, register,
+} from './base';
 
 const SECRET_KEY = JSON.parse(window.atob('eyJjbGllbnRfc2VjcmV0Ijoiajl4M09WRXRIdmhpSEtEV09HcXV5TWZaS2s5NjA0MEgifQ=='));
 const config = Object.assign({

+ 1 - 1
src/background/utils/cache.js

@@ -1,4 +1,4 @@
-import initCache from 'src/common/cache';
+import initCache from '#/common/cache';
 
 export default initCache({
   lifetime: 10 * 1000,

+ 5 - 3
src/background/utils/db.js

@@ -1,11 +1,13 @@
-import { i18n, request, buffer2string, getFullUrl, isRemote, getRnd4 } from 'src/common';
-import { objectGet, objectSet } from 'src/common/object';
+import {
+  i18n, request, buffer2string, getFullUrl, isRemote, getRnd4,
+} from '#/common';
+import { objectGet, objectSet } from '#/common/object';
 import { getNameURI, parseMeta, newScript } from './script';
 import { testScript, testBlacklist } from './tester';
 import { register } from './init';
 import patchDB from './patch-db';
 import { setOption } from './options';
-import { sendMessageOrIgnore } from '.';
+import { sendMessageOrIgnore } from './message';
 
 function cacheOrFetch(handle) {
   const requests = {};

+ 1 - 26
src/background/utils/index.js

@@ -1,5 +1,3 @@
-import { i18n, defaultImage, noop } from 'src/common';
-
 export cache from './cache';
 export setClipboard from './clipboard';
 export checkUpdate from './update';
@@ -9,27 +7,4 @@ export * from './options';
 export * from './requests';
 export * from './search';
 export { initialize } from './init';
-
-export function notify(options) {
-  browser.notifications.create(options.id || 'ViolentMonkey', {
-    type: 'basic',
-    iconUrl: defaultImage,
-    title: `${options.title} - ${i18n('extName')}`,
-    message: options.body,
-    isClickable: options.isClickable,
-  });
-}
-
-export function broadcast(data) {
-  browser.tabs.query({})
-  .then(tabs => {
-    tabs.forEach(tab => {
-      browser.tabs.sendMessage(tab.id, data)
-      .catch(noop);
-    });
-  });
-}
-
-export function sendMessageOrIgnore(...args) {
-  return browser.runtime.sendMessage(...args).catch(noop);
-}
+export * from './message';

+ 25 - 0
src/background/utils/message.js

@@ -0,0 +1,25 @@
+import { i18n, defaultImage, noop } from '#/common';
+
+export function notify(options) {
+  browser.notifications.create(options.id || 'ViolentMonkey', {
+    type: 'basic',
+    iconUrl: defaultImage,
+    title: `${options.title} - ${i18n('extName')}`,
+    message: options.body,
+    isClickable: options.isClickable,
+  });
+}
+
+export function broadcast(data) {
+  browser.tabs.query({})
+  .then(tabs => {
+    tabs.forEach(tab => {
+      browser.tabs.sendMessage(tab.id, data)
+      .catch(noop);
+    });
+  });
+}
+
+export function sendMessageOrIgnore(...args) {
+  return browser.runtime.sendMessage(...args).catch(noop);
+}

+ 1 - 1
src/background/utils/notifications.js

@@ -1,4 +1,4 @@
-import { i18n, defaultImage, noop } from 'src/common';
+import { i18n, defaultImage, noop } from '#/common';
 
 const openers = {};
 

+ 2 - 2
src/background/utils/options.js

@@ -1,5 +1,5 @@
-import { initHooks, debounce, normalizeKeys } from 'src/common';
-import { objectGet, objectSet } from 'src/common/object';
+import { initHooks, debounce, normalizeKeys } from '#/common';
+import { objectGet, objectSet } from '#/common/object';
 import { register } from './init';
 
 const defaults = {

+ 3 - 1
src/background/utils/requests.js

@@ -1,4 +1,6 @@
-import { getUniqId, request, i18n, buffer2string } from 'src/common';
+import {
+  getUniqId, request, i18n, buffer2string,
+} from '#/common';
 import cache from './cache';
 import { isUserScript, parseMeta } from './script';
 

+ 2 - 2
src/background/utils/tabs.js

@@ -1,5 +1,5 @@
-import { noop } from 'src/common';
-import { isFirefox, isAndroid } from 'src/common/ua';
+import { noop } from '#/common';
+import { isFirefox, isAndroid } from '#/common/ua';
 
 const openers = {};
 

+ 1 - 1
src/background/utils/tester.js

@@ -1,4 +1,4 @@
-import * as tld from 'src/common/tld';
+import * as tld from '#/common/tld';
 import cache from './cache';
 import { getOption, hookOptions } from './options';
 

+ 2 - 2
src/background/utils/update.js

@@ -1,8 +1,8 @@
-import { i18n, request } from 'src/common';
+import { i18n, request } from '#/common';
 import { parseScript } from './db';
 import { parseMeta, compareVersion } from './script';
 import { getOption } from './options';
-import { notify, sendMessageOrIgnore } from '.';
+import { notify, sendMessageOrIgnore } from './message';
 
 const processes = {};
 

+ 1 - 1
src/background/utils/values.js

@@ -1,4 +1,4 @@
-import { noop } from 'src/common';
+import { noop } from '#/common';
 import { getValueStoresByIds, dumpValueStores, dumpValueStore } from './db';
 
 const openers = {}; // scriptId: { openerId: 1, ... }

+ 3 - 2
src/common/browser.js

@@ -1,4 +1,4 @@
-import 'src/common/polyfills';
+import '#/common/polyfills';
 
 /* global chrome */
 
@@ -71,7 +71,8 @@ const meta = {
               // Ignore sendResponse error
             });
             return true;
-          } else if (typeof result !== 'undefined') {
+          }
+          if (typeof result !== 'undefined') {
             // In some browsers (e.g Chrome 56, Vivaldi), the listener in
             // popup pages are not properly cleared after closed.
             // They may send `undefined` before the real response is sent.

+ 1 - 1
src/common/tld.js

@@ -1,7 +1,7 @@
 import tldjs from 'tldjs';
 // import { fromUserSettings } from 'tldjs';
 // import Trie from 'tldjs/lib/suffix-trie';
-// import { request } from 'src/common';
+// import { request } from '#/common';
 
 // let tldjs;
 

+ 3 - 3
src/common/ui/code.vue

@@ -58,9 +58,9 @@ import 'codemirror/addon/search/searchcursor';
 import 'codemirror/addon/selection/active-line';
 import CodeMirror from 'codemirror';
 import Tooltip from 'vueleton/lib/tooltip';
-import { debounce } from 'src/common';
-import ToggleButton from 'src/common/ui/toggle-button';
-import options from 'src/common/options';
+import { debounce } from '#/common';
+import ToggleButton from '#/common/ui/toggle-button';
+import options from '#/common/options';
 
 /* eslint-disable no-control-regex */
 const MAX_LINE_LENGTH = 50 * 1024;

+ 1 - 1
src/common/ui/icon.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-const requireIcon = require.context('src/resources/icons', false, /\.svg$/);
+const requireIcon = require.context('#/resources/icons', false, /\.svg$/);
 requireIcon.keys().map(key => requireIcon(key));
 
 export default {

+ 1 - 1
src/common/ui/locale-group.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { i18n } from 'src/common';
+import { i18n } from '#/common';
 
 const SEP = '¥¥';
 

+ 5 - 5
src/confirm/app.js

@@ -1,9 +1,9 @@
-import 'src/common/browser';
+import '#/common/browser';
 import Vue from 'vue';
-import { i18n } from 'src/common';
-import 'src/common/handlers';
-import options from 'src/common/options';
-import 'src/common/ui/style';
+import { i18n } from '#/common';
+import '#/common/handlers';
+import options from '#/common/options';
+import '#/common/ui/style';
 import App from './views/app';
 import './style.css';
 

+ 8 - 6
src/confirm/views/app.vue

@@ -29,12 +29,14 @@
 
 <script>
 import Dropdown from 'vueleton/lib/dropdown';
-import { sendMessage, leftpad, request, buffer2string, isRemote, getFullUrl } from 'src/common';
-import options from 'src/common/options';
-import initCache from 'src/common/cache';
-import VmCode from 'src/common/ui/code';
-import SettingCheck from 'src/common/ui/setting-check';
-import { route } from 'src/common/router';
+import {
+  sendMessage, leftpad, request, buffer2string, isRemote, getFullUrl,
+} from '#/common';
+import options from '#/common/options';
+import initCache from '#/common/cache';
+import VmCode from '#/common/ui/code';
+import SettingCheck from '#/common/ui/setting-check';
+import { route } from '#/common/router';
 
 const cache = initCache({});
 

+ 8 - 4
src/injected/content/index.js

@@ -1,10 +1,14 @@
-import { isFirefox } from 'src/common/ua';
-import { getUniqId } from 'src/common';
-import { bindEvents, sendMessage, inject, attachFunction } from '../utils';
+import { isFirefox } from '#/common/ua';
+import { getUniqId } from '#/common';
+import {
+  bindEvents, sendMessage, inject, attachFunction,
+} from '../utils';
 import bridge from './bridge';
 import { tabOpen, tabClose, tabClosed } from './tabs';
 import { onNotificationCreate, onNotificationClick, onNotificationClose } from './notifications';
-import { getRequestId, httpRequest, abortRequest, httpRequested } from './requests';
+import {
+  getRequestId, httpRequest, abortRequest, httpRequested,
+} from './requests';
 import dirtySetClipboard from './clipboard';
 
 const IS_TOP = window.top === window;

+ 1 - 1
src/injected/content/tabs.js

@@ -1,4 +1,4 @@
-import { getFullUrl } from 'src/common';
+import { getFullUrl } from '#/common';
 import { sendMessage } from '../utils';
 import bridge from './bridge';
 

+ 1 - 1
src/injected/index.js

@@ -1,4 +1,4 @@
-import 'src/common/browser';
+import '#/common/browser';
 import { inject, getUniqId, sendMessage } from './utils';
 import initialize from './content';
 

+ 3 - 1
src/injected/utils/index.js

@@ -1,6 +1,8 @@
 import { CustomEvent, jsonDump, jsonLoad } from './helpers';
 
-export { sendMessage, request, throttle, cache2blobUrl } from 'src/common';
+export {
+  sendMessage, request, throttle, cache2blobUrl,
+} from '#/common';
 
 export function postData(destId, data) {
   // Firefox issue: data must be stringified to avoid cross-origin problem

+ 1 - 1
src/injected/web/download.js

@@ -1,4 +1,4 @@
-import { downloadBlob } from 'src/common/download';
+import { downloadBlob } from '#/common/download';
 import { onRequestCreate } from './requests';
 
 // eslint-disable-next-line import/prefer-default-export

+ 3 - 1
src/injected/web/index.js

@@ -1,4 +1,6 @@
-import { getUniqId, bindEvents, attachFunction, cache2blobUrl } from '../utils';
+import {
+  getUniqId, bindEvents, attachFunction, cache2blobUrl,
+} from '../utils';
 import {
   includes, forEach, map, utf8decode, jsonDump, jsonLoad,
   Promise, console,

+ 7 - 5
src/options/app.js

@@ -1,9 +1,11 @@
-import 'src/common/browser';
+import '#/common/browser';
 import Vue from 'vue';
-import { sendMessage, i18n, getLocaleString, cache2blobUrl } from 'src/common';
-import options from 'src/common/options';
-import handlers from 'src/common/handlers';
-import 'src/common/ui/style';
+import {
+  sendMessage, i18n, getLocaleString, cache2blobUrl,
+} from '#/common';
+import options from '#/common/options';
+import handlers from '#/common/handlers';
+import '#/common/ui/style';
 import { store } from './utils';
 import App from './views/app';
 

+ 1 - 1
src/options/utils/index.js

@@ -1,5 +1,5 @@
 import Modal from 'vueleton/lib/modal';
-import { route } from 'src/common/router';
+import { route } from '#/common/router';
 import Message from '../views/message';
 
 export const store = {

+ 3 - 3
src/options/views/edit/index.vue

@@ -34,9 +34,9 @@
 </template>
 
 <script>
-import { i18n, sendMessage, noop } from 'src/common';
-import { objectGet } from 'src/common/object';
-import VmCode from 'src/common/ui/code';
+import { i18n, sendMessage, noop } from '#/common';
+import { objectGet } from '#/common/object';
+import VmCode from '#/common/ui/code';
 import { showMessage } from '../../utils';
 import VmSettings from './settings';
 import VmValues from './values';

+ 2 - 2
src/options/views/edit/settings.vue

@@ -88,8 +88,8 @@
 
 <script>
 import Tooltip from 'vueleton/lib/tooltip';
-import { i18n } from 'src/common';
-import { objectGet } from 'src/common/object';
+import { i18n } from '#/common';
+import { objectGet } from '#/common/object';
 
 export default {
   props: ['value', 'settings'],

+ 2 - 2
src/options/views/edit/values.vue

@@ -41,8 +41,8 @@
 </template>
 
 <script>
-import { sendMessage } from 'src/common';
-import Icon from 'src/common/ui/icon';
+import { sendMessage } from '#/common';
+import Icon from '#/common/ui/icon';
 
 const PAGE_SIZE = 25;
 const MAX_LENGTH = 1024;

+ 2 - 2
src/options/views/feature.vue

@@ -6,8 +6,8 @@
 
 <script>
 import Vue from 'vue';
-import options from 'src/common/options';
-import { objectGet } from 'src/common/object';
+import options from '#/common/options';
+import { objectGet } from '#/common/object';
 import { store } from '../utils';
 
 const FEATURES_KEY = 'features';

+ 8 - 8
src/options/views/script-item.vue

@@ -66,9 +66,9 @@
 
 <script>
 import Tooltip from 'vueleton/lib/tooltip';
-import { sendMessage, getLocaleString } from 'src/common';
-import { objectGet } from 'src/common/object';
-import Icon from 'src/common/ui/icon';
+import { sendMessage, getLocaleString } from '#/common';
+import { objectGet } from '#/common/object';
+import Icon from '#/common/ui/icon';
 import { store } from '../utils';
 
 const DEFAULT_ICON = '/public/images/icon48.png';
@@ -109,11 +109,11 @@ export default {
     canUpdate() {
       const { script } = this;
       return script.config.shouldUpdate && (
-        script.custom.updateURL ||
-        script.meta.updateURL ||
-        script.custom.downloadURL ||
-        script.meta.downloadURL ||
-        script.custom.lastInstallURL
+        script.custom.updateURL
+        || script.meta.updateURL
+        || script.custom.downloadURL
+        || script.meta.downloadURL
+        || script.custom.lastInstallURL
       );
     },
     homepageURL() {

+ 11 - 9
src/options/views/tab-installed.vue

@@ -63,14 +63,16 @@
 <script>
 import Dropdown from 'vueleton/lib/dropdown';
 import Tooltip from 'vueleton/lib/tooltip';
-import { i18n, sendMessage, noop, debounce } from 'src/common';
-import { objectGet } from 'src/common/object';
-import options from 'src/common/options';
-import SettingCheck from 'src/common/ui/setting-check';
-import hookSetting from 'src/common/hook-setting';
-import Icon from 'src/common/ui/icon';
-import LocaleGroup from 'src/common/ui/locale-group';
-import { setRoute } from 'src/common/router';
+import {
+  i18n, sendMessage, noop, debounce,
+} from '#/common';
+import { objectGet } from '#/common/object';
+import options from '#/common/options';
+import SettingCheck from '#/common/ui/setting-check';
+import hookSetting from '#/common/hook-setting';
+import Icon from '#/common/ui/icon';
+import LocaleGroup from '#/common/ui/locale-group';
+import { setRoute } from '#/common/router';
 import Item from './script-item';
 import Edit from './edit';
 import { store, showMessage } from '../utils';
@@ -261,7 +263,7 @@ export default {
 <style>
 $header-height: 4rem;
 
-.tab-installed {
+.tab.tab-installed {
   padding: 0;
   > header {
     height: $header-height;

+ 5 - 5
src/options/views/tab-settings/index.vue

@@ -64,11 +64,11 @@
 </template>
 
 <script>
-import { debounce } from 'src/common';
-import SettingCheck from 'src/common/ui/setting-check';
-import options from 'src/common/options';
-import hookSetting from 'src/common/hook-setting';
-import Icon from 'src/common/ui/icon';
+import { debounce } from '#/common';
+import SettingCheck from '#/common/ui/setting-check';
+import options from '#/common/options';
+import hookSetting from '#/common/hook-setting';
+import Icon from '#/common/ui/icon';
 import VmImport from './vm-import';
 import VmExport from './vm-export';
 import VmSync from './vm-sync';

+ 4 - 4
src/options/views/tab-settings/vm-blacklist.vue

@@ -11,10 +11,10 @@
 </template>
 
 <script>
-import { i18n, sendMessage } from 'src/common';
-import options from 'src/common/options';
-import { showMessage } from 'src/options/utils';
-import SettingText from 'src/common/ui/setting-text';
+import { i18n, sendMessage } from '#/common';
+import options from '#/common/options';
+import { showMessage } from '#/options/utils';
+import SettingText from '#/common/ui/setting-text';
 
 export default {
   components: {

+ 4 - 4
src/options/views/tab-settings/vm-css.vue

@@ -8,10 +8,10 @@
 </template>
 
 <script>
-import { i18n } from 'src/common';
-import options from 'src/common/options';
-import { showMessage } from 'src/options/utils';
-import SettingText from 'src/common/ui/setting-text';
+import { i18n } from '#/common';
+import options from '#/common/options';
+import { showMessage } from '#/options/utils';
+import SettingText from '#/common/ui/setting-text';
 
 export default {
   components: {

+ 6 - 6
src/options/views/tab-settings/vm-export.vue

@@ -27,12 +27,12 @@
 
 <script>
 import Modal from 'vueleton/lib/modal';
-import { sendMessage, getLocaleString } from 'src/common';
-import { objectGet } from 'src/common/object';
-import options from 'src/common/options';
-import { isFirefox } from 'src/common/ua';
-import SettingCheck from 'src/common/ui/setting-check';
-import { downloadBlob } from 'src/common/download';
+import { sendMessage, getLocaleString } from '#/common';
+import { objectGet } from '#/common/object';
+import options from '#/common/options';
+import { isFirefox } from '#/common/ua';
+import SettingCheck from '#/common/ui/setting-check';
+import { downloadBlob } from '#/common/download';
 import { store } from '../../utils';
 
 /**

+ 3 - 3
src/options/views/tab-settings/vm-import.vue

@@ -13,9 +13,9 @@
 </template>
 
 <script>
-import { i18n, sendMessage } from 'src/common';
-import options from 'src/common/options';
-import SettingCheck from 'src/common/ui/setting-check';
+import { i18n, sendMessage } from '#/common';
+import options from '#/common/options';
+import SettingCheck from '#/common/ui/setting-check';
 import { showMessage } from '../../utils';
 
 export default {

+ 5 - 5
src/options/views/tab-settings/vm-sync.vue

@@ -23,11 +23,11 @@
 </template>
 
 <script>
-import { sendMessage } from 'src/common';
-import options from 'src/common/options';
-import SettingCheck from 'src/common/ui/setting-check';
-import hookSetting from 'src/common/hook-setting';
-import Icon from 'src/common/ui/icon';
+import { sendMessage } from '#/common';
+import options from '#/common/options';
+import SettingCheck from '#/common/ui/setting-check';
+import hookSetting from '#/common/hook-setting';
+import Icon from '#/common/ui/icon';
 import { store } from '../../utils';
 
 const SYNC_CURRENT = 'sync.current';

+ 5 - 5
src/popup/app.js

@@ -1,9 +1,9 @@
-import 'src/common/browser';
+import '#/common/browser';
 import Vue from 'vue';
-import { i18n, sendMessage } from 'src/common';
-import handlers from 'src/common/handlers';
-import * as tld from 'src/common/tld';
-import 'src/common/ui/style';
+import { i18n, sendMessage } from '#/common';
+import handlers from '#/common/handlers';
+import * as tld from '#/common/tld';
+import '#/common/ui/style';
 import App from './views/app';
 import { store } from './utils';
 

+ 3 - 3
src/popup/views/app.vue

@@ -53,9 +53,9 @@
 </template>
 
 <script>
-import options from 'src/common/options';
-import { getLocaleString, sendMessage } from 'src/common';
-import Icon from 'src/common/ui/icon';
+import options from '#/common/options';
+import { getLocaleString, sendMessage } from '#/common';
+import Icon from '#/common/ui/icon';
 import { store } from '../utils';
 
 const optionsData = {

+ 1 - 1
test/background/script.js

@@ -1,5 +1,5 @@
 import test from 'tape';
-import { compareVersion, parseMeta } from 'src/background/utils/script';
+import { compareVersion, parseMeta } from '#/background/utils/script';
 
 test('compareVersion', t => {
   t.equal(compareVersion('1.2.3', '1.2.3'), 0);

+ 2 - 2
test/background/tester.js

@@ -1,6 +1,6 @@
 import test from 'tape';
-import { testScript, testBlacklist, resetBlacklist } from 'src/background/utils/tester';
-import cache from 'src/background/utils/cache';
+import { testScript, testBlacklist, resetBlacklist } from '#/background/utils/tester';
+import cache from '#/background/utils/cache';
 
 test.onFinish(cache.destroy);
 

+ 1 - 1
test/common/index.js

@@ -1,5 +1,5 @@
 import test from 'tape';
-import { isRemote } from 'src/common';
+import { isRemote } from '#/common';
 
 test('isRemote', t => {
   t.notOk(isRemote());

+ 1 - 1
test/injected/helpers.js

@@ -1,5 +1,5 @@
 import test from 'tape';
-import { jsonDump } from 'src/injected/utils/helpers';
+import { jsonDump } from '#/injected/utils/helpers';
 
 test('jsonDump', t => {
   // eslint-disable-next-line no-restricted-syntax

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 203 - 377
yarn.lock


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio