Change the build process to build all targets at once

Previously each build could target only one output at a time.
You would need to decide what you're targeting before calling the
build/serve commands. We also had to use environment variables to set
the type of dist.

For example, to build for Chrome, you would need to do:

`EMBER_DIST=chrome ember build --output-path dist_chrome/panes`

The build output would end up in `dist_chrome`. The Firefox targetted build
would end up in `dist_firefox`.. etc.

This commit changes the entire concept from one build per target to one
build that targets everything. We now only need to call:

`ember build`

to build all the outputs inside the `dist` directory. The `dist`
directory will contain `chrome`, `firefox`, `websocket`, `bookmarklet`
directories. Build time takes almost the same time to build all outputs
because the difference between them is very minor.

.gitignore

@@ -18,19 +18,4 @@
 npm-debug.log
 testem.log
 
-# dists
-
-/dist_chrome/panes
-/dist_chrome/ember_debug
-/dist_chrome/in-page-script.js
-/dist_chrome/ember-inspector.zip
-
-/dist_firefox/data/panes
-/dist_firefox/data/ember_debug
-/dist_firefox/data/in-page-script.js
-
-/dist_websocket
-
-/dist_bookmarklet
-
 /.mozilla-addon-sdk

.npmignore

@@ -3,8 +3,8 @@ tmp/
 .DS_Store
 *.swp
 
-dist_chrome/ember-inspector.zip
-dist/
+dist/chrome/ember-inspector.zip
+dist/testing
 
 *.xpi
 

Brocfile.js

@@ -10,9 +10,11 @@ var removeFile = require('broccoli-file-remover');
 var path = require('path');
 var jsStringEscape = require('js-string-escape');
 var eslint = require('broccoli-lint-eslint');
+var mv = require('broccoli-stew').mv;
+var writeFile = require('broccoli-file-creator');
+var replace = require('broccoli-replace');
 
 /*global process */
