Clean the template-full option and add a prettier config file

Author: samerbuna

.prettierrc

@@ -0,0 +1,8 @@
+{
+  "bracketSpacing": false,
+  "singleQuote": true,
+  "jsxBracketSameLine": true,
+  "trailingComma": "es5",
+  "printWidth": 80,
+  "proseWrap": "always"
+}

packages/reactful-main/bin/reactful.js

@@ -6,7 +6,7 @@ const config = {};
 
 async function reactfulCreate() {
   try {
-    const { appName, appPath } = config;
+    const {appName, appPath} = config;
     console.info(`\n***** Creating ${appName} app *****\n`);
 
     require('../lib/copy')(config);
@@ -46,6 +46,7 @@ async function main() {
   const commandExists = require('../lib/commandExists');
   config.useYarn = await commandExists('yarn');
   config.useGit = await commandExists('git');
+  config.appType = 'simple';
 
   const [firstArg, secondArg] = process.argv.slice(2);
 
@@ -54,25 +55,22 @@ async function main() {
     return;
   }
 
-  if (firstArg === 'init' || firstArg === 'init-full') {
+  if (firstArg === 'init') {
     config.appPath = '.';
     config.appName = path.basename(path.resolve('.'));
-    config.appType = firstArg === 'init' ? 'simple' : 'full';
-    return reactfulCreate();
   }
 
-  if (firstArg === 'new' || firstArg === 'new-full') {
+  if (firstArg === 'new') {
     config.appPath = config.appName = secondArg;
-    config.appType = firstArg === 'new' ? 'simple' : 'full';
-    return reactfulCreate();
   }
 
-  if (fs.existsSync(path.resolve('src', 'server', 'config.js'))) {
-    return forwardCommand(firstArg, secondArg);
-  }
+  if (!['init', 'new'].includes(firstArg)) {
+    if (fs.existsSync(path.resolve('src', 'server', 'config.js'))) {
+      return forwardCommand(firstArg, secondArg);
+    }
 
-  config.appPath = config.appName = firstArg;
-  config.appType = 'simple';
+    config.appPath = config.appName = firstArg;
+  }
 
   reactfulCreate();
 }

packages/reactful-main/lib/copy.js

@@ -1,24 +1,20 @@
 const path = require('path');
-const { copy, inspect } = require('fs-jetpack');
+const {copy, inspect} = require('fs-jetpack');
 const prompt = require('prompt-sync')();
 
-module.exports = function reactfulCopy({ appPath, appType }) {
-  const templateDir = path.resolve(
-    __dirname,
-    '..',
-    appType === 'simple' ? 'template' : 'template-full'
-  );
+module.exports = function reactfulCopy({appPath}) {
+  const templateDir = path.resolve(__dirname, '..', 'template');
 
   copy(templateDir, appPath, {
     overwrite: (src, dest) => {
       if (
-        inspect(src.absolutePath, { checksum: 'md5' }).md5 !==
-        inspect(dest.absolutePath, { checksum: 'md5' }).md5
+        inspect(src.absolutePath, {checksum: 'md5'}).md5 !==
+        inspect(dest.absolutePath, {checksum: 'md5'}).md5
       ) {
         const answer = prompt(`Replace ${src.name}? [y|n] `);
         return answer.match(/(yes|yep|y|sure)/, 'i');
       }
       return true;
-    },
+    }
   });
 };

packages/reactful-main/lib/init.js

@@ -1,11 +1,11 @@
 const path = require('path');
 const fs = require('fs');
-const { spawn } = require('child_process');
+const {spawn} = require('child_process');
 
 module.exports = function reactfulInit(config) {
   return new Promise((resolve, reject) => {
     const pmCommand = config.useYarn ? 'yarn' : 'npm';
-    const { appName, appPath } = config;
+    const {appName, appPath} = config;
     const packageJson = {
       name: appName,
       version: '0.1.0',
@@ -27,19 +27,15 @@ module.exports = function reactfulInit(config) {
         'prod-stop': `pm2 stop ${appName}Prod`,
         'prod-reload': `pm2 reload --update-env ${appName}Prod`,
         'prod-logs': `pm2 logs ${appName}Prod`,
-        _reactful_commands: '_reactful_commands',
+        _reactful_commands: '_reactful_commands'
       },
       babel: {
-        presets: [
-          'react',
-          ['env', { targets: { node: 'current' } }],
-          'stage-2',
-        ],
+        presets: ['react', ['env', {targets: {node: 'current'}}], 'stage-2']
       },
       jest: {
         modulePaths: ['./src'],
-        testPathIgnorePatterns: ['/node_modules/'],
-      },
+        testPathIgnorePatterns: ['/node_modules/']
+      }
     };
 
     fs.writeFileSync(
@@ -55,23 +51,15 @@ module.exports = function reactfulInit(config) {
     const reactfulJson = {
       main: 'main.js',
       styles: 'styles.js',
-      vendor: 'vendor.js',
+      vendor: 'vendor.js'
     };
 
     fs.writeFileSync(
       path.resolve(appPath, '.reactful.json'),
       JSON.stringify(reactfulJson, null, 2)
     );
 
-    const {
-      main: mainDeps,
-      dev: devDeps,
-      full: fullDeps,
-    } = require('./dependencies');
-
-    if (config.appType === 'full') {
-      mainDeps.push(...fullDeps);
-    }
+    const {main: mainDeps, dev: devDeps} = require('./dependencies');
 
     const installProdCmd = config.useYarn ? 'yarn add' : 'npm install --save';
     const installDevCmd = config.useYarn
@@ -87,7 +75,7 @@ module.exports = function reactfulInit(config) {
       {
         shell: true,
         stdio: 'inherit',
-        cwd: path.resolve(appPath),
+        cwd: path.resolve(appPath)
       }
     );
 

packages/reactful-main/template/src/components/App.test.js

@@ -6,7 +6,7 @@ import renderer from 'react-test-renderer';
 describe('App', () => {
   it('renders correctly', () => {
     const tree = renderer
-      .create(<App initialData={{ appName: 'TEST' }} />)
+      .create(<App initialData={{appName: 'TEST'}} />)
       .toJSON();
 
     expect(tree).toMatchSnapshot();

packages/reactful-main/template/src/server/server.js

@@ -14,7 +14,7 @@ app.use(morgan('common'));
 app.use(express.static('public'));
 
 app.set('view engine', 'ejs');
-app.use(bodyParser.urlencoded({ extended: false }));
+app.use(bodyParser.urlencoded({extended: false}));
 app.use(bodyParser.json());
 
 app.locals.serialize = serialize;
@@ -42,7 +42,7 @@ app.listen(config.port, config.host, () => {
   fs.writeFileSync(
     path.resolve('.reactful.json'),
     JSON.stringify(
-      { ...app.locals.gVars, host: config.host, port: config.port },
+      {...app.locals.gVars, host: config.host, port: config.port},
       null,
       2
     )