Use es6 semantics to import dependencies 🚧

madlabsinc · Apr 14, 2019 · 2eba556 · 2eba556
1 parent 13cb2ac
commit 2eba556
Show file tree

Hide file tree

Showing 18 changed files with 107 additions and 112 deletions.
diff --git a/src/commands/basic/codesplit.js b/src/commands/basic/codesplit.js
@@ -1,11 +1,11 @@
 'use strict';
 
-const fs = require('fs');
-const chalk = require('chalk');
-const shell = require('shelljs');
+import chalk from 'chalk';
+import fs from 'fs';
+import shell from 'shelljs';
 
-const { showBanner } = require('../../external/banner');
-const { configFileExists } = require('../../utils/messages');
+import { configFileExists } from '../../utils/messages';
+import { showBanner } from '../../external/banner';
 
 exports.asyncRender = (componentName) => {
     showBanner();

diff --git a/src/commands/basic/component.js b/src/commands/basic/component.js
@@ -1,12 +1,12 @@
 'use strict';
 
-const fs = require('fs');
-const shell = require('shelljs');
-const chalk = require('chalk');
-const createFile = require('../../utils/createFile');
+import chalk from 'chalk';
+import fs from 'fs';
+import shell from 'shelljs';
 
-const { showBanner } = require('../../external/banner');
-const { configFileExists } = require('../../utils/messages');
+import { configFileExists } from '../../utils/messages';
+import { createFile } from '../../utils/createFile';
+import { showBanner } from '../../external/banner';
 
 let componentTemplate = [ '<template >',
   '</template>',

diff --git a/src/commands/basic/createRoute.js b/src/commands/basic/createRoute.js
@@ -1,16 +1,16 @@
 'use strict';
 
-const fs = require('fs');
-const shell = require('shelljs');
-const inquirer = require('inquirer');
-const chalk = require('chalk');
-const createFile = require('../../utils/createFile');
-const logUpdate = require('log-update');
-const elegantSpinner = require('elegant-spinner');
-const cmd = require('node-cmd');
-
-const { showBanner } = require('../../external/banner');
-const { configFileExists } = require('../../utils/messages');
+import chalk from 'chalk';
+import cmd from 'node-cmd';
+import elegantSpinner from 'elegant-spinner';
+import fs from 'fs';
+import inquirer from 'inquirer';
+import logUpdate from 'log-update';
+import shell from 'shelljs';
+
+import { createFile } from '../../utils/createFile';
+import { configFileExists } from '../../utils/messages';
+import { showBanner } from '../../external/banner';
 
 let routesPath = '/../../templates/routes/';
 let routesFile = fs.readFileSync(__dirname + '/../../templates/routes/index.js', 'utf8');

diff --git a/src/commands/basic/generate.js b/src/commands/basic/generate.js
@@ -1,17 +1,17 @@
 'use strict';
 
-const fs = require('fs');
-const shell = require('shelljs');
-const inquirer = require('inquirer');
-const chalk = require('chalk');
-const os = require('os');
+import chalk from 'chalk';
+import fs from 'fs';
+import inquirer from 'inquirer';
+import shell from 'shelljs';
+import os from 'os';
 
-const { appData } = require('../../utils/projectConfig');
-const { configFileExists } = require('../../utils/messages');
-const createFile = require('../../utils/createFile');
-const { generateRoute } = require('./createRoute');
-const { showBanner } = require('../../external/banner');
-const { templateIsGraphQL } = require('../../utils/messages');
+import { appData } from '../../utils/projectConfig';
+import { createFile } from '../../utils/createFile';
+import { configFileExists } from '../../utils/messages';
+import { generateRoute } from './createRoute';
+import { showBanner } from '../../external/banner';
+import { templateIsGraphQL } from '../../utils/messages';
 
 let generatedFileContent;
 let generatedFile;

diff --git a/src/commands/basic/init.js b/src/commands/basic/init.js
@@ -1,17 +1,17 @@
 'use strict';
 
-const chalk = require('chalk');
-const elegantSpinner = require('elegant-spinner');
-const fs = require('fs');
-const inquirer = require('inquirer');
-const logUpdate = require('log-update');
-const shell = require('shelljs');
-const Table = require('cli-table3');
-const validate = require('validate-npm-package-name');
-
-const boilerplate = require('../../../config.json');
-const { validateInstallation } = require('../../utils/validations');
-const { showBanner } = require('../../external/banner');
+import chalk from 'chalk';
+import elegantSpinner from 'elegant-spinner';
+import fs from 'fs';
+import inquirer from 'inquirer';
+import logUpdate from 'log-update';
+import shell from 'shelljs';
+import Table from 'cli-table3';
+import validate from 'validate-npm-package-name';
+
+import boilerplate from '../../../config.json';
+import { showBanner } from '../../external/banner';
+import { validateInstallation } from '../../utils/validations';
 
 let availableCommands = new Table();
 let frame = elegantSpinner();

diff --git a/src/commands/basic/package.js b/src/commands/basic/package.js
@@ -1,15 +1,15 @@
 'use strict';
 
-const fs = require('fs');
-const shell = require('shelljs');
-const cmd = require('node-cmd');
-const inquirer = require('inquirer');
-const chalk = require('chalk');
-const logUpdate = require('log-update');
-const elegantSpinner = require('elegant-spinner');
-
-const { showBanner } = require('../../external/banner');
-const { configFileExists } = require('../../utils/messages');
+import chalk from 'chalk';
+import cmd from 'node-cmd';
+import elegantSpinner from 'elegant-spinner';
+import fs from 'fs';
+import inquirer from 'inquirer';
+import logUpdate from 'log-update';
+import shell from 'shelljs';
+
+import { configFileExists } from '../../utils/messages';
+import { showBanner } from '../../external/banner';
 
 let storeFile = fs.readFileSync(__dirname + '/../../templates/vuex/store.js', 'utf8');
 let frame = elegantSpinner();

diff --git a/src/commands/basic/version.js b/src/commands/basic/version.js
@@ -1,14 +1,14 @@
 'use strict';
 
-const chalk = require('chalk');
+import chalk from 'chalk';
 
-const { showBanner } = require('../../external/banner');
-const cliVersion = require('../../../package.json').version;
+import { version } from '../../../package.json';
+import { showBanner } from '../../external/banner';
 
 exports.versionInfo = () => {
     showBanner();
     setTimeout(() => {
-     console.log(chalk.greenBright(`\n\n  MEVN-CLI: ${cliVersion}`));
+     console.log(chalk.greenBright(`\n\n  MEVN-CLI: ${version}`));
      console.log(chalk.greenBright(`\n  Node: ${require('child_process').execSync('node -v')}`));
      console.log(chalk.greenBright(`  OS: ${process.platform}`));
     }, 100);

diff --git a/src/commands/deploy/docker.js b/src/commands/deploy/docker.js
@@ -1,13 +1,13 @@
 'use strict';
 
-const chalk = require('chalk');
-const shell = require('shelljs');
-const os = require('os');
-const inquirer = require('inquirer');
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import os from 'os';
+import shell from 'shelljs';
 
-const { configFileExists } = require('../../utils/messages');
-const { showBanner } = require('../../external/banner');
-const { validateInstallation } = require('../../utils/validations');
+import { configFileExists } from '../../utils/messages';
+import { showBanner } from '../../external/banner';
+import { validateInstallation } from '../../utils/validations';
 
 exports.dockerize = () => {
   showBanner();

diff --git a/src/commands/deploy/gitRepo.js b/src/commands/deploy/gitRepo.js
@@ -1,12 +1,12 @@
 'use strict';
 
-const inquirer = require('inquirer');
-const shell = require('shelljs');
+import inquirer from 'inquirer';
+import shell from 'shelljs';
 
-const { appData } = require('../../utils/projectConfig');
-const { configFileExists } = require('../../utils/messages');
-const { showBanner } = require('../../external/banner');
-const { validateInstallation } = require('../../utils/validations');
+import { appData } from '../../utils/projectConfig';
+import { configFileExists } from '../../utils/messages';
+import { showBanner } from '../../external/banner';
+import { validateInstallation } from '../../utils/validations';
 
 let projectName;
 let deleteCommand; // Delete .git based on the platform

diff --git a/src/commands/deploy/herokuDeploy.js b/src/commands/deploy/herokuDeploy.js
@@ -1,12 +1,12 @@
 'use strict';
 
-const inquirer = require('inquirer');
-const os = require('os');
-const shell = require('shelljs');
+import inquirer from 'inquirer';
+import os from 'os';
+import shell from 'shelljs';
 
-const { appData } = require('../../utils/projectConfig');
-const { configFileExists, dependencyNotInstalled } = require('../../utils/messages');
-const { showBanner } = require('../../external/banner');
+import { appData } from '../../utils/projectConfig';
+import { configFileExists, dependencyNotInstalled } from '../../utils/messages';
+import { showBanner } from '../../external/banner';
 
 // Determining host OS
 let isLinux = process.platform === 'linux';

diff --git a/src/commands/serve/launch.js b/src/commands/serve/launch.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const chalk = require('chalk');
-const elegantSpinner = require('elegant-spinner');
-const logUpdate = require('log-update');
-const opn = require('opn');
-const shell = require('shelljs');
+import chalk from 'chalk';
+import elegantSpinner from 'elegant-spinner';
+import logUpdate from 'log-update';
+import opn from 'opn';
+import shell from 'shelljs';
 
 exports.serveProject = async (launchCmd, projectTemplate) => {
   let frame = elegantSpinner();

diff --git a/src/commands/serve/setup.js b/src/commands/serve/setup.js
@@ -1,12 +1,12 @@
 'use strict';
 
-const inquirer = require('inquirer');
-const shell = require('shelljs');
+import inquirer from 'inquirer';
+import shell from 'shelljs';
 
-const { appData } = require('../../utils/projectConfig');
-const { configFileExists } = require('../../utils/messages');
-const { serveProject } = require('./launch');
-const { showBanner } = require('../../external/banner');
+import { appData } from '../../utils/projectConfig';
+import { configFileExists } from '../../utils/messages';
+import { serveProject } from './launch';
+import { showBanner } from '../../external/banner';
 
 let projectTemplate;
 
@@ -28,7 +28,7 @@ exports.setupProject = () => {
       .then((data) => {
         projectTemplate = data.template;
       });
-      
+
       if (choice.side === 'client') {
         if (projectTemplate !== 'Nuxt-js') {
           shell.cd('client');

diff --git a/src/external/banner.js b/src/external/banner.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const clear = require('clear');
-const figlet = require('figlet');
-const chalk = require('chalk');
+import clear from 'clear';
+import figlet from 'figlet';
+import chalk from 'chalk';
 
 exports.showBanner = () => {
   clear();

diff --git a/src/utils/createFile.js b/src/utils/createFile.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const fs = require('fs');
-const showPrompt = require('./fileOverwritePrompt.js');
+import fs from 'fs';
+import { showPrompt } from './fileOverwritePrompt.js';
+
+exports.createFile = (fileName, contents, flag = { flag: 'a' }, cb) => {
 
-let createFile = (fileName, contents, flag = { flag: 'a' }, cb) => {
-
   fs.writeFile(fileName, contents, flag, (err) => {
     if (err) {
       if (err.code === 'EEXIST') {
@@ -19,5 +19,3 @@ let createFile = (fileName, contents, flag = { flag: 'a' }, cb) => {
     }
   });
 };
-
-module.exports = createFile;
diff --git a/src/utils/fileOverwritePrompt.js b/src/utils/fileOverwritePrompt.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const inquirer = require('inquirer');
+import inquirer from 'inquirer';
 
-let showPrompt = (fileName, cb) => {
+exports.showPrompt = (fileName, cb) => {
   const defaultQuestion = [{
     type: 'confirm',
     name: 'overwriteFile',
@@ -12,5 +12,3 @@ let showPrompt = (fileName, cb) => {
 
   return inquirer.prompt(defaultQuestion).then(answer => cb(answer));
 };
-
-module.exports = showPrompt;
diff --git a/src/utils/messages.js b/src/utils/messages.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const chalk = require('chalk');
-const fs = require('fs');
+import chalk from 'chalk';
+import fs from 'fs';
 
 exports.configFileExists = () => {
   if (!fs.existsSync('./mevn.json')) {

diff --git a/src/utils/projectConfig.js b/src/utils/projectConfig.js
@@ -1,8 +1,7 @@
 'use strict';
 
-const fs = require('fs');
-
-const { configFileExists } = require('../utils/messages');
+import fs from 'fs';
+import { configFileExists } from '../utils/messages';
 
 exports.appData = () => {
   configFileExists();

diff --git a/src/utils/validations.js b/src/utils/validations.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const shell = require('shelljs');
-const inquirer = require('inquirer');
+import inquirer from 'inquirer';
+import shell from 'shelljs';
 
-const { dependencyNotInstalled } = require('./messages');
-const { executeCommands } = require('../commands/deploy/herokuDeploy');
+import { dependencyNotInstalled } from './messages';
+import { executeCommands } from '../commands/deploy/herokuDeploy';
 
 // Determining host OS
 let isLinux = process.platform === 'linux';