-var dist = process.env.EMBER_DIST;
 
 var options = {
   fingerprint: {
@@ -45,10 +47,10 @@ function eslintTestGenerator(relativePath, errors) {
    "});\n";
 }
 
-if (dist === 'firefox') {
-  options.minifyJS = { enabled: false };
-  options.minifyCSS = { enabled: false };
-}
+// Firefox requires non-minified assets for review :(
+options.minifyJS = { enabled: false };
+options.minifyCSS = { enabled: false };
+
 var app = new EmberApp(options);
 
 var env = process.env.EMBER_ENV;
@@ -131,29 +133,78 @@ emberDebug = concatFiles(emberDebug, {
   wrapInFunction: false
 });
 
-emberDebug = wrapFiles(emberDebug, {
-  wrapper: ["(function(adapter, env) {\n", "\n}('" + (dist || 'basic') + "', '" + env + "'));"]
+var emberDebugs = [];
+['basic', 'chrome', 'firefox', 'bookmarklet', 'websocket'].forEach(function(dist) {
+  emberDebugs[dist] = wrapFiles(emberDebug, {
+    wrapper: ["(function(adapter, env) {\n", "\n}('" + dist + "', '" + env + "'));"]
+  });
 });
 
 var tree = app.toTree();
-tree = mergeTrees([tree, emberDebug]);
 
-if (dist === 'bookmarklet') {
-  var extra = pickFiles('bookmarklet', {
-    srcDir: '/',
-    files: ['load_inspector.js'],
-    destDir: '/'
-  });
-  tree = mergeTrees([tree, extra]);
-}
+var bookmarklet = mergeTrees([tree, emberDebugs.bookmarklet, 'skeleton_bookmarklet']);
 
-if (dist === 'firefox' || dist === 'chrome') {
-  var extra = pickFiles('shared', {
-    srcDir: '/',
-    files: ['in-page-script.js'],
-    destDir: '/'
+var firefoxAndChromeExtra = pickFiles('shared', {
+  srcDir: '/',
+  files: ['in-page-script.js'],
+  destDir: '/'
+});
+
+var firefox = mergeTrees([
+  mv(mergeTrees([tree, firefoxAndChromeExtra, emberDebugs.firefox]), 'data/panes'),
+  'skeleton_firefox'
+]);
+
+var chrome = mergeTrees([
+  mv(mergeTrees([tree, firefoxAndChromeExtra, emberDebugs.chrome]), 'panes'),
+  'skeleton_chrome'
+]);
+
+var websocket = mergeTrees([tree, emberDebugs.websocket]);
+var basic = mergeTrees([tree, emberDebugs.basic]);
+
+// Pass the current dist to the Ember Inspector app.
+chrome = mergeTrees([chrome, mv(writeFile('dist-config.js', "window.EMBER_DIST='chrome';"), 'panes/assets')]);
+firefox = mergeTrees([firefox, mv(writeFile('dist-config.js', "window.EMBER_DIST='firefox';"), 'data/panes/assets')]);
+bookmarklet = mergeTrees([bookmarklet, mv(writeFile('dist-config.js', "window.EMBER_DIST='bookmarklet';"), 'assets')]);
+websocket = mergeTrees([websocket, mv(writeFile('dist-config.js', "window.EMBER_DIST='websocket';"), 'assets')]);
+basic = mergeTrees([basic, mv(writeFile('dist-config.js', "window.EMBER_DIST='basic';"), 'assets')]);
+
+// Add {{ remote-port }} to the head
+// so that the websocket addon can replace it.
+websocket = replace(websocket, {
+  files: ['index.html'],
+  patterns: [{
+    match: /<head>/,
+    replacement: '<head>\n{{ remote-port }}\n'
+  }]
+});
+
+var output;
+
+if (env === 'test') {
+  // `ember test` expects the index.html file to be in the
+  // output directory.
+  output = basic;
+} else {
+
+  // Change base tag for running tests in development env.
+  basic = replace(basic, {
+    files: ['tests/index.html'],
+    patterns: [{
+      match: /<base.*\/>/,
+      replacement: '<base href="../" />'
+    }]
   });
-  tree = mergeTrees([tree, extra]);
+
+  output = mergeTrees([
+    mv(bookmarklet, 'bookmarklet'),
+    mv(firefox, 'firefox'),
+    mv(chrome, 'chrome'),
+    mv(websocket, 'websocket'),
+    mv(basic, 'testing')
+  ]);
 }
 
-module.exports = tree;
+module.exports = output;
+

Gruntfile.js

@@ -7,7 +7,7 @@ module.exports = function(grunt) {
       "stable": {
         options: {
           "mozilla-addon-sdk": "latest",
-          extension_dir: "dist_firefox",
+          extension_dir: "dist/firefox",
           dist_dir: "tmp/xpi"
         }
       }
@@ -24,7 +24,7 @@ module.exports = function(grunt) {
       "run": {
         options: {
           "mozilla-addon-sdk": "latest",
-          extension_dir: "dist_firefox",
+          extension_dir: "dist/firefox",
           command: "run"
         }
       }
@@ -35,7 +35,7 @@ module.exports = function(grunt) {
       },
       dist: {
         prefix: '^"?version"?:\s*[\'"]?',
-        src: ['dist_chrome/manifest.json', 'dist_firefox/package.json']
+        src: ['dist/chrome/manifest.json', 'dist/firefox/package.json']
       }
     },
     "s3": {
@@ -49,7 +49,7 @@ module.exports = function(grunt) {
       },
       bookmarklet: {
         sync: [{
-          src: 'dist_bookmarklet/**/*.*',
+          src: 'dist/bookmarklet/**/*.*',
           dest: 'dist_bookmarklet/',
           rel: 'dist_bookmarklet',
           options: { verify: true }
@@ -59,11 +59,11 @@ module.exports = function(grunt) {
     "compress": {
       main: {
         options: {
-          archive: 'dist_chrome/ember-inspector.zip'
+          archive: 'dist/chrome/ember-inspector.zip'
         },
         expand: true,
         pretty: true,
-        src: 'dist_chrome/**/*'
+        src: 'dist/chrome/**/*'
       }
     }
   };

README.md

@@ -17,11 +17,11 @@ OR:
 - cd into the repo directory
 - run `npm install && bower install`
 - run `npm install -g ember-cli`
-- run `npm run build:chrome` to build the `dist_chrome` directory
+- run `npm build` to build the `dist` directory
 - Visit chrome://extensions in chrome
 - Make sure `Developer mode` is checked
 - Click on 'Load unpacked extension...'
-- Choose the `dist_chrome` folder in the cloned repo
+- Choose the `dist/chrome` folder in the cloned repo
 - Close and re-open developer tools if it's already open
 
 ### Firefox
@@ -34,7 +34,7 @@ OR:
 - cd into the repo directory
 - run `npm install && bower install`
 - run `npm install -g ember-cli`
-- run `npm run build:xpi` to build the `dist_firefox` directory, download Firefox Addon SDK and build Firefox Addon XPI to 'tmp/xpi/ember-inspector.xpi'
+- run `npm run build:xpi` to build the `dist` directory, download Firefox Addon SDK and build Firefox Addon XPI to 'tmp/xpi/ember-inspector.xpi'
   or `npm run run-xpi` to run the Firefox Addon in a temporary profile (or use `FIREFOX_BIN` and `FIREFOX_PROFILE` to customize Firefox profile directory and Firefox binary used to run the extension)
 
 ### Opera
@@ -43,11 +43,11 @@ OR:
 - cd into the repo directory
 - run `npm install`
 - run `npm install -g ember-cli`
-- run `npm run build:chrome` to build the `dist_chrome` directory
+- run `npm build` to build the `dist` directory
 - Visit chrome://extensions in chrome
 - Make sure `Developer mode` is checked
 - Click on 'Load unpacked extension...'
-- Choose the `dist_chrome` folder in the cloned repo
+- Choose the `dist/chrome` folder in the cloned repo
 - Close and re-open developer tools if it's already open
 
 
@@ -66,7 +66,7 @@ For development:
 - create a bookmark (make sure you unblock the popup when you run the bookmarklet):
 
 ```javascript
-javascript: (function() { var s = document.createElement('script'); s.src = 'http://localhost:9191/load_inspector.js'; document.body.appendChild(s); }());
+javascript: (function() { var s = document.createElement('script'); s.src = 'http://localhost:9191/bookmarklet/load_inspector.js'; document.body.appendChild(s); }());
 ```
 
 
@@ -75,21 +75,20 @@ Building and Testing:
 
 Run `npm install && npm install -g ember-cli && && npm install -g bower && bower install && npm install -g grunt-cli` to install the required modules.
 
-- `npm run build:chrome` to build the files in the `dist_chrome` directory
-- `npm run watch:chrome` To watch the files and re-build in `dist_chrome` when anything changes (useful during development).
-- `npm run build:all` to build all the different `dist` directories
+- `npm build` to build the files in the `dist` directory
+- `npm run watch` To watch the files and re-build in `dist` when anything changes (useful during development).
 - `npm test` To run the tests in the terminal
 - `npm run build:xpi` to download and build Firefox Addon XPI into `tmp/xpi/ember-inspector.xpi`
 - `npm run run-xpi` to run the Firefox Addon XPI on a temporary new profile (or use `FIREFOX_BIN` and `FIREFOX_PROFILE` to customize Firefox profile directory and Firefox binary used to run the extension)
-- `npm start` To start the test server at `localhost:4200/tests`
+- `npm start` To start the test server at `localhost:4200/testing/tests`
 
 
 Deploy new version:
 -----------
 
 - Update `package.json` to new version and run `grunt version`
-- `npm run build:all:production`
-- Publish `dist_chrome/ember-inspector.zip` to the Chrome web store
+- `npm run build:production`
+- Publish `dist/chrome/ember-inspector.zip` to the Chrome web store
 - Publish `tmp/xpi/ember-inspector.xpi` to the Mozilla Addons
 - 'git checkout stable && git merge master' and push the `stable` branch (to update the bookmarklet)
 - `npm publish ./`

app/app.js

@@ -29,6 +29,10 @@ App.initializer({
   name: "extension-init",
 
   initialize(container, app) {
+    // `window.EMBER_DIST` is set by dist-config.js
+    // which is created by the build process.
+    app.adapter = window.EMBER_DIST;
+
     // register and inject adapter
     let Adapter;
     if (Ember.typeOf(app.adapter) === 'string') {

app/index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>EmberInspector</title>
+    <title>Ember Inspector</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
@@ -18,6 +18,8 @@
     {{content-for 'body'}}
 
     <script src="assets/vendor.js"></script>
+    <!-- File created by the build process -->
+    <script src="assets/dist-config.js"></script>
     <script src="assets/ember-inspector.js"></script>
 
     {{content-for 'body-footer'}}

config/environment.js

@@ -18,7 +18,6 @@ module.exports = function(environment) {
     },
 
     APP: {
-      adapter: (process.env.EMBER_DIST || 'basic')
       // Here you can pass flags/options to your application instance
       // when it is created
     }

package.json

@@ -9,24 +9,13 @@
     "start": "ember server",
     "build": "ember build",
     "test": "ember test",
-    "build:chrome": "EMBER_DIST=chrome ember build --output-path dist_chrome/panes",
-    "build:firefox": "EMBER_DIST=firefox ember build --output-path dist_firefox/data/panes",
-    "build:bookmarklet": "EMBER_DIST=bookmarklet ember build --output-path dist_bookmarklet",
-    "build:websocket": "EMBER_DIST=websocket ember build --output-path dist_websocket",
-    "build:chrome:production": "npm run build:chrome -- --environment production && grunt compress:main ",
-    "build:firefox:production": "npm run build:firefox -- --environment production",
-    "build:bookmarklet:production": "npm run build:bookmarklet -- --environment production",
-    "build:websocket:production": "npm run build:websocket -- --environment production",
-    "watch:chrome": "npm run build:chrome -- --watch",
-    "watch:firefox": "npm run build:firefox -- --watch",
-    "watch:websocket": "npm run build:websocket -- --watch",
-    "serve:bookmarklet": "EMBER_DIST=bookmarklet ember serve --output-path dist_bookmarklet --port 9191",
-    "build:all": "npm run build:chrome && npm run build:firefox && npm run build:bookmarklet && npm run build:websocket",
-    "build:all:production": "npm run build:chrome:production && npm run build:xpi:production && npm run build:bookmarklet:production && npm run build:websocket:production",
-    "upload": "npm run build:bookmarklet:production && grunt s3:bookmarklet",
-    "run-xpi": "npm run build:firefox && grunt run-xpi",
-    "build:xpi": "npm run build:firefox && grunt build-xpi",
-    "build:xpi:production": "npm run build:firefox:production && grunt clean-tmp build-xpi"
+    "watch": "ember build --watch",
+    "serve:bookmarklet": "ember serve --port 9191",
+    "build:production": "ember build --environment production",
+    "upload": "npm build:production && grunt s3:bookmarklet",
+    "run-xpi": "npm build && grunt run-xpi",
+    "build:xpi": "npm build && grunt build-xpi",
+    "build:xpi:production": "npm run build:production && grunt clean-tmp build-xpi"
   },
   "repository": "https://github.com/emberjs/ember-inspector",
   "engines": {
@@ -40,11 +29,14 @@
     "broccoli-asset-rev": "^2.0.0",
     "broccoli-concat": "0.0.12",
     "broccoli-es6modules": "^0.5.1",
+    "broccoli-file-creator": "^0.1.0",
     "broccoli-file-remover": "^0.3.1",
     "broccoli-lint-eslint": "1.0.0",
     "broccoli-merge-trees": "^0.2.1",
+    "broccoli-replace": "^0.3.1",
     "broccoli-sass": "^0.6.1",
     "broccoli-static-compiler": "^0.2.1",
+    "broccoli-stew": "^0.3.1",
     "broccoli-wrap": "0.0.2",
     "ember-cli": "0.2.0",
     "ember-cli-app-version": "0.3.2",

tests/ember_debug/promise_debug_test.js

@@ -105,18 +105,21 @@ test("Updates are published when they happen", function(assert) {
     assert.equal(name, 'promise:promisesUpdated');
     let promises = emberA(message.promises);
     let promise = promises.findBy('label', 'Promise1');
-    assert.equal(promise.label, 'Promise1');
-    p.then(function() {}, null, "Child1");
-    Ember.run.later(function() {
-      assert.equal(name, 'promise:promisesUpdated');
-      assert.equal(message.promises.length, 2);
-      let child = message.promises[0];
-      assert.equal(child.parent, promise.guid);
-      assert.equal(child.label, 'Child1');
-      let parent = message.promises[1];
-      assert.equal(parent.guid, promise.guid);
-      done();
-    }, 200);
+    assert.ok(!!promise);
+    if (promise) {
+      assert.equal(promise.label, 'Promise1');
+      p.then(function() {}, null, "Child1");
+      Ember.run.later(function() {
+        assert.equal(name, 'promise:promisesUpdated');
+        assert.equal(message.promises.length, 2);
+        let child = message.promises[0];
+        assert.equal(child.parent, promise.guid);
+        assert.equal(child.label, 'Child1');
+        let parent = message.promises[1];
+        assert.equal(parent.guid, promise.guid);
+        done();
+      }, 200);
+    }
   }, 200);
 });