Merge pull request #132 from juwara0/2.12.3-inter-deps

Updated ember-cli 2.12.3 inter-dependencies
ciena-frost · Aug 11, 2017 · c118f1e · c118f1e
2 parents 70c3254 + e7c5412
commit c118f1e
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 20 deletions.
diff --git a/blueprints/ember-frost-object-browser/index.js b/blueprints/ember-frost-object-browser/index.js
@@ -3,8 +3,8 @@ const blueprintHelper = require('ember-frost-core/blueprint-helper')
 module.exports = {
   afterInstall: function (options) {
     const addonsToAdd = [
-      {name: 'ember-frost-core', target: '^1.14.3'},
-      {name: 'ember-frost-list', target: '^5.3.1'}
+      {name: 'ember-frost-core', target: '1.23.10'},
+      {name: 'ember-frost-list', target: '5.8.2'}
     ]
 
     // Get the packages installed in the consumer app/addon. Packages that are already installed in the consumer within

diff --git a/package.json b/package.json
@@ -41,43 +41,43 @@
     "ember-cli-chai": "~0.3.2",
     "ember-cli-code-coverage": "^0.3.10",
     "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-cli-htmlbars-inline-precompile": "0.3.12",
     "ember-cli-import-polyfill": "0.2.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-mocha": "~0.13.2",
-    "ember-cli-moment-shim": "^3.1.0",
+    "ember-cli-moment-shim": "^3.3.3",
     "ember-cli-notifications": "^4.1.5",
     "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-code-snippet": "1.7.0",
     "ember-computed-decorators": "~0.3.0",
     "ember-concurrency": "~0.7.19",
-    "ember-data": "~2.11.0",
+    "ember-data": "~2.12.0",
     "ember-data-factory-guy": "2.10.0",
-    "ember-elsewhere": "~0.4.1",
+    "ember-elsewhere": "1.0.1",
     "ember-export-application-global": "^1.0.5",
     "ember-frost-bunsen": "^14.20.0",
-    "ember-frost-date-picker": "^6.0.0",
-    "ember-frost-fields": "^4.2.5",
-    "ember-frost-info-bar": "^8.0.0",
-    "ember-frost-popover": "^4.2.5",
-    "ember-frost-sort": "^7.2.0",
-    "ember-frost-tabs": "^5.2.4",
+    "ember-frost-date-picker": "^7.2.7",
+    "ember-frost-fields": "^4.2.9",
+    "ember-frost-info-bar": "^8.3.9",
+    "ember-frost-popover": "^4.2.11",
+    "ember-frost-sort": "^7.2.9",
+    "ember-frost-tabs": "^5.2.9",
     "ember-frost-test": "^1.0.2",
     "ember-hook": "^1.4.1",
     "ember-load-initializers": "^0.6.0",
     "ember-math-helpers": "2.0.4",
     "ember-one-way-controls": "1.1.2",
-    "ember-pikaday-shim": "~0.1.0",
-    "ember-prop-types": "^3.11.0",
+    "ember-pikaday-shim": "~0.1.2",
+    "ember-prop-types": "^3.14.1",
     "ember-resolver": "^2.0.3",
     "ember-run-raf": "1.1.2",
     "ember-simple-uuid": "~0.1.4",
     "ember-sinon": "~0.6.0",
     "ember-sortable": "~1.9.3",
     "ember-source": "~2.12.0",
-    "ember-spread": "^1.1.4",
+    "ember-spread": "^1.2.2",
     "ember-symbol-observable": "~0.1.2",
     "ember-test-utils": "^4.0.0",
     "ember-truth-helpers": "^1.3.0",
@@ -94,9 +94,9 @@
   "dependencies": {
     "ember-cli-babel": "^5.1.7",
     "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-sass": "^5.1.0",
-    "ember-frost-core": "^1.14.3",
-    "ember-frost-list": "^5.3.1"
+    "ember-cli-sass": "5.6.0",
+    "ember-frost-core": "1.23.10",
+    "ember-frost-list": "5.8.2"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

diff --git a/tests/dummy/app/pods/application/template.hbs b/tests/dummy/app/pods/application/template.hbs
@@ -6,7 +6,7 @@
     <div class='frost-modal-demo-title'>
       Demos
     </div>
-    {{#frost-scroll class='frost-modal-demo-selectors'}}
+    {{#frost-scroll class='frost-modal-demo-selectors' hook='demos'}}
       {{#link-to 'overview'}}Overview{{/link-to}}
       {{#link-to 'helpers'}}Helpers{{/link-to}}
       <div class='frost-modal-demo-selector-title'>
@@ -21,7 +21,7 @@
       </div>
     {{/frost-scroll}}
   </div>
-  {{#frost-scroll class='frost-modal-demo-example'}}
+  {{#frost-scroll class='frost-modal-demo-example' hook='content'}}
     {{outlet}}
   {{/frost-scroll}}
 </div>
diff --git a/tests/dummy/app/pods/client/template.hbs b/tests/dummy/app/pods/client/template.hbs
@@ -1,5 +1,6 @@
 {{! BEGIN-SNIPPET client-template }}
 {{frost-object-browser
+  hook='clientObjectBrowser'
   filters=(component 'frost-bunsen-form'
     autofocus=false
     bunsenModel=filterModel
@@ -8,6 +9,7 @@
     value=filters
   )
   content=(component 'frost-list'
+    hook='clientList'
     item=(component 'list-item')
     itemExpansion=(component 'list-item-expansion')
     items=items
@@ -26,30 +28,35 @@
     )
   )
   controls=(component 'frost-action-bar'
+    hook='clientActionBar'
     selectedItems=selectedItems
     controls=(array
       (component 'frost-button'
+        hook='clientSingleSelectButton'
         disabled=(single-select selectedItems)
         priority='secondary'
         size='medium'
         text='Single-select'
         onClick=(action 'onGenericAction' selectedItems 'Single-select enabled action')
       )
       (component 'frost-button'
+        hook='clientMultiSelectButton'
         disabled=(multi-select selectedItems)
         priority='secondary'
         size='medium'
         text='Multi-select'
         onClick=(action 'onGenericAction' selectedItems 'Multi-select enabled action')
       )
       (component 'frost-button'
+        hook='clientLabelButton'
         disabled=(not labelIncludesF)
         priority='secondary'
         size='medium'
         text="Label includes 'f'"
         onClick=(action 'onGenericAction' selectedItems 'Custom enabled action')
       )
       (component 'frost-link'
+        hook='clientDetailLink'
         priority='primary'
         routeNames=detailLinkRouteNames
         size='medium'

diff --git a/tests/dummy/app/pods/server/template.hbs b/tests/dummy/app/pods/server/template.hbs
@@ -1,5 +1,6 @@
 {{! BEGIN-SNIPPET server-template}}
   {{frost-object-browser
+    hook='serverObjectBrowser'
     filters=(component 'frost-bunsen-form'
       autofocus=false
       bunsenModel=filterModel
@@ -8,6 +9,7 @@
       value=filters
     )
     content=(component 'frost-list'
+      hook='serverList'
       item=(component 'list-item')
       itemExpansion=(component 'list-item-expansion')
       items=items
@@ -22,30 +24,35 @@
       )
     )
     controls=(component 'frost-action-bar'
+      hook='serverActionBar'
       selectedItems=selectedItems
       controls=(array
         (component 'frost-button'
+          hook='serverSingleSelectButton'
           disabled=(single-select selectedItems)
           priority='secondary'
           size='medium'
           text='Single-select'
           onClick=(action 'onGenericAction' selectedItems 'Single-select enabled action')
         )
         (component 'frost-button'
+          hook='serverMultiSelectButton'
           disabled=(multi-select selectedItems)
           priority='secondary'
           size='medium'
           text='Multi-select'
           onClick=(action 'onGenericAction' selectedItems 'Multi-select enabled action')
         )
         (component 'frost-button'
+          hook='serverLabelButton'
           disabled=(not labelIncludesF)
           priority='secondary'
           size='medium'
           text="Label includes 'f'"
           onClick=(action 'onGenericAction' selectedItems 'Custom enabled action')
         )
         (component 'frost-link'
+          hook='serverDetailLink'
           priority='primary'
           routeNames=detailLinkRouteNames
           size='medium'