From 5bbebb686b97541a8c8658f879129a2bd889e126 Mon Sep 17 00:00:00 2001 From: surunzi Date: Sun, 1 Oct 2017 11:30:10 +0800 Subject: [PATCH] Dev: Rename ext es6 to js --- .eslintignore | 2 ++ package.json | 2 +- script/webpack.base.js | 5 ++-- src/Console/{Console.es6 => Console.js} | 4 +-- src/Console/{Log.es6 => Log.js} | 8 ++--- src/Console/{Logger.es6 => Logger.js} | 2 +- src/DevTools/{DevTools.es6 => DevTools.js} | 6 ++-- src/DevTools/{NavBar.es6 => NavBar.js} | 0 src/DevTools/{Tool.es6 => Tool.js} | 0 src/Elements/{CssStore.es6 => CssStore.js} | 0 src/Elements/{Elements.es6 => Elements.js} | 10 +++---- src/Elements/{Highlight.es6 => Highlight.js} | 0 src/Elements/{Select.es6 => Select.js} | 0 src/EntryBtn/{EntryBtn.es6 => EntryBtn.js} | 0 src/Features/{Features.es6 => Features.js} | 2 +- src/Info/{Info.es6 => Info.js} | 4 +-- src/Info/{defInfo.es6 => defInfo.js} | 0 src/Network/{Network.es6 => Network.js} | 4 +-- src/Network/{Request.es6 => Request.js} | 0 src/Resources/{Resources.es6 => Resources.js} | 2 +- src/Settings/{Settings.es6 => Settings.js} | 2 +- src/Snippets/{Snippets.es6 => Snippets.js} | 4 +-- .../{defSnippets.es6 => defSnippets.js} | 4 +-- src/Sources/{Sources.es6 => Sources.js} | 6 ++-- src/{index.es6 => index.js} | 30 +++++++++---------- src/lib/{JsonViewer.es6 => JsonViewer.js} | 0 src/lib/{Storage.es6 => Storage.js} | 0 src/lib/{config.es6 => config.js} | 2 +- src/lib/{emitter.es6 => emitter.js} | 0 src/lib/{extraUtil.es6 => extraUtil.js} | 4 +-- src/lib/{getAbstract.es6 => getAbstract.js} | 0 src/lib/{highlight.es6 => highlight.js} | 0 src/lib/{logger.es6 => logger.js} | 0 src/lib/{stringify.es6 => stringify.js} | 0 34 files changed, 53 insertions(+), 50 deletions(-) create mode 100644 .eslintignore rename src/Console/{Console.es6 => Console.js} (99%) rename src/Console/{Log.es6 => Log.js} (98%) rename src/Console/{Logger.es6 => Logger.js} (99%) rename src/DevTools/{DevTools.es6 => DevTools.js} (97%) rename src/DevTools/{NavBar.es6 => NavBar.js} (100%) rename src/DevTools/{Tool.es6 => Tool.js} (100%) rename src/Elements/{CssStore.es6 => CssStore.js} (100%) rename src/Elements/{Elements.es6 => Elements.js} (98%) rename src/Elements/{Highlight.es6 => Highlight.js} (100%) rename src/Elements/{Select.es6 => Select.js} (100%) rename src/EntryBtn/{EntryBtn.es6 => EntryBtn.js} (100%) rename src/Features/{Features.es6 => Features.js} (96%) rename src/Info/{Info.es6 => Info.js} (93%) rename src/Info/{defInfo.es6 => defInfo.js} (100%) rename src/Network/{Network.es6 => Network.js} (99%) rename src/Network/{Request.es6 => Request.js} (100%) rename src/Resources/{Resources.es6 => Resources.js} (99%) rename src/Settings/{Settings.es6 => Settings.js} (98%) rename src/Snippets/{Snippets.es6 => Snippets.js} (94%) rename src/Snippets/{defSnippets.es6 => defSnippets.js} (97%) rename src/Sources/{Sources.es6 => Sources.js} (98%) rename src/{index.es6 => index.js} (84%) rename src/lib/{JsonViewer.es6 => JsonViewer.js} (100%) rename src/lib/{Storage.es6 => Storage.js} (100%) rename src/lib/{config.es6 => config.js} (83%) rename src/lib/{emitter.es6 => emitter.js} (100%) rename src/lib/{extraUtil.es6 => extraUtil.js} (76%) rename src/lib/{getAbstract.es6 => getAbstract.js} (100%) rename src/lib/{highlight.es6 => highlight.js} (100%) rename src/lib/{logger.es6 => logger.js} (100%) rename src/lib/{stringify.es6 => stringify.js} (100%) diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..eace3e5 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,2 @@ +src/lib/util.js +src/Features/modernizr.js \ No newline at end of file diff --git a/package.json b/package.json index 3051a63..df2b044 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "test": "karma start", "setup": "node script/cpTestLib", "genScriptUtil": "eustia build script/*.js -o script/util.js", - "lint": "eslint --ext .es6 src", + "lint": "eslint src", "utilDoc": "eustia doc src/lib/util.js -f md -o doc/UTIL_API.md -t \"Eruda Util Documentation\"" }, "eustia": { diff --git a/script/webpack.base.js b/script/webpack.base.js index d349342..1df94e3 100644 --- a/script/webpack.base.js +++ b/script/webpack.base.js @@ -17,7 +17,7 @@ var postcssLoader = { }; module.exports = { - entry: './src/index.es6', + entry: './src/index', devServer: { contentBase: './test', port: 3000 @@ -31,8 +31,9 @@ module.exports = { module: { loaders: [ { - test: /\.es6$/, + test: /\.js$/, loader: 'babel-loader', + exclude: /node_modules/, options: { presets: ['es2015'], plugins: ['transform-runtime'] diff --git a/src/Console/Console.es6 b/src/Console/Console.js similarity index 99% rename from src/Console/Console.es6 rename to src/Console/Console.js index 8a2707e..8474e72 100644 --- a/src/Console/Console.es6 +++ b/src/Console/Console.js @@ -1,5 +1,5 @@ -import Logger from './Logger.es6' -import Tool from '../DevTools/Tool.es6' +import Logger from './Logger' +import Tool from '../DevTools/Tool' import util from '../lib/util' export default class Console extends Tool diff --git a/src/Console/Log.es6 b/src/Console/Log.js similarity index 98% rename from src/Console/Log.es6 rename to src/Console/Log.js index 0f7a3ea..27fad13 100644 --- a/src/Console/Log.es6 +++ b/src/Console/Log.js @@ -1,9 +1,9 @@ import util from '../lib/util' -import stringify from '../lib/stringify.es6' -import origGetAbstract from '../lib/getAbstract.es6' -import highlight from '../lib/highlight.es6' +import stringify from '../lib/stringify' +import origGetAbstract from '../lib/getAbstract' +import highlight from '../lib/highlight' import beautify from 'js-beautify' -import JsonViewer from '../lib/JsonViewer.es6' +import JsonViewer from '../lib/JsonViewer' export default class Log { diff --git a/src/Console/Logger.es6 b/src/Console/Logger.js similarity index 99% rename from src/Console/Logger.es6 rename to src/Console/Logger.js index 25a8a31..3749e98 100644 --- a/src/Console/Logger.es6 +++ b/src/Console/Logger.js @@ -1,5 +1,5 @@ import util from '../lib/util' -import Log from './Log.es6' +import Log from './Log' export default class Logger extends util.Emitter { diff --git a/src/DevTools/DevTools.es6 b/src/DevTools/DevTools.js similarity index 97% rename from src/DevTools/DevTools.es6 rename to src/DevTools/DevTools.js index b43707e..38bb49a 100644 --- a/src/DevTools/DevTools.es6 +++ b/src/DevTools/DevTools.js @@ -1,7 +1,7 @@ -import NavBar from './NavBar.es6' +import NavBar from './NavBar' import util from '../lib/util' -import logger from '../lib/logger.es6' -import Tool from './Tool.es6' +import logger from '../lib/logger' +import Tool from './Tool' export default class DevTools extends util.Emitter { diff --git a/src/DevTools/NavBar.es6 b/src/DevTools/NavBar.js similarity index 100% rename from src/DevTools/NavBar.es6 rename to src/DevTools/NavBar.js diff --git a/src/DevTools/Tool.es6 b/src/DevTools/Tool.js similarity index 100% rename from src/DevTools/Tool.es6 rename to src/DevTools/Tool.js diff --git a/src/Elements/CssStore.es6 b/src/Elements/CssStore.js similarity index 100% rename from src/Elements/CssStore.es6 rename to src/Elements/CssStore.js diff --git a/src/Elements/Elements.es6 b/src/Elements/Elements.js similarity index 98% rename from src/Elements/Elements.es6 rename to src/Elements/Elements.js index 7b0f3fe..3c16615 100644 --- a/src/Elements/Elements.es6 +++ b/src/Elements/Elements.js @@ -1,8 +1,8 @@ -import Tool from '../DevTools/Tool.es6' -import CssStore from './CssStore.es6' -import stringify from '../lib/stringify.es6' -import Highlight from './Highlight.es6' -import Select from './Select.es6' +import Tool from '../DevTools/Tool' +import CssStore from './CssStore' +import stringify from '../lib/stringify' +import Highlight from './Highlight' +import Select from './Select' import util from '../lib/util' export default class Elements extends Tool diff --git a/src/Elements/Highlight.es6 b/src/Elements/Highlight.js similarity index 100% rename from src/Elements/Highlight.es6 rename to src/Elements/Highlight.js diff --git a/src/Elements/Select.es6 b/src/Elements/Select.js similarity index 100% rename from src/Elements/Select.es6 rename to src/Elements/Select.js diff --git a/src/EntryBtn/EntryBtn.es6 b/src/EntryBtn/EntryBtn.js similarity index 100% rename from src/EntryBtn/EntryBtn.es6 rename to src/EntryBtn/EntryBtn.js diff --git a/src/Features/Features.es6 b/src/Features/Features.js similarity index 96% rename from src/Features/Features.es6 rename to src/Features/Features.js index 61bb23f..d9bda23 100644 --- a/src/Features/Features.es6 +++ b/src/Features/Features.js @@ -1,4 +1,4 @@ -import Tool from '../DevTools/Tool.es6' +import Tool from '../DevTools/Tool' import util from '../lib/util' import modernizr from './modernizr' diff --git a/src/Info/Info.es6 b/src/Info/Info.js similarity index 93% rename from src/Info/Info.es6 rename to src/Info/Info.js index 6827e56..da8165f 100644 --- a/src/Info/Info.es6 +++ b/src/Info/Info.js @@ -1,6 +1,6 @@ -import Tool from '../DevTools/Tool.es6' +import Tool from '../DevTools/Tool' import util from '../lib/util' -import defInfo from './defInfo.es6' +import defInfo from './defInfo' export default class Info extends Tool { diff --git a/src/Info/defInfo.es6 b/src/Info/defInfo.js similarity index 100% rename from src/Info/defInfo.es6 rename to src/Info/defInfo.js diff --git a/src/Network/Network.es6 b/src/Network/Network.js similarity index 99% rename from src/Network/Network.es6 rename to src/Network/Network.js index c7b6ba5..9fc291c 100644 --- a/src/Network/Network.es6 +++ b/src/Network/Network.js @@ -1,5 +1,5 @@ -import Tool from '../DevTools/Tool.es6' -import Request from './Request.es6' +import Tool from '../DevTools/Tool' +import Request from './Request' import util from '../lib/util' export default class Network extends Tool diff --git a/src/Network/Request.es6 b/src/Network/Request.js similarity index 100% rename from src/Network/Request.es6 rename to src/Network/Request.js diff --git a/src/Resources/Resources.es6 b/src/Resources/Resources.js similarity index 99% rename from src/Resources/Resources.es6 rename to src/Resources/Resources.js index 2fe505f..fb5f38a 100644 --- a/src/Resources/Resources.es6 +++ b/src/Resources/Resources.js @@ -1,4 +1,4 @@ -import Tool from '../DevTools/Tool.es6' +import Tool from '../DevTools/Tool' import util from '../lib/util' export default class Resources extends Tool diff --git a/src/Settings/Settings.es6 b/src/Settings/Settings.js similarity index 98% rename from src/Settings/Settings.es6 rename to src/Settings/Settings.js index e3dcd4a..a913c07 100644 --- a/src/Settings/Settings.es6 +++ b/src/Settings/Settings.js @@ -1,4 +1,4 @@ -import Tool from '../DevTools/Tool.es6' +import Tool from '../DevTools/Tool' import util from '../lib/util' export default class Settings extends Tool diff --git a/src/Snippets/Snippets.es6 b/src/Snippets/Snippets.js similarity index 94% rename from src/Snippets/Snippets.es6 rename to src/Snippets/Snippets.js index 6864e5f..d7d5734 100644 --- a/src/Snippets/Snippets.es6 +++ b/src/Snippets/Snippets.js @@ -1,5 +1,5 @@ -import Tool from '../DevTools/Tool.es6' -import defSnippets from './defSnippets.es6' +import Tool from '../DevTools/Tool' +import defSnippets from './defSnippets' import util from '../lib/util' export default class Snippets extends Tool diff --git a/src/Snippets/defSnippets.es6 b/src/Snippets/defSnippets.js similarity index 97% rename from src/Snippets/defSnippets.es6 rename to src/Snippets/defSnippets.js index 60ec4bc..c46e389 100644 --- a/src/Snippets/defSnippets.es6 +++ b/src/Snippets/defSnippets.js @@ -1,6 +1,6 @@ import util from '../lib/util' -import logger from '../lib/logger.es6' -import emitter from '../lib/emitter.es6' +import logger from '../lib/logger' +import emitter from '../lib/emitter' export default [ { diff --git a/src/Sources/Sources.es6 b/src/Sources/Sources.js similarity index 98% rename from src/Sources/Sources.es6 rename to src/Sources/Sources.js index f7e82f5..98b1bb4 100644 --- a/src/Sources/Sources.es6 +++ b/src/Sources/Sources.js @@ -1,8 +1,8 @@ -import Tool from '../DevTools/Tool.es6' +import Tool from '../DevTools/Tool' import util from '../lib/util' import beautify from 'js-beautify' -import highlight from '../lib/highlight.es6' -import JsonViewer from '../lib/JsonViewer.es6' +import highlight from '../lib/highlight' +import JsonViewer from '../lib/JsonViewer' export default class Sources extends Tool { diff --git a/src/index.es6 b/src/index.js similarity index 84% rename from src/index.es6 rename to src/index.js index 18947d9..4198d67 100644 --- a/src/index.es6 +++ b/src/index.js @@ -1,19 +1,19 @@ -import EntryBtn from './EntryBtn/EntryBtn.es6' -import DevTools from './DevTools/DevTools.es6' -import Console from './Console/Console.es6' -import Network from './Network/Network.es6' -import Elements from './Elements/Elements.es6' -import Snippets from './Snippets/Snippets.es6' -import Resources from './Resources/Resources.es6' -import Info from './Info/Info.es6' -import Features from './Features/Features.es6' -import Sources from './Sources/Sources.es6' -import Settings from './Settings/Settings.es6' +import EntryBtn from './EntryBtn/EntryBtn' +import DevTools from './DevTools/DevTools' +import Console from './Console/Console' +import Network from './Network/Network' +import Elements from './Elements/Elements' +import Snippets from './Snippets/Snippets' +import Resources from './Resources/Resources' +import Info from './Info/Info' +import Features from './Features/Features' +import Sources from './Sources/Sources' +import Settings from './Settings/Settings' import util from './lib/util' -import emitter from './lib/emitter.es6' -import config from './lib/config.es6' -import logger from './lib/logger.es6' -import extraUtil from './lib/extraUtil.es6' +import emitter from './lib/emitter' +import config from './lib/config' +import logger from './lib/logger' +import extraUtil from './lib/extraUtil' module.exports = { init({el, tool} = {}) diff --git a/src/lib/JsonViewer.es6 b/src/lib/JsonViewer.js similarity index 100% rename from src/lib/JsonViewer.es6 rename to src/lib/JsonViewer.js diff --git a/src/lib/Storage.es6 b/src/lib/Storage.js similarity index 100% rename from src/lib/Storage.es6 rename to src/lib/Storage.js diff --git a/src/lib/config.es6 b/src/lib/config.js similarity index 83% rename from src/lib/config.es6 rename to src/lib/config.js index ec87876..41159e1 100644 --- a/src/lib/config.es6 +++ b/src/lib/config.js @@ -1,4 +1,4 @@ -import Storage from './Storage.es6' +import Storage from './Storage' let configs = {}; diff --git a/src/lib/emitter.es6 b/src/lib/emitter.js similarity index 100% rename from src/lib/emitter.es6 rename to src/lib/emitter.js diff --git a/src/lib/extraUtil.es6 b/src/lib/extraUtil.js similarity index 76% rename from src/lib/extraUtil.es6 rename to src/lib/extraUtil.js index 739c289..7da8ee4 100644 --- a/src/lib/extraUtil.es6 +++ b/src/lib/extraUtil.js @@ -1,6 +1,6 @@ -import highlight from './highlight.es6' +import highlight from './highlight' import beautify from 'js-beautify' -import config from './config.es6' +import config from './config' export default function (util) { diff --git a/src/lib/getAbstract.es6 b/src/lib/getAbstract.js similarity index 100% rename from src/lib/getAbstract.es6 rename to src/lib/getAbstract.js diff --git a/src/lib/highlight.es6 b/src/lib/highlight.js similarity index 100% rename from src/lib/highlight.es6 rename to src/lib/highlight.js diff --git a/src/lib/logger.es6 b/src/lib/logger.js similarity index 100% rename from src/lib/logger.es6 rename to src/lib/logger.js diff --git a/src/lib/stringify.es6 b/src/lib/stringify.js similarity index 100% rename from src/lib/stringify.es6 rename to src/lib/stringify.js