Ember cli update to 2.15 (#4526)

* update ember-cli to 2.15 * remove bower * update ivy-codemirror * update build and ci to not use bower or phantomjs
2018-05-08 10:43:20 -05:00 · 2018-05-08 10:43:20 -05:00 · 5fb2be2e2b
parent 8708fe8d6c
commit 5fb2be2e2b
8 changed files with 239 additions and 69 deletions
--- a/9
+++ b/9
@ -102,17 +102,16 @@ static-assets:

 test-ember:
 	@echo "--> Installing JavaScript assets"
-	@cd ui && yarn install && bower install && yarn install phantomjs-prebuilt
+	@cd ui && yarn
 	@echo "--> Running ember tests"
-	@cd ui && node_modules/phantomjs-prebuilt/bin/phantomjs --version
-	@cd ui && npm test
+	@cd ui && yarn run test-oss

 ember-dist:
 	@echo "--> Installing JavaScript assets"
-	@cd ui && yarn install && bower install --allow-root
+	@cd ui && yarn
 	@cd ui && npm rebuild node-sass
 	@echo "--> Building Ember application"
-	@cd ui && npm run build
+	@cd ui && yarn run build
 	@rm -rf ui/if-you-need-to-delete-this-open-an-issue-async-disk-cache

 static-dist: ember-dist static-assets
--- a/scripts/cross/Dockerfile
+++ b/scripts/cross/Dockerfile
@ -17,7 +17,7 @@ RUN apt-get install -y nodejs

 RUN rm -rf /var/lib/apt/lists/*

-RUN npm install -g bower yarn@1.5.0
+RUN npm install -g yarn@1.5.0

 ENV GOVERSION 1.10.1
 RUN mkdir /goroot && mkdir /gopath
--- a/ui/.bowerrc
+++ b/ui/.bowerrc
@ -1,4 +0,0 @@
-{
-  "directory": "bower_components",
-  "analytics": false
-}
--- a/ui/bower.json
+++ b/ui/bower.json
@ -1,12 +0,0 @@
-{
-  "name": "vault",
-  "dependencies": {
-    "text-encoder-lite": "1.0.0",
-    "base64-js": "1.2.1",
-    "autosize": "3.0.17",
-    "jsonlint": "1.6.0",
-    "codemirror": "5.15.2",
-    "Duration.js": "icholy/Duration.js#golang_compatible",
-    "string.prototype.startswith": "mathiasbynens/String.prototype.startsWith"
-  }
-}
--- a/ui/ember-cli-build.js
+++ b/ui/ember-cli-build.js
@ -43,17 +43,17 @@ module.exports = function(defaults) {
  });

  app.import('vendor/string-includes.js');
-  app.import(app.bowerDirectory + '/string.prototype.startswith/startswith.js');
-  app.import(app.bowerDirectory + '/autosize/dist/autosize.js');
+  app.import('node_modules/string.prototype.startswith/startswith.js');
+  app.import('node_modules/autosize/dist/autosize.js');
  app.import('vendor/shims/autosize.js');

-  app.import(app.bowerDirectory + '/jsonlint/lib/jsonlint.js');
-  app.import(app.bowerDirectory + '/codemirror/addon/lint/lint.css');
-  app.import(app.bowerDirectory + '/codemirror/addon/lint/lint.js');
-  app.import(app.bowerDirectory + '/codemirror/addon/lint/json-lint.js');
-  app.import(app.bowerDirectory + '/base64-js/base64js.min.js');
-  app.import(app.bowerDirectory + '/text-encoder-lite/index.js');
-  app.import(app.bowerDirectory + '/Duration.js/duration.js');
+  app.import('node_modules/jsonlint/lib/jsonlint.js');
+  app.import('node_modules/codemirror/addon/lint/lint.css');
+  app.import('node_modules/codemirror/addon/lint/lint.js');
+  app.import('node_modules/codemirror/addon/lint/json-lint.js');
+  app.import('node_modules/base64-js/base64js.min.js');
+  app.import('node_modules/text-encoder-lite/index.js');
+  app.import('node_modules/Duration.js/duration.js');

  // Use `app.import` to add additional libraries to the generated
  // output files.
--- a/ui/package.json
+++ b/ui/package.json
@ -43,7 +43,7 @@
    "ember-api-actions": "^0.1.8",
    "ember-basic-dropdown": "^0.33.5",
    "ember-basic-dropdown-hover": "^0.2.0",
-    "ember-cli": "~2.14.0",
+    "ember-cli": "~2.15.0",
    "ember-cli-autoprefixer": "^0.8.1",
    "ember-cli-babel": "^6.3.0",
    "ember-cli-clipboard": "^0.8.0",
@ -82,12 +82,19 @@
    "ember-source": "~2.14.0",
    "ember-test-selectors": "^0.3.6",
    "ember-truth-helpers": "1.2.0",
-    "ivy-codemirror": "2.0.3",
+    "ivy-codemirror": "2.1.0",
    "loader.js": "^4.2.3",
    "normalize.css": "4.1.1",
    "prettier": "^1.5.3",
    "prettier-eslint-cli": "^4.2.1",
-    "qunit-dom": "^0.6.2"
+    "qunit-dom": "^0.6.2",
+    "text-encoder-lite": "1.0.0",
+    "base64-js": "1.2.1",
+    "autosize": "3.0.17",
+    "jsonlint": "1.6.0",
+    "codemirror": "5.15.2",
+    "Duration.js": "icholy/Duration.js#golang_compatible",
+    "string.prototype.startswith": "mathiasbynens/String.prototype.startsWith"
  },
  "engines": {
    "node": "^4.5 || 6.* || >= 7.*"
--- a/ui/testem.js
+++ b/ui/testem.js
@ -6,6 +6,20 @@ module.exports = {
  "launch_in_ci": [
    "Chrome"
  ],
+  browser_args: {
+    Chrome: {
+      mode: 'ci',
+      args: [
+        // --no-sandbox is needed when running Chrome inside a container
+        process.env.TRAVIS ? '--no-sandbox' : null,
+
+        '--disable-gpu',
+        '--headless',
+        '--remote-debugging-port=0',
+        '--window-size=1440,900'
+      ].filter(Boolean)
+    }
+  },
  "launch_in_dev": [
    "Chrome"
  ],
@ -15,5 +29,5 @@ module.exports = {
    "/v1": {
      "target": "http://localhost:9200"
    }
-  }
+  },
 };
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@ -82,6 +82,17 @@
  dependencies:
    "@glimmer/util" "^0.22.3"

+Duration.js@icholy/Duration.js#golang_compatible:
+  version "2.0.0"
+  resolved "https://codeload.github.com/icholy/Duration.js/tar.gz/cb1c58efc2772ef0f261da9e2535890734a86417"
+  dependencies:
+    chai "~1.7.2"
+    mocha "~1.13.0"
+
+"JSV@>= 4.0.x":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
+
 abbrev@1:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
@ -211,6 +222,10 @@ ansi-styles@^3.2.1:
  dependencies:
    color-convert "^1.9.0"

+ansi-styles@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
+
 ansicolors@~0.2.1:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
@ -319,6 +334,10 @@ assert-plus@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"

+assertion-error@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.0.tgz#c7f85438fdd466bc7ca16ab90c81513797a5d23b"
+
 ast-traverse@~0.1.1:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/ast-traverse/-/ast-traverse-0.1.1.tgz#69cf2b8386f19dcda1bb1e05d68fe359d8897de6"
@ -390,6 +409,10 @@ autoprefixer@^7.0.0:
    postcss "^6.0.17"
    postcss-value-parser "^3.2.3"

+autosize@3.0.17:
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/autosize/-/autosize-3.0.17.tgz#f5a2cd35b96d864634cffc600c8c628c658d805b"
+
 aws-sign2@~0.6.0:
  version "0.6.0"
  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@ -1060,6 +1083,10 @@ base64-arraybuffer@0.1.5:
  version "0.1.5"
  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"

+base64-js@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
+
 base64id@0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/base64id/-/base64id-0.1.0.tgz#02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"
@ -1268,9 +1295,9 @@ broccoli-brocfile-loader@^0.18.0:
  dependencies:
    findup-sync "^0.4.2"

-broccoli-builder@^0.18.3:
-  version "0.18.8"
-  resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.8.tgz#fe54694d544c3cdfdb01028e802eeca65749a879"
+broccoli-builder@^0.18.8:
+  version "0.18.11"
+  resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.11.tgz#a42393c7b10bb0380df255a616307945f5e26efb"
  dependencies:
    heimdalljs "^0.2.0"
    promise-map-series "^0.2.1"
@ -1488,12 +1515,12 @@ broccoli-merge-trees@^2.0.0:
    broccoli-plugin "^1.3.0"
    merge-trees "^1.0.1"

-broccoli-middleware@^1.0.0-beta.8:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-1.0.0.tgz#92f4e1fb9a791ea986245a7077f35cc648dab097"
+broccoli-middleware@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-1.2.1.tgz#a21f255f8bfe5a21c2f0fbf2417addd9d24c9436"
  dependencies:
    handlebars "^4.0.4"
-    mime "^1.2.11"
+    mime-types "^2.1.18"

 broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.4.0, broccoli-persistent-filter@^1.4.2:
  version "1.4.2"
@ -1829,6 +1856,12 @@ center-align@^0.1.1:
    align-text "^0.1.3"
    lazy-cache "^1.0.3"

+chai@~1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-1.7.2.tgz#ba07ebd4e1ac138a296cdf69077ce74b7f4a1317"
+  dependencies:
+    assertion-error "1.0.0"
+
 chalk@^0.5.1:
  version "0.5.1"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
@ -1865,6 +1898,14 @@ chalk@^2.3.2:
    escape-string-regexp "^1.0.5"
    supports-color "^5.3.0"

+chalk@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+  dependencies:
+    ansi-styles "~1.0.0"
+    has-color "~0.1.0"
+    strip-ansi "~0.1.0"
+
 charm@^1.0.0:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
@ -2002,6 +2043,10 @@ code-point-at@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"

+codemirror@5.15.2, codemirror@~5.15.0:
+  version "5.15.2"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.15.2.tgz#58b3dc732c6d10d7aae806f4c7cdd56a9b87fe8f"
+
 coffee-script@^1.10.0:
  version "1.12.7"
  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
@ -2036,6 +2081,10 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
  dependencies:
    delayed-stream "~1.0.0"

+commander@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
+
 commander@2.8.x:
  version "2.8.1"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@ -2288,6 +2337,12 @@ dashdash@^1.12.0:
  dependencies:
    assert-plus "^1.0.0"

+debug@*:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
 debug@0.7.4:
  version "0.7.4"
  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
@ -2330,6 +2385,10 @@ deep-extend@~0.4.0:
  version "0.4.2"
  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"

+deep-freeze@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/deep-freeze/-/deep-freeze-0.0.1.tgz#3a0b0005de18672819dfd38cd31f91179c893e84"
+
 deep-is@~0.1.3:
  version "0.1.3"
  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@ -2420,6 +2479,10 @@ detective@^4.3.1:
    acorn "^4.0.3"
    defined "^1.0.0"

+diff@1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-1.0.7.tgz#24bbb001c4a7d5522169e7cabdb2c2814ed91cf4"
+
 diff@^3.1.0:
  version "3.4.0"
  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
@ -2937,24 +3000,24 @@ ember-cli-version-checker@^2.1.0:
    resolve "^1.3.3"
    semver "^5.3.0"

-ember-cli@~2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.14.0.tgz#9aff1414168883183e8677fa32626d1e3228ccbc"
+ember-cli@~2.15.0:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.15.1.tgz#773add3cc18e5068f1c5f43a77544efa2712e47b"
  dependencies:
-    amd-name-resolver "0.0.6"
+    amd-name-resolver "0.0.7"
    babel-plugin-transform-es2015-modules-amd "^6.24.0"
    bower-config "^1.3.0"
    bower-endpoint-parser "0.2.2"
    broccoli-babel-transpiler "^6.0.0"
    broccoli-brocfile-loader "^0.18.0"
-    broccoli-builder "^0.18.3"
+    broccoli-builder "^0.18.8"
    broccoli-concat "^3.2.2"
    broccoli-config-loader "^1.0.0"
    broccoli-config-replace "^1.1.2"
    broccoli-funnel "^1.0.6"
    broccoli-funnel-reducer "^1.0.0"
    broccoli-merge-trees "^2.0.0"
-    broccoli-middleware "^1.0.0-beta.8"
+    broccoli-middleware "^1.0.0"
    broccoli-source "^1.1.0"
    broccoli-stew "^1.2.0"
    calculate-cache-key-for-tree "^1.0.0"
@ -2966,9 +3029,9 @@ ember-cli@~2.14.0:
    console-ui "^1.0.2"
    core-object "^3.1.3"
    dag-map "^2.0.2"
+    deep-freeze "^0.0.1"
    diff "^3.2.0"
    ember-cli-broccoli-sane-watcher "^2.0.4"
-    ember-cli-get-component-path-option "^1.0.0"
    ember-cli-is-package-missing "^1.0.0"
    ember-cli-legacy-blueprints "^0.1.2"
    ember-cli-lodash-subset "^1.0.11"
@ -2977,8 +3040,7 @@ ember-cli@~2.14.0:
    ember-cli-string-utils "^1.0.0"
    ember-try "^0.2.15"
    ensure-posix-path "^1.0.2"
-    escape-string-regexp "^1.0.3"
-    execa "^0.6.0"
+    execa "^0.7.0"
    exists-sync "0.0.4"
    exit "^0.1.2"
    express "^4.12.3"
@ -2995,7 +3057,7 @@ ember-cli@~2.14.0:
    heimdalljs-logger "^0.1.7"
    http-proxy "^1.9.0"
    inflection "^1.7.0"
-    is-git-url "^0.2.0"
+    is-git-url "^1.0.0"
    isbinaryfile "^3.0.0"
    js-yaml "^3.6.1"
    json-stable-stringify "^1.0.1"
@ -3019,7 +3081,7 @@ ember-cli@~2.14.0:
    sort-package-json "^1.4.0"
    symlink-or-copy "^1.1.8"
    temp "0.8.3"
-    testem "^1.15.0"
+    testem "^1.18.0"
    tiny-lr "^1.0.3"
    tree-sync "^1.2.1"
    uuid "^3.0.0"
@ -3456,7 +3518,7 @@ escape-html@~1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"

-escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"

@ -3627,9 +3689,9 @@ exec-sh@^0.2.0:
  dependencies:
    merge "^1.1.3"

-execa@^0.6.0:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.3.tgz#57b69a594f081759c69e5370f0d17b9cb11658fe"
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
  dependencies:
    cross-spawn "^5.0.1"
    get-stream "^3.0.0"
@ -4152,6 +4214,14 @@ glob-parent@^2.0.0:
  dependencies:
    is-glob "^2.0.0"

+glob@3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.3.tgz#e313eeb249c7affaa5c475286b0e115b59839467"
+  dependencies:
+    graceful-fs "~2.0.0"
+    inherits "2"
+    minimatch "~0.2.11"
+
 glob@7.1.1, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.1.1:
  version "7.1.1"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
@ -4265,10 +4335,18 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4,
  version "4.1.11"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"

+graceful-fs@~2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"
+
 "graceful-readlink@>= 1.0.0":
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"

+growl@1.7.x:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.7.0.tgz#de2d66136d002e112ba70f3f10c31cf7c350b2da"
+
 growly@^1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
@ -4331,6 +4409,10 @@ has-binary@0.1.7:
  dependencies:
    isarray "0.0.1"

+has-color@~0.1.0:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
+
 has-cors@1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
@ -4697,6 +4779,10 @@ is-git-url@^0.2.0:
  version "0.2.3"
  resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-0.2.3.tgz#445200d6fbd6da028fb5e01440d9afc93f3ccb64"

+is-git-url@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
+
 is-glob@^2.0.0, is-glob@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@ -4828,11 +4914,20 @@ istextorbinary@2.1.0:
    editions "^1.1.1"
    textextensions "1 || 2"

-ivy-codemirror@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/ivy-codemirror/-/ivy-codemirror-2.0.3.tgz#a5b26d343be2031dead036e2be794c46f1b157d9"
+ivy-codemirror@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ivy-codemirror/-/ivy-codemirror-2.1.0.tgz#c06f1606c375610bf62b007a21a9e63f5854175e"
  dependencies:
-    ember-cli-babel "^5.1.7"
+    codemirror "~5.15.0"
+    ember-cli-babel "^6.0.0"
+    ember-cli-node-assets "^0.2.2"
+
+jade@0.26.3:
+  version "0.26.3"
+  resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c"
+  dependencies:
+    commander "0.6.1"
+    mkdirp "0.3.0"

 jimp@^0.2.13, jimp@^0.2.21:
  version "0.2.28"
@ -4964,6 +5059,13 @@ jsonify@~0.0.0:
  version "0.0.0"
  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"

+jsonlint@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/jsonlint/-/jsonlint-1.6.0.tgz#88aa46bc289a7ac93bb46cae2d58a187a9bb494a"
+  dependencies:
+    JSV ">= 4.0.x"
+    nomnom ">= 1.5.x"
+
 jsonpointer@^4.0.0:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@ -5327,6 +5429,10 @@ loud-rejection@^1.0.0:
    currently-unhandled "^0.4.1"
    signal-exit "^3.0.0"

+lru-cache@2:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
+
 lru-cache@^4.0.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
@ -5494,17 +5600,27 @@ mime-db@~1.27.0:
  version "1.27.0"
  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"

+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
 mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
  version "2.1.15"
  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
  dependencies:
    mime-db "~1.27.0"

+mime-types@^2.1.18:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
 mime@1.3.4:
  version "1.3.4"
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"

-mime@^1.2.11, mime@^1.3.4:
+mime@^1.3.4:
  version "1.3.6"
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"

@ -5530,6 +5646,13 @@ minimatch@^2.0.3:
  dependencies:
    brace-expansion "^1.0.0"

+minimatch@~0.2.11:
+  version "0.2.14"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
+  dependencies:
+    lru-cache "2"
+    sigmund "~1.0.0"
+
 minimist@0.0.8, minimist@~0.0.1:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
@ -5538,6 +5661,14 @@ minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"

+mkdirp@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
+
+mkdirp@0.3.5, mkdirp@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7"
+
 mkdirp@0.5.0:
  version "0.5.0"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
@ -5550,14 +5681,22 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
  dependencies:
    minimist "0.0.8"

-mkdirp@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7"
-
 mktemp@~0.4.0:
  version "0.4.0"
  resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"

+mocha@~1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-1.13.0.tgz#8d8fa4e310b94cc6efeb3ed26aeca96dea93307c"
+  dependencies:
+    commander "0.6.1"
+    debug "*"
+    diff "1.0.7"
+    glob "3.2.3"
+    growl "1.7.x"
+    jade "0.26.3"
+    mkdirp "0.3.5"
+
 moment-timezone@^0.5.0:
  version "0.5.13"
  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.13.tgz#99ce5c7d827262eb0f1f702044177f60745d7b90"
@ -5735,6 +5874,13 @@ node-sass@^4.7.2:
    stdout-stream "^1.4.0"
    "true-case-path" "^1.0.2"

+"nomnom@>= 1.5.x":
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
+  dependencies:
+    chalk "~0.4.0"
+    underscore "~1.6.0"
+
 "nopt@2 || 3", nopt@^3.0.6, nopt@~3.0.6:
  version "3.0.6"
  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@ -6895,6 +7041,10 @@ shellwords@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.0.tgz#66afd47b6a12932d9071cbfd98a52e785cd0ba14"

+sigmund@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@ -7147,6 +7297,10 @@ string-width@^2.0.0, string-width@^2.1.0:
    is-fullwidth-code-point "^2.0.0"
    strip-ansi "^4.0.0"

+string.prototype.startswith@mathiasbynens/String.prototype.startsWith:
+  version "0.2.0"
+  resolved "https://codeload.github.com/mathiasbynens/String.prototype.startsWith/tar.gz/bb6f34bb8577ac95b6aef79a13a84297d6fae5a6"
+
 string_decoder@0.10, string_decoder@~0.10.x:
  version "0.10.31"
  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@ -7187,6 +7341,10 @@ strip-ansi@^4.0.0:
  dependencies:
    ansi-regex "^3.0.0"

+strip-ansi@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
+
 strip-bom@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@ -7316,9 +7474,9 @@ temp@0.8.3:
    os-tmpdir "^1.0.0"
    rimraf "~2.2.6"

-testem@^1.15.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-1.18.0.tgz#4a9f798509d260dca928823aaae5dbc6a9c977ee"
+testem@^1.18.0:
+  version "1.18.4"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-1.18.4.tgz#e45fed922bec2f54a616c43f11922598ac97eb41"
  dependencies:
    backbone "^1.1.2"
    bluebird "^3.4.6"
@ -7347,6 +7505,10 @@ testem@^1.15.0:
    tap-parser "^5.1.0"
    xmldom "^0.1.19"

+text-encoder-lite@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/text-encoder-lite/-/text-encoder-lite-1.0.0.tgz#158ac1f5355bd291b143bdc88f1996ce34df3c12"
+
 text-encoding@0.6.4, text-encoding@^0.6.4:
  version "0.6.4"
  resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
@ -7558,6 +7720,10 @@ underscore@>=1.8.3, underscore@^1.8.3:
  version "1.8.3"
  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"

+underscore@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
+
 unique-string@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"