Merge 710254b into 7b0c04f

.gitignore

@@ -13,8 +13,10 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
+/typings/*
 coverage.json
 npm-debug.log*
+package-lock.json
 testem.log
 .idea
 ge.json

.remarkignore

@@ -0,0 +1,2 @@
+CHANGELOG.md
+NOTES.md

NOTES.md

@@ -0,0 +1,3 @@
+`ember-cli-moment-shim` is a depedency of this addon since it is used by the addon code and since we want to provide this package so that is can be used by a consumer.
+
+This addons dummy app runs `ember-frost-demo-components` which utilizes `ember-prism` and `ember-cli-showdown`. Each of the versions that we are currently required to use (due to the next releases including babel 6 which we do not want at this time) require that the bower `prism` and `showdown` packages be installed as bower packages in this addon.

blueprints/ember-frost-bunsen/index.js

@@ -1,46 +1,12 @@
-const blueprintHelper = require('ember-frost-core/blueprint-helper')
-
-const addonsToAdd = [
-  {name: 'ember-frost-date-picker', target: '^8.0.0'},
-  {name: 'ember-frost-fields', target: '^6.0.0'},
-  {name: 'ember-frost-table', target: '^1.0.0'}
-]
-
-const packagesToRemove = [
-  'ember-bunsen-core',
-  'ember-redux-thunk'
-]
-  .map((packageName) => {
-    return {name: packageName}
-  })
-
 module.exports = {
-  afterInstall: function (options) {
-    return this.removePackagesFromProject(packagesToRemove)
-      .then(() => {
-        // Get the packages installed in the consumer app/addon. Packages that are already installed in the consumer within
-        // the required semver range will not be re-installed or have blueprints re-run.
-        const consumerPackages = blueprintHelper.consumer.getPackages(options)
-
-        // Get the packages to install (not already installed) from a list of potential packages
-        return blueprintHelper.packageHandler.getPkgsToInstall(addonsToAdd, consumerPackages).then((pkgsToInstall) => {
-          if (pkgsToInstall.length !== 0) {
-            // Call the blueprint hook
-            return this.addAddonsToProject({
-              packages: pkgsToInstall
-            })
-          }
-        })
-      })
-      .then(() => {
-        const isAddon = this.project.isEmberCLIAddon()
-        const pathPrefix = isAddon ? 'tests/dummy/' : ''
+  afterInstall: function () {
+    const isAddon = this.project.isEmberCLIAddon()
+    const pathPrefix = isAddon ? 'tests/dummy/' : ''
 
-        return this.insertIntoFile(
-          `${pathPrefix}app/styles/app.scss`,
-          "@import 'ember-frost-bunsen';"
-        )
-      })
+    return this.insertIntoFile(
+      `${pathPrefix}app/styles/app.scss`,
+      "@import 'ember-frost-bunsen';"
+    )
   },
 
   normalizeEntityName: function () {

bower.json

@@ -1,13 +1,10 @@
 {
   "name": "ember-frost-bunsen",
-  "dependencies": {
-    "codemirror": "5.21.0",
+  "dependencies": {},
+  "devDependencies": {
     "Faker": "3.1.0",
-    "node-uuid": "1.4.7",
     "pretender": "1.4.2",
     "prism": "1.6.0",
-    "showdown": "1.5.1",
-    "sinonjs": "1.17.1",
-    "clockpicker-seconds": "~0.1.6"
+    "showdown": "1.5.1"
   }
 }

ember-cli-build.js

@@ -13,9 +13,6 @@ module.exports = function (defaults) {
     'ember-cli-babel': {
       includePolyfill: true
     },
-    'ember-cli-mocha': {
-      useLintTree: false
-    },
     'ember-prism': {
       components: ['javascript'],
       theme: 'coy'
@@ -26,7 +23,6 @@ module.exports = function (defaults) {
     }
   })
 
-  app.import('bower_components/sinonjs/sinon.js')
   // client-side template compilation for the abstract-input demo page
   app.import(app.project.addonPackages['ember-source']
     ? 'vendor/ember/ember-template-compiler.js' : 'bower_components/ember/ember-template-compiler.js')

package.json

@@ -37,50 +37,36 @@
   ],
   "license": "MIT",
   "devDependencies": {
+    "bower": "^1.8.2",
     "broccoli-asset-rev": "^2.4.5",
     "chai-jquery": "^2.0.0",
-    "ember-browserify": "1.1.13",
+    "ember-browserify": "^1.2.0",
     "ember-cli": "2.12.3",
-    "ember-cli-chai": "^0.3.2",
-    "ember-cli-code-coverage": "0.3.11",
+    "ember-cli-chai": "0.4.3",
+    "ember-cli-code-coverage": "0.3.12",
     "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-frost-blueprints": "^1.0.0",
+    "ember-cli-frost-blueprints": "^5.0.1",
     "ember-cli-htmlbars-inline-precompile": "0.3.12",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-mirage": "0.2.4",
-    "ember-cli-mocha": "0.13.2",
-    "ember-cli-sass": "^6.1.1",
+    "ember-cli-mocha": "0.14.4",
     "ember-cli-shims": "^1.0.2",
-    "ember-cli-showdown": "^2.10.0",
+    "ember-cli-showdown": "^2.11.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-computed-decorators": "~0.2.0",
-    "ember-concurrency": "~0.7.15",
     "ember-data": "~2.11.0",
     "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-elsewhere": "~1.0.1",
     "ember-export-application-global": "^1.0.5",
-    "ember-frost-demo-components": "3.1.2",
-    "ember-frost-fields": "^4.0.0",
-    "ember-frost-table": "^1.0.0",
-    "ember-frost-test": "1.0.1",
-    "ember-get-config": "0.2.1",
-    "ember-hook": "^1.4.1",
+    "ember-frost-demo-components": "^4.0.0",
+    "ember-frost-test": "^4.0.0",
     "ember-load-initializers": "^0.6.0",
-    "ember-moment": "~7.3.0",
     "ember-prism": "0.0.8",
     "ember-resolver": "^2.0.3",
-    "ember-simple-uuid": "0.1.4",
-    "ember-sinon": "0.6.0",
+    "ember-sinon": "^0.7.0",
     "ember-source": "~2.12.0",
     "ember-test-utils": "^8.1.0",
-    "ember-truth-helpers": "^1.2.0",
-    "ember-try": "0.2.11",
-    "eslint": "^3.13.1",
-    "eslint-config-frost-standard": "^6.0.0",
-    "ivy-codemirror": "^2.0.3",
+    "ivy-codemirror": "^2.1.0",
     "loader.js": "^4.2.3",
-    "sass-lint": "^1.10.2",
-    "sinon-chai": "^2.8.0"
+    "sinon-chai": "^2.14.0"
   },
   "keywords": [
     "ember-addon",
@@ -92,22 +78,30 @@
     "schema"
   ],
   "dependencies": {
-    "ember-ajax": "^2.0.0",
+    "ember-ajax": "^2.5.6",
     "ember-bunsen-core": "^2.0.0",
-    "ember-cli-babel": "^5.1.8",
+    "ember-cli-babel": "^5.1.7",
     "ember-cli-htmlbars": "^1.1.1",
-    "ember-frost-core": "^3.0.1",
-    "ember-frost-date-picker": "^8.0.1",
-    "ember-frost-popover": "^6.1.1",
-    "ember-frost-tabs": "^6.0.0",
-    "ember-getowner-polyfill": "^1.0.0",
-    "ember-lodash-shim": "^2.0.0",
-    "ember-prop-types": "^3.0.0",
+    "ember-cli-moment-shim": "3.3.3",
+    "ember-cli-sass": "7.1.1",
+    "ember-computed-decorators": "0.3.0",
+    "ember-concurrency": "0.7.19",
+    "ember-frost-core": "^5.1.1",
+    "ember-frost-date-picker": "^9.0.0",
+    "ember-frost-fields": "^7.0.0",
+    "ember-frost-popover": "^8.0.0",
+    "ember-frost-table": "^2.0.0",
+    "ember-frost-tabs": "^7.0.0",
+    "ember-get-config": "0.2.2",
+    "ember-hook": "1.4.2",
+    "ember-lodash-shim": "^2.0.7",
+    "ember-prop-types": "^6.0.1",
     "ember-redux-shim": "^1.0.0",
     "ember-redux-thunk-shim": "^1.0.0",
-    "ember-sortable": "^1.0.0",
-    "ember-spread": "^1.1.1",
+    "ember-sortable": "^1.10.0",
+    "ember-spread": "^4.0.1",
     "ember-symbol-observable": "0.1.2",
+    "ember-truth-helpers": " ^1.3.0",
     "redux": "^3.0.0",
     "redux-thunk": "^2.0.0",
     "symbol-observable": "1.0.4"
@@ -118,4 +112,4 @@
   "ember-frost-icon-pack": {
     "name": "frost-bunsen"
   }
-}
+}

config/coverage.js → tests/dummy/config/coverage.js

@@ -1,8 +1,13 @@
 module.exports = {
   coverageEnvVar: 'COVERAGE',
   coverageFolder: 'coverage',
+  excludes: [
+    '**/mirage/**/*',
+    '**/dummy/**/*'
+  ],
   reporters: [
     'html',
+    'json-summary',
     'lcov',
     'text-summary'
   ],