Merge pull request #35 from nobrainr/feat/template-as-npm-package

Feat/template as npm package

lerna.json

@@ -4,6 +4,6 @@
       "ignoreChanges": ["*.npmrc"]
     }
   },
-  "packages": ["packages/*"],
-  "version": "0.3.1"
+  "packages": ["packages/cli", "packages/e2e", "packages/templates/*"],
+  "version": "independent"
 }

package.json

@@ -1,11 +1,12 @@
 {
   "name": "typescript-webpack-starter",
   "version": "0.2.0",
-  "description": "A damn simple starter for Typescript and Webpack",
+  "description": "",
+  "private": true,
   "main": "src/index.ts",
   "scripts": {
     "build": "lerna bootstrap",
-    "update-cli-in-e2e": "lerna add create-ts-lib packages/e2e",
+    "update-cli-in-e2e": "lerna add create-ts-lib --scope=e2e --dev --exact",
     "test": "cd packages/e2e && npm test",
     "publish": "lerna run publish-cli"
   },

packages/cli/createTsLib.js

@@ -77,22 +77,42 @@ function createApp(name) {
   run(root, appName, originalDirectory);
 }
 
-function run(root, appName, originalDirectory) {
-  const templatePath = path.resolve(__dirname, 'template');
-  if (fs.existsSync(templatePath)) {
-    fs.copySync(templatePath, root);
-    let packageJsonPath = path.join(root, 'package.json');
-    let packageJson = require(packageJsonPath);
-    packageJson.name = appName;
-    packageJson.version = '0.0.1';
-
-    fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
-    console.log('Installing packages. This might take a couple of minutes.');
-    return install();
-  } else {
-    console.error(`Could not locate supplied template: ${chalk.green(templatePath)}`);
-    return;
+async function run(root, appName, originalDirectory) {
+  function installTemplate(templateName) {
+    try {
+      console.log('loading template', templateName);
+      const res = require('child_process')
+        .execSync(`npm install ${templateName}`)
+        .toString()
+        .trim();
+      console.log(`${templateName} loaded successfully`);
+    } catch (e) {
+      console.log(`${templateName} err`);
+    }
+  }
+  const templateName = '@nobrainr/typescript_universal-webpack-karma_jasmine';
+  const templatePath = path.resolve(__dirname, 'node_modules', templateName);
+  if (!fs.existsSync(templatePath)) {
+    try {
+      installTemplate(templateName);
+    } catch (e) {
+      console.log(e);
+    }
   }
+  fs.copySync(templatePath, root, {
+    dereference: true,
+    filter: function(path) {
+      return path.indexOf(`${templateName}/node_modules`) === -1;
+    }
+  });
+  let packageJsonPath = path.join(root, 'package.json');
+  let packageJson = require(packageJsonPath);
+  packageJson.name = appName;
+  packageJson.version = '0.0.1';
+
+  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
+  console.log('Installing packages. This might take a couple of minutes.');
+  return await install();
 }
 
 function install() {