Adding new template proposal. Resolves #71

Author: hutchgrant

.circleci/config.yml

@@ -32,21 +32,4 @@ jobs:
 
       - run:
           name: Run Unit Tests
-          command: export NODE_ENV=production && npm run test
-
-      - run:
-          name: Execute The Build
-          command: npm run build
-
-      - run:
-          name: CEA Install Self Test
-          command: node ./tasks/cea-install my-app
-
-      # Sanity test yarn install and tasks
-      - run:
-          name: Yarn install test
-          command: rm -rf ./node_modules && yarn install
-
-      - run:
-          name: Yarn tasks test
-          command: export NODE_ENV=production && yarn lint && yarn build && yarn test
+          command: export NODE_ENV=production && npm run test-template && npm test

package-lock.json

@@ -17,72 +17,18 @@
   "bin": {
     "create-evergreen-app": "./tasks/cea-install.js"
   },
-  "files": [
-    ".browserslistrc",
-    ".editorconfig",
-    ".eslintrc",
-    ".gitattributes",
-    "yarn.lock",
-    "package-lock.json",
-    "babel.config.js",
-    "karma-test-shim.js",
-    "karma.conf.js",
-    "lws.config.js",
-    "postcss.config.js",
-    "README.md",
-    "webpack.config.common.js",
-    "webpack.config.develop.js",
-    "webpack.config.prod.js",
-    "src/",
-    "tasks/"
-  ],
   "scripts": {
-    "build": "rimraf ./public && webpack --config ./webpack.config.prod.js --progress",
-    "develop": "webpack-dev-server --config ./webpack.config.develop.js --open",
-    "gh-pages": "rimraf ./docs && npm run build && cp -rv ./public/ ./docs",
-    "lint": "eslint \"*.js\" \"./src/**/*.js\"",
-    "serve": "npm run build && ws",
-    "start": "npm run develop",
-    "test": "rimraf ./reports && karma start"
+    "lint": "eslint \"./tasks/**/*.js\"",
+    "test-template": "npm i --prefix template && npm test --prefix template",
+    "test": "mocha --timeout 2000"
   },
   "dependencies": {
-    "@polymer/lit-element": "^0.6.1"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.1.0",
-    "@babel/preset-env": "^7.1.0",
-    "@webcomponents/webcomponentsjs": "^2.1.3",
-    "babel-loader": "^8.0.2",
-    "babel-plugin-transform-builtin-classes": "^0.6.1",
-    "css-loader": "^1.0.0",
-    "css-to-string-loader": "^0.1.3",
-    "cssnano": "^4.1.0",
-    "eslint": "^5.6.0",
-    "eslint-loader": "^2.1.1",
-    "favicons-webpack-plugin": "0.0.9",
-    "file-loader": "^2.0.0",
-    "html-webpack-plugin": "^3.2.0",
-    "istanbul-instrumenter-loader": "^3.0.1",
-    "jasmine": "^3.2.0",
-    "jasmine-core": "^3.2.1",
-    "karma": "^3.0.0",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage-istanbul-reporter": "^2.0.4",
-    "karma-firefox-launcher": "^1.1.0",
-    "karma-jasmine": "^1.1.2",
-    "karma-junit-reporter": "^1.2.0",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^3.0.5",
-    "local-web-server": "^2.6.0",
-    "postcss-cssnext": "^3.1.0",
-    "postcss-loader": "^3.0.0",
-    "puppeteer": "^0.11.0",
-    "rimraf": "^2.6.2",
-    "webpack": "^4.22.0",
-    "webpack-bundle-analyzer": "^3.0.2",
-    "webpack-cli": "^3.1.0",
-    "webpack-dev-server": "^3.1.9",
-    "webpack-manifest-plugin": "^2.0.4",
-    "webpack-merge": "^4.1.4"
+    "chai": "^4.2.0",
+    "chai-as-promised": "^7.1.1",
+    "chalk": "^2.4.2",
+    "commander": "^2.19.0",
+    "eslint": "^5.13.0",
+    "fs-extra": "^7.0.1",
+    "mocha": "^5.2.0"
   }
 }

package.json

@@ -1,46 +1,61 @@
 #!/usr/bin/env node
 /* eslint no-console: 0 */
 
-// THIS SCRIPT SHOULD ONLY USE NATIVE NODE.JS APIs, NO PACKAGES FROM NPM ALLOWED
 const copyFolder = require('./copy-folder');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const { spawn } = require('child_process');
+const chalk = require('chalk');
+const commander = require('commander');
+const templatePkg = require(path.join(__dirname, '..', '/template/package.json'));
 
 let TARGET_DIR;
 
