Flexi beta

.travis.yml

@@ -30,10 +30,9 @@ before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - npm config set spin false
-  - npm install -g bower
+  - npm install -g bower phantomjs-prebuilt
   - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - phantomjs --version
 
 install:
   - npm install
@@ -42,7 +41,7 @@ install:
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - COVERAGE=true ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - COVERAGE=true node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
 
 after_script:
   - codeclimate-test-reporter < coverage/lcov.info

config/ember-try.js

@@ -5,8 +5,7 @@ module.exports = {
       name: 'ember-lts-2.4',
       bower: {
         dependencies: {
-          'ember': 'components/ember#lts-2-4',
-          'ember-cli-shims': '0.1.3'
+          'ember': 'components/ember#lts-2-4'
         },
         resolutions: {
           'ember': 'lts-2-4'
@@ -22,8 +21,7 @@ module.exports = {
       name: 'ember-lts-2.8',
       bower: {
         dependencies: {
-          'ember': 'components/ember#lts-2-8',
-          'ember-cli-shims': '0.1.3'
+          'ember': 'components/ember#lts-2-8'
         },
         resolutions: {
           'ember': 'lts-2-8'
@@ -39,8 +37,7 @@ module.exports = {
       name: 'ember-release',
       bower: {
         dependencies: {
-          'ember': 'components/ember#release',
-          'ember-cli-shims': '0.1.3'
+          'ember': 'components/ember#release'
         },
         resolutions: {
           'ember': 'release'
@@ -56,8 +53,7 @@ module.exports = {
       name: 'ember-beta',
       bower: {
         dependencies: {
-          'ember': 'components/ember#beta',
-          'ember-cli-shims': '0.1.3'
+          'ember': 'components/ember#beta'
         },
         resolutions: {
           'ember': 'beta'
@@ -73,8 +69,7 @@ module.exports = {
       name: 'ember-canary',
       bower: {
         dependencies: {
-          'ember': 'components/ember#canary',
-          'ember-cli-shims': '0.1.3'
+          'ember': 'components/ember#canary'
         },
         resolutions: {
           'ember': 'canary'

ember-cli-build.js

@@ -1,7 +1,7 @@
 /*jshint node:true*/
 /* global require, module */
 var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
-var shim = require('flexi/lib/pod-templates-shim');
+var shim = require('@html-next/flexi-layouts/lib/pod-templates-shim');
 
 shim(EmberAddon);
 

package.json

@@ -26,19 +26,23 @@
     "test": "ember try:each"
   },
   "dependencies": {
+    "@html-next/flexi-config": "2.0.0-beta.11",
+    "@html-next/flexi-default-styles": "2.0.0-beta.11",
+    "@html-next/flexi-dsl": "2.0.0-beta.11",
+    "@html-next/flexi-layouts": "2.0.0-beta.11",
     "ember-cli-babel": "^5.1.7",
     "ember-cli-htmlbars": "^1.1.1",
     "ember-cli-sass": "^6.1.0",
     "ember-responds-to": "1.2.1",
     "ember-truth-helpers": "1.2.0",
-    "flexi": "flexi@2.0.0-beta.3"
+    "flexi": "2.0.0-beta.11"
   },
   "devDependencies": {
     "babel-eslint": "^7.1.1",
     "broccoli-asset-rev": "^2.4.5",
     "codeclimate-test-reporter": "^0.4.0",
     "ember-assign-polyfill": "1.0.0",
-    "ember-cli": "2.11.0-beta.1",
+    "ember-cli": "2.11.0",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-code-coverage": "0.3.11",
     "ember-cli-dependency-checker": "^1.3.0",
@@ -48,6 +52,7 @@
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^3.0.1",
     "ember-cli-release": "^0.2.9",
+    "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
@@ -57,7 +62,7 @@
     "ember-load-initializers": "^0.6.0",
     "ember-resolver": "^2.0.3",
     "ember-responds-to": "1.2.1",
-    "ember-source": "^2.11.0-beta.2",
+    "ember-source": "^2.11.0",
     "eslint-config-ember": "0.3.0",
     "eslint-plugin-ship-shape": "^0.4.0",
     "loader.js": "^4.0.10"

testem.js

@@ -1,7 +1,7 @@
 /* eslint-disable */
 module.exports = {
   "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed&coverage",
+  "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [
     "Chrome"
@@ -10,4 +10,3 @@ module.exports = {
     "Chrome"
   ]
 };
-/* eslint-enable */