feature(client) remove legacy suffix, use modules as is

hitnrun30 · Aug 27, 2019 · 089bdc6 · 089bdc6
1 parent 32628ec
commit 089bdc6
Show file tree

Hide file tree

Showing 35 changed files with 65 additions and 65 deletions.
diff --git a/client/client.js b/client/client.js
@@ -2,21 +2,21 @@
 
 /* global DOM */
 
-const Emitify = require('emitify/legacy');
+const Emitify = require('emitify');
 const inherits = require('inherits');
-const rendy = require('rendy/legacy');
+const rendy = require('rendy');
 const exec = require('execon');
 const load = require('load.js');
 const {promisify} = require('es6-promisify');
-const tryToCatch = require('try-to-catch/legacy');
+const tryToCatch = require('try-to-catch');
 
 const pascalCase = require('just-pascal-case');
 const isDev = process.env.NODE_ENV === 'development';
 
 const Images = require('./dom/images');
 const {unregisterSW} = require('./sw/register');
 
-const currify = require('currify/legacy');
+const currify = require('currify');
 
 const noJS = (a) => a.replace(/.js$/, '');
 
@@ -348,7 +348,7 @@ function CloudCmdProto(DOM) {
 
         const create = async (error, json) => {
             if (error)
-                return Dialog.alert(`Can't get from store: ${e.message}`);
+                return Dialog.alert(`Can't get from store: ${error.message}`);
 
             const name = options.currentName || Info.name;
             const isRefresh = options.refresh;

diff --git a/client/cloudcmd.js b/client/cloudcmd.js
@@ -6,7 +6,7 @@ require('../css/columns/name-size-date.css');
 require('../css/columns/name-size.css');
 
 const {promisify} = require('es6-promisify');
-const wraptile = require('wraptile/legacy');
+const wraptile = require('wraptile');
 const load = require('load.js');
 
 const isDev = process.env.NODE_ENV === 'development';

diff --git a/client/dom/dialog.js b/client/dom/dialog.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const tryToCatch = require('try-to-catch/legacy');
+const tryToCatch = require('try-to-catch');
 
 const {
     alert,

diff --git a/client/dom/dom-tree.js b/client/dom/dom-tree.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const currify = require('currify/legacy');
+const currify = require('currify');
 
 const DOM = module.exports;
 

diff --git a/client/dom/events/index.js b/client/dom/events/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const itype = require('itype/legacy');
+const itype = require('itype');
 const EventStore = require('./event-store');
 
 module.exports = new EventsProto();

diff --git a/client/dom/files.js b/client/dom/files.js
@@ -2,8 +2,8 @@
 
 'use strict';
 
-const itype = require('itype/legacy');
-const currify = require('currify/legacy');
+const itype = require('itype');
+const currify = require('currify');
 const {promisify} = require('es6-promisify');
 
 const load = require('./load');

diff --git a/client/dom/io.js b/client/dom/io.js
@@ -2,7 +2,7 @@
 
 /* global CloudCmd*/
 
-const itype = require('itype/legacy');
+const itype = require('itype');
 const {promisify} = require('es6-promisify');
 
 const {FS} = require('../../common/cloudfunc');

diff --git a/client/dom/load-remote.js b/client/dom/load-remote.js
@@ -3,9 +3,9 @@
 /* global CloudCmd */
 
 const exec = require('execon');
-const rendy = require('rendy/legacy');
-const itype = require('itype/legacy');
-const wraptile = require('wraptile/legacy');
+const rendy = require('rendy');
+const itype = require('itype');
+const wraptile = require('wraptile');
 const load = require('load.js');
 
 const {findObjByNameInArr} = require('../../common/util');

diff --git a/client/dom/load.js b/client/dom/load.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const itype = require('itype/legacy');
-const jonny = require('jonny/legacy');
-const Emitify = require('emitify/legacy');
+const itype = require('itype');
+const jonny = require('jonny');
+const Emitify = require('emitify');
 const exec = require('execon');
 const Images = require('./images');
 

diff --git a/client/dom/rest.js b/client/dom/rest.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const tryToCatch = require('try-to-catch/legacy');
+const tryToCatch = require('try-to-catch');
 
 const {encode} = require('../../common/entity');
 

diff --git a/client/dom/upload-files.js b/client/dom/upload-files.js
@@ -3,7 +3,7 @@
 /* global CloudCmd */
 
 const {eachSeries} = require('execon');
-const wraptile = require('wraptile/legacy');
+const wraptile = require('wraptile');
 
 const load = require('./load');
 const Images = require('./images');

diff --git a/client/key/index.js b/client/key/index.js
@@ -12,7 +12,7 @@ const Buffer = require('../dom/buffer');
 const KEY = require('./key');
 const vim = require('./vim');
 const setCurrentByChar = require('./set-current-by-char');
-const fullstore = require('fullstore/legacy');
+const fullstore = require('fullstore');
 const Chars = fullstore();
 
 Chars([]);

diff --git a/client/key/vim/find.js b/client/key/vim/find.js
@@ -2,8 +2,8 @@
 
 /* global DOM */
 
-const fullstore = require('fullstore/legacy');
-const limier = require('limier/legacy');
+const fullstore = require('fullstore');
+const limier = require('limier');
 const Info = DOM.CurrentInfo;
 
 const searchStore = fullstore([]);

diff --git a/client/key/vim/index.js b/client/key/vim/index.js
@@ -7,7 +7,7 @@ const Info = DOM.CurrentInfo;
 
 const {Dialog} = DOM;
 
-const fullstore = require('fullstore/legacy');
+const fullstore = require('fullstore');
 const store = fullstore('');
 const visual = fullstore(false);
 const {

diff --git a/client/listeners/index.js b/client/listeners/index.js
@@ -3,9 +3,9 @@
 'use strict';
 
 const exec = require('execon');
-const itype = require('itype/legacy');
-const currify = require('currify/legacy');
-const tryToCatch = require('try-to-catch/legacy');
+const itype = require('itype');
+const currify = require('currify');
+const tryToCatch = require('try-to-catch');
 const clipboard = require('@cloudcmd/clipboard');
 
 const getRange = require('./get-range');

diff --git a/client/load-module.js b/client/load-module.js
@@ -3,7 +3,7 @@
 /* global CloudCmd */
 
 const exec = require('execon');
-const tryToCatch = require('try-to-catch/legacy');
+const tryToCatch = require('try-to-catch');
 const {promisify} = require('es6-promisify');
 const loadJS = promisify(require('load.js').js);
 

diff --git a/client/modules/cloud.js b/client/modules/cloud.js
@@ -3,7 +3,7 @@
 'use strict';
 
 const exec = require('execon');
-const currify = require('currify/legacy');
+const currify = require('currify');
 const {promisify} = require('es6-promisify');
 const loadJS = promisify(require('load.js').js);
 

diff --git a/client/modules/config/index.js b/client/modules/config/index.js
@@ -4,12 +4,12 @@
 
 require('../../../css/config.css');
 
-const rendy = require('rendy/legacy');
-const currify = require('currify/legacy');
-const wraptile = require('wraptile/legacy');
-const squad = require('squad/legacy');
+const rendy = require('rendy');
+const currify = require('currify');
+const wraptile = require('wraptile');
+const squad = require('squad');
 const {promisify} = require('es6-promisify');
-const tryToCatch = require('try-to-catch/legacy');
+const tryToCatch = require('try-to-catch');
 const load = require('load.js');
 const createElement = require('@cloudcmd/create-element');
 

diff --git a/client/modules/config/input.js b/client/modules/config/input.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const currify = require('currify/legacy');
+const currify = require('currify');
 
 const isType = currify((type, object, name) => {
     return typeof object[name] === type;

diff --git a/client/modules/edit-file.js b/client/modules/edit-file.js
@@ -4,8 +4,8 @@
 
 CloudCmd.EditFile = exports;
 
-const Format = require('format-io/legacy');
-const fullstore = require('fullstore/legacy');
+const Format = require('format-io');
+const fullstore = require('fullstore');
 const exec = require('execon');
 const supermenu = require('supermenu');
 

diff --git a/client/modules/edit-names.js b/client/modules/edit-names.js
@@ -4,7 +4,7 @@
 
 CloudCmd.EditNames = exports;
 
-const currify = require('currify/legacy');
+const currify = require('currify');
 const exec = require('execon');
 const supermenu = require('supermenu');
 const multiRename = require('multi-rename');

diff --git a/client/modules/edit.js b/client/modules/edit.js
@@ -3,7 +3,7 @@
 'use strict';
 
 const {promisify} = require('es6-promisify');
-const tryToCatch = require('try-to-catch/legacy');
+const tryToCatch = require('try-to-catch');
 const createElement = require('@cloudcmd/create-element');
 const load = require('load.js');
 const loadJS = promisify(load.js);

diff --git a/client/modules/konsole.js b/client/modules/konsole.js
@@ -9,8 +9,8 @@ CloudCmd.Konsole = exports;
 
 const exec = require('execon');
 const {promisify} = require('es6-promisify');
-const currify = require('currify/legacy');
-const tryToCatch = require('try-to-catch/legacy');
+const currify = require('currify');
+const tryToCatch = require('try-to-catch');
 const loadJS = promisify(require('load.js').js);
 const createElement = require('@cloudcmd/create-element');
 

diff --git a/client/modules/markdown.js b/client/modules/markdown.js
@@ -3,7 +3,7 @@
 /* global CloudCmd */
 
 const {promisify} = require('es6-promisify');
-const tryToCatch = require('try-to-catch/legacy');
+const tryToCatch = require('try-to-catch');
 
 CloudCmd.Markdown = exports;
 

diff --git a/client/modules/menu.js b/client/modules/menu.js
@@ -3,7 +3,7 @@
 'use strict';
 
 const exec = require('execon');
-const wrap = require('wraptile/legacy');
+const wrap = require('wraptile');
 const supermenu = require('supermenu');
 const createElement = require('@cloudcmd/create-element');
 

diff --git a/client/modules/operation/get-next-current-name.js b/client/modules/operation/get-next-current-name.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const currify = require('currify/legacy');
+const currify = require('currify');
 
 const not = currify((array, value) => !~array.indexOf(value));
 const notOneOf = currify((a, b) => a.filter(not(b)));

diff --git a/client/modules/operation/index.js b/client/modules/operation/index.js
@@ -5,8 +5,8 @@
 
 'use strict';
 
-const currify = require('currify/legacy');
-const wraptile = require('wraptile/legacy');
+const currify = require('currify');
+const wraptile = require('wraptile');
 const {promisify} = require('es6-promisify');
 const exec = require('execon');
 const loadJS = require('load.js').js;

diff --git a/client/modules/operation/set-listeners.js b/client/modules/operation/set-listeners.js
@@ -7,8 +7,8 @@ const {
     Images,
 } = DOM;
 
-const forEachKey = require('for-each-key/legacy');
-const wraptile = require('wraptile/legacy');
+const forEachKey = require('for-each-key');
+const wraptile = require('wraptile');
 
 const format = require('./format');
 

diff --git a/client/modules/terminal-run.js b/client/modules/terminal-run.js
@@ -3,8 +3,8 @@
 /* global CloudCmd, gritty */
 
 const {promisify} = require('es6-promisify');
-const tryToCatch = require('try-to-catch/legacy');
-const fullstore = require('fullstore/legacy');
+const tryToCatch = require('try-to-catch');
+const fullstore = require('fullstore');
 
 require('../../css/terminal.css');
 

diff --git a/client/modules/terminal.js b/client/modules/terminal.js
@@ -3,7 +3,7 @@
 /* global CloudCmd, gritty */
 
 const {promisify} = require('es6-promisify');
-const tryToCatch = require('try-to-catch/legacy');
+const tryToCatch = require('try-to-catch');
 
 require('../../css/terminal.css');
 

diff --git a/client/modules/user-menu/index.js b/client/modules/user-menu/index.js
@@ -4,14 +4,14 @@
 
 require('../../../css/user-menu.css');
 
-const currify = require('currify/legacy');
-const wraptile = require('wraptile/legacy');
+const currify = require('currify');
+const wraptile = require('wraptile');
 const {promisify} = require('es6-promisify');
-const fullstore = require('fullstore/legacy');
+const fullstore = require('fullstore');
 const load = require('load.js');
 const createElement = require('@cloudcmd/create-element');
 const tryCatch = require('try-catch');
-const tryToCatch = require('try-to-catch/legacy');
+const tryToCatch = require('try-to-catch');
 const parse = require('./parse-error');
 const {codeFrameColumns} = require('@babel/code-frame');
 

diff --git a/client/modules/view.js b/client/modules/view.js
@@ -4,12 +4,12 @@
 
 require('../../css/view.css');
 
-const itype = require('itype/legacy');
-const rendy = require('rendy/legacy');
+const itype = require('itype');
+const rendy = require('rendy');
 const exec = require('execon');
-const currify = require('currify/legacy');
+const currify = require('currify');
 const {promisify} = require('es6-promisify');
-const tryToCatch = require('try-to-catch/legacy');
+const tryToCatch = require('try-to-catch');
 
 const modal = require('@cloudcmd/modal');
 const createElement = require('@cloudcmd/create-element');

diff --git a/client/sw/sw.js b/client/sw/sw.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const codegen = require('codegen.macro');
-const tryToCatch = require('try-to-catch/legacy');
-const currify = require('currify/legacy');
+const tryToCatch = require('try-to-catch');
+const currify = require('currify');
 
 const isDev = process.env.NODE_ENV === 'development';
 

diff --git a/common/cloudfunc.js b/common/cloudfunc.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const rendy = require('rendy/legacy');
-const currify = require('currify/legacy');
-const store = require('fullstore/legacy');
+const rendy = require('rendy');
+const currify = require('currify');
+const store = require('fullstore');
 const {encode} = require('./entity');
 const btoa = require('./btoa');
 

diff --git a/common/try-to-promise-all.js b/common/try-to-promise-all.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const tryToCatch = require('try-to-catch/legacy');
+const tryToCatch = require('try-to-catch');
 const all = Promise.all.bind(Promise);
 
 module.exports = async (a) => {