Move dependencies and improve yarn detection

element-template/package.json

@@ -31,9 +31,6 @@
     "@nutmeg/seed": "0.4.2"
   },
   "devDependencies": {
-    "@nutmeg/cli": "<%= cliSource %>",
-    "@types/chai": "4.1.1",
-    "@types/mocha": "2.2.46",
-    "@webcomponents/webcomponentsjs": "1.1.0"
+    "@nutmeg/cli": "<%= cliSource %>"
   }
 }

element-template/partial/fixture.ts

@@ -4,6 +4,6 @@ component = fixture('<<%= tag %><%
   } else if(['number', 'string'].includes(property.type)) {
     print(` ${property.name}="${property.value}"`);
   } %>></<%= tag %>>');<% if (!['number', 'string', 'boolean'].includes(property.type)) {
-  print('      /** Set typical complex property. */\n');
+  print('\n      /** Set typical complex property. */\n');
   print(`      // component.${property.name} = ${property.type}`);
 } %>

element-template/src/element-template.ts

@@ -25,7 +25,7 @@ export class <%= name %> extends Seed {
 
   /** Rerender when the observed attributes change. */
   public attributeChangedCallback(name: string, oldValue: any, newValue: any) {
-    super.attributeChangedCallback(name, oldValue, newValue)
+    super.attributeChangedCallback(name, oldValue, newValue);
   }
 
   /** Styling for the component. */

package.json

@@ -42,15 +42,18 @@
   "scripts": {
     "build": "tsc",
     "prepare": "npm run build",
-    "pretest": "mkdir tmp",
-    "test": "cd tmp && nutmeg new ci-test first:number second:string third:boolean --cli-source file:../.. --no-yarn && cd ci-test && npm run test",
-    "test:yarn": "cd tmp && nutmeg new ci-test first:number second:string third:boolean --cli-source file:../.. && cd ci-test && npm run test",
+    "pretest": "mkdir tmp && npm pack . && node ./scripts/rename-pack.js",
+    "test": "cd tmp && nutmeg new ci-test first:number second:string third:boolean --no-yarn --cli-source file:../../nutmeg-cli-latest.tgz && cd ci-test && npm run test",
+    "test:yarn": "cd tmp && nutmeg new ci-test first:number second:string third:boolean --yarn --cli-source file:../.. && cd ci-test && npm run test",
     "watch": "tsc --watch"
   },
   "engines": {
     "node": ">=8"
   },
   "dependencies": {
+    "@types/chai": "4.1.1",
+    "@types/mocha": "2.2.46",
+    "@webcomponents/webcomponentsjs": "1.1.0",
     "babel-preset-env": "1.6.1",
     "chai": "4.1.2",
     "commander": "2.13.0",

scripts/rename-pack.js

@@ -0,0 +1,5 @@
+const fs = require('fs');
+const path = require('path');
+const pkg = require(path.resolve('./package.json'));
+
+fs.renameSync(path.resolve(`./nutmeg-cli-${pkg.version}.tgz`), path.resolve(`./nutmeg-cli-latest.tgz`));

src/new.ts

@@ -1,3 +1,4 @@
+import * as fs from 'fs';
 import * as path from 'path';
 import * as program from 'commander';
 import * as shell from 'shelljs';
@@ -11,7 +12,7 @@ notifyOfUpdate();
 
 program.command('new <component-name> [property:type...]', 'generate a Web Component')
        .option('--cli-source <location>', 'install @nutmeg/cli dependency from local or github')
-       .option('--no-yarn', 'always use NPM')
+       .option('--yarn', 'use Yarn to install dependencies')
        .option('--no-dependencies', 'skip installing dependencies');
 
 program.parse(process.argv);
@@ -21,6 +22,7 @@ const nutmegDir = path.resolve(process.argv[1], '../..');
 const workingDir = path.resolve('./');
 const cliSource = program.cliSource || require('../package.json')['version'];
 const requestedProperties = program.args.slice(1);
+const installedWithYarn = fs.existsSync(path.resolve(nutmegDir, 'yarn.lock'));
 const properties = new Properties(requestedProperties);
 const generator = new Generator(nutmegDir, workingDir, component.tag);
 const data = {
@@ -39,7 +41,7 @@ generator.execute(data)
   .then(() => {
     shell.cd(component.tag);
     commitToGit();
-    installDependencies({ withYarn: program.yarn, withDependencies: program.dependencies });
+    installDependencies({ withYarn: program.yarn || installedWithYarn, withDependencies: program.dependencies });
     console.log(`🎉 Component generated`);
     console.log(`🌱 Run \`npm run serve\` from ${component.tag} to start building`);
   })

src/utils.ts

@@ -48,7 +48,7 @@ function installDependencies(options: { withYarn: boolean, withDependencies: boo
     console.log('📦 Skipping dependencies');
   } else {
     const useYarn = hasYarn() && options.withYarn;
-    console.log(`🎁 Installing dependencies with ${useYarn ? 'Yarn' : 'NPM'}`);
+    console.log(`🎁  Installing dependencies with ${useYarn ? 'Yarn' : 'NPM'}`);
     if (useYarn) {
       shell.exec('yarn', { silent: true });
     } else {