feat: bundled builds (#49)

* Bundler WIP

* blueprints: update app blueprint for bundled output

* refactor bin/denali.ts to simplify, make more robust

* remove extraneous commented code, add pkg-dir

* use generic names for bundled output files

* wrap unit tests with a bundle reference

* Bundler WIP

* lazy load jscodeshift to reduce CLI startup time

* rework ejections to ensure we avoid race conditions in command acceptance tests

* fix: improve debug output, avoid circular deps when creating builders

Author: davewasmer

.vscode/settings.json

@@ -1,3 +1,7 @@
 {
-  "eslint.enable": false
+    "eslint.enable": false,
+    "workbench.colorCustomizations": {
+      "titleBar.activeBackground": "#1d8da8",
+      "titleBar.activeForeground": "#ffffff"
+    }
 }

.vscode/tasks.json

@@ -1,43 +1,16 @@
 {
   // See https://go.microsoft.com/fwlink/?LinkId=733558
   // for the documentation about the tasks.json format
-  "version": "0.1.0",
-  "command": "npm",
-  "isShellCommand": true,
-  "showOutput": "always",
-  "suppressTaskName": true,
+  "version": "2.0.0",
   "tasks": [
     {
-      "taskName": "build",
-      "args": ["run", "build"],
-      "isBuildCommand": true
-    },
-    {
-      "taskName": "lint",
-      "args": ["run", "lint"],
-      "problemMatcher": {
-        "owner": "external",
-        "fileLocation": [
-          "relative",
-          "${workspaceRoot}"
-        ],
-        "severity": "warning",
-        "pattern": {
-          "regexp": "^(\\S.*)\\[(\\d+), (\\d+)\\]:\\s+(.*)$",
-          "file": 1,
-          "line": 2,
-          "column": 3,
-          "message": 4
-        }
+      "type": "npm",
+      "script": "build",
+      "problemMatcher": [],
+      "group": {
+        "kind": "build",
+        "isDefault": true
       }
-    },
-    {
-      "taskName": "update",
-      "args": ["update"]
-    },
-    {
-      "taskName": "test",
-      "args": ["run", "test"]
     }
   ]
 }

bin/denali.ts

@@ -1,65 +1,53 @@
 #!/usr/bin/env node
-import 'main-dir';
-import SourceMapSupport = require('source-map-support');
+
 import { satisfies } from 'semver';
 import * as chalk from 'chalk';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as NestedError from 'nested-error-stacks';
 import * as resolve from 'resolve';
-import findup = require('findup-sync');
+import { sync as readPkgUp } from 'read-pkg-up';
+import * as pkgDir from 'pkg-dir';
 
 /* tslint:disable:no-console */
 
-SourceMapSupport.install();
-
 process.title = 'denali';
 
 let version = process.version;
 
 if (!satisfies(process.version, '>=7.6')) {
-  console.error(chalk.red('`denali` requires node version >= 7.6, you used ' + version));
-  process.exit(1);
+  throw new Error(`Denali requires node version >= 7.6, you used ${ version }`);
 }
 
-let pkgPath = findup('package.json');
+let projectPkg: any = null;
+let cliPkg: any;
+let cliBootstrapPath: string;
+let source: string;
 
-/**
- * Load the globally installed version of the CLI and kick it off from there. Commands will be
- * loaded from the global package namespace.
- */
-function loadGlobalCli() {
-  let pkg = require('../../package.json');
-  process.stdout.write(`cli v${ pkg.version } [global] `);
+try {
   try {
-    require('../lib/bootstrap').default();
-  } catch (error) {
-    throw new NestedError('Globally installed CLI failed to load', error);
+    projectPkg = readPkgUp().pkg;
+    let projectDir = pkgDir();
+    let localCliMain = resolve.sync('denali-cli', { basedir: projectDir });
+    let localCliDir = pkgDir(localCliMain);
+    cliPkg = readPkgUp({ cwd: localCliMain });
+    process.chdir(projectDir);
+    source = fs.lstatSync(localCliDir).isSymbolicLink() ? 'linked' : 'local';
+    cliBootstrapPath = path.join(localCliDir, 'dist/lib/bootstrap');
+  } catch (e) {
+    cliPkg = readPkgUp({ cwd: __dirname }).pkg;
+    cliBootstrapPath = path.join(__dirname, '../lib/bootstrap');
+    source = 'global';
   }
-}
 
-// No package.json found, revert to global install
-if (!pkgPath) {
-  loadGlobalCli();
-// Package.json found
-} else {
-  let pkg = require(pkgPath);
-  let pkgDir = path.dirname(path.resolve(pkgPath));
-  // If a local copy of denali exists, use that, unless we are actually running
-  // this in the denali repo itself
+  process.stdout.write(`cli v${ cliPkg.version } [${ source }]`);
+
   try {
-    let localCliMain = resolve.sync('denali-cli', { basedir: pkgDir });
-    let localCliDir = path.dirname(findup('package.json', { cwd: localCliMain }));
-    let cliPkgType = fs.lstatSync(localCliDir).isSymbolicLink() ? 'linked' : 'local';
-    let localCliPkg = require(path.join(localCliDir, 'package.json'));
-    process.stdout.write(`cli v${ localCliPkg.version } [${ cliPkgType }] `);
-    try {
-      process.chdir(pkgDir);
-      require(path.join(localCliDir, 'dist', 'lib', 'bootstrap')).default(pkg);
-    } catch (error) {
-      throw new NestedError('Error encountered while starting up denali-cli', error);
-    }
-  } catch (e) {
-    loadGlobalCli();
+    require(cliBootstrapPath).default(projectPkg);
+  } catch (error) {
+    throw new NestedError('\nError encountered while starting up denali-cli', error);
   }
+} catch (e) {
+  console.error(chalk.red(e.stack || e.message || e));
+  process.exit(1);
 }

blueprints/addon/files/__name__/denali-build.js

@@ -1,3 +1,3 @@
-const { Builder } = require('denali-cli');
+const { AddonBuilder } = require('denali-cli');
 
-module.exports = class <%= className %>Builder extends Builder {};
+module.exports = class <%= className %>Builder extends AddonBuilder {};

blueprints/addon/files/__name__/test/dummy/denali-build.js

@@ -0,0 +1,3 @@
+const { DummyBuilder } = require('denali-cli');
+
+module.exports = class extends DummyBuilder {};

blueprints/app/files/__name__/app/index.js

@@ -1,3 +1,3 @@
-import MemoryAdapter from 'denali';
+import { MemoryAdapter } from 'denali';
 
 export default MemoryAdapter;

blueprints/app/files/__name__/app/orm-adapters/application.js

@@ -1,3 +1,3 @@
-const { Builder } = require('denali-cli');
+const { AppBuilder } = require('denali-cli');
 
-module.exports = class <%= className %>Builder extends Builder {};
+module.exports = class <%= className %>Builder extends AppBuilder {};

blueprints/app/files/__name__/denali-build.js

@@ -0,0 +1,9 @@
+const bundle = require('./dist/<%= name %>.runtime');
+const container = bundle();
+
+const Application = container.lookup('app:application');
+const application = new Application(container.loader, { environment: process.env.NODE_ENV || 'development' });
+application.start();
+
+module.exports = application;
+

blueprints/app/files/__name__/index.js

@@ -12,7 +12,6 @@ import { execSync, ExecSyncOptions } from 'child_process';
 import { sync as commandExists } from 'command-exists';
 import * as chalk from 'chalk';
 import * as walk from 'walk-sync';
-import * as codeshift from 'jscodeshift';
 import * as mkdirp from 'mkdirp';
 import * as rimraf from 'rimraf';
 import * as yargs from 'yargs';
@@ -330,8 +329,8 @@ export default class Blueprint extends Command {
       ui.warn(`Attempted to add "${ method.toUpperCase() } ${ urlPattern } -> ${ actionPath }" route, but config/routes.js does not exist. Skipping ...`);
       return;
     }
-    let j = codeshift;
-    let ast = codeshift(routesSource);
+    let j = require('jscodeshift');
+    let ast = j(routesSource);
     let drawRoutesFunction = ast.find(j.ExportDefaultDeclaration).get().value.declaration;
     let routerArgName = drawRoutesFunction.params[0].name;
     let drawRoutesFunctionBody = j(drawRoutesFunction.body);
@@ -377,8 +376,8 @@ export default class Blueprint extends Command {
       ui.warn(`Attempted to remove "${ method.toUpperCase() } ${ urlPattern } -> ${ actionPath }" route, but config/routes.js does not exist. Skipping ...`);
       return;
     }
-    let j = codeshift;
-    let ast = codeshift(routesSource);
+    let j = require('codeshift');
+    let ast = j(routesSource);
     let drawRoutesFunction = ast.find(j.ExportDefaultDeclaration).get().value.declaration;
     let routerArgName = drawRoutesFunction.params[0].name;
     let drawRoutesFunctionBody = j(drawRoutesFunction.body);

lib/blueprint.ts

@@ -54,7 +54,7 @@ export default function run(projectPkg?: any)  {
 
     debug(`found ${ keys(addonCommands).length } commands from ${ addon.pkg.name }: [ ${ keys(addonCommands).join(', ') } ] `);
     if (addon.pkg.name === 'denali') {
-      assert(keys(addonCommands).length > 0, 'Denali package was found, but unable to load core commands - is your Denali installation corrupted?');
+      assert(keys(addonCommands).length > 0, 'Denali package was found, but no core commands were found. Is your Denali installation corrupted?');
       coreCommands = addonCommands;
 
       let denaliInstallType: string;