-console.log('-------------------------------------------------------');
-console.log('Welcome to Create Evergreen App ♻️');
-console.log('-------------------------------------------------------');
+console.log(`${chalk.rgb(175, 207, 71)('-------------------------------------------------------')}`);
+console.log(`${chalk.rgb(175, 207, 71)('Welcome to Create Evergreen App ♻️')}`);
+console.log(`${chalk.rgb(175, 207, 71)('-------------------------------------------------------')}`);
+
+const program = new commander.Command(templatePkg.name)
+  .version(templatePkg.version)
+  .arguments('<application-directory>')
+  .usage(`${chalk.green('<application-directory>')} [options]`)
+  .action(name => {
+    TARGET_DIR = name;
+  })
+  .option('--yarn', 'Use yarn package manager instead of npm default')
+  .parse(process.argv);
+
+if (program.yarn) {
+  console.log('Yarn Enabled');
+}
 
 // Check target application directory/name is included in args
 // warn if directory is present, else create new target directory
-const checkTargetDir = async appDir => {
-  if (!appDir) {
+const checkTargetDir = async () => {
+  if (typeof TARGET_DIR === 'undefined') {
     console.error(
-      'Missing Project Directory! Please specifiy the application name e.g. create-evergreen-app my-app'
+      `Missing Project Directory! Please specifiy the application name e.g. ${chalk.green('create-evergreen-app my-app')}`
     );
+    console.log();
+    console.log(`Run ${chalk.green('create-evergreen-app --help')} for available options`);
     process.exit(1); // eslint-disable-line no-process-exit
   }
 
-  const targetExists = await fs.existsSync(appDir);
+  const targetExists = await fs.existsSync(TARGET_DIR);
 
   if (targetExists) {
     console.error(
-      `${appDir} already exists, existing project detected? Delete ${appDir} to try again or run from a different directory.`
+      `${TARGET_DIR} already exists, existing project detected? Delete ${TARGET_DIR} to try again or run from a different directory.`
     );
     process.exit(1); // eslint-disable-line no-process-exit
   }
 
-  await fs.mkdirSync(appDir);
-
-  return appDir;
+  return await fs.mkdirSync(TARGET_DIR);
 };
 
 // Create new package.json
 const npmInit = async () => {
-  const templatePkg = require(path.join(__dirname, '..', 'package.json'));
   const appPkg = {
     name: TARGET_DIR,
     version: '0.1.0',
@@ -59,19 +74,19 @@ const npmInit = async () => {
 
 // Copy root and src files to target directory
 const srcInit = async () => {
-  const copyBlacklist = ['tasks/'];
-  const packageFiles = require(path.join(__dirname, '..', 'package.json')).files;
-  const files = packageFiles.filter((file) => {
-    if (copyBlacklist.indexOf(file) < 0) {
-      return file;
-    }
-  });
+  // const copyBlacklist = [''];
+  const packageFiles = require(path.join(__dirname, '..', '/template/package.json')).files;
+  // const files = packageFiles.filter((file) => {
+  //   if (copyBlacklist.indexOf(file) < 0) {
+  //     return file;
+  //   }
+  // });
 
   await createGitIgnore();
 
   return await Promise.all(
-    files.map(async file => {
-      const resolvedPath = path.join(__dirname, '..', file);
+    packageFiles.map(async file => {
+      const resolvedPath = path.join(__dirname, '..', '/template/', file);
 
       if (fs.lstatSync(resolvedPath).isDirectory()) {
         return await copyFolder(resolvedPath, TARGET_DIR);
@@ -111,7 +126,8 @@ const createGitIgnore = () => {
 // Install npm dependencies
 const install = () => {
   return new Promise((resolve, reject) => {
-    const command = os.platform() === 'win32' ? 'npm.cmd' : 'npm';
+    const pkgMng = program.yarn ? 'yarn' : 'npm'; // default to npm
+    const command = os.platform() === 'win32' ? `${pkgMng}.cmd` : pkgMng;
     const args = ['install', '--save', '--save-exact', '--loglevel', 'error'];
     const process = spawn(command, args, { stdio: 'inherit' });
 
@@ -130,7 +146,7 @@ const install = () => {
 const run = async () => {
   try {
     console.log('Preparing project directory...');
-    TARGET_DIR = await checkTargetDir(process.argv[2]);
+    await checkTargetDir();
 
     console.log('Initializing npm dependencies...');
     npmInit();

tasks/cea-install.js

@@ -0,0 +1,10 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false