From 863f4763f5f8fa1129277d9d353dd4e9a1c0a8bd Mon Sep 17 00:00:00 2001 From: Eric Kelly Date: Thu, 6 Aug 2015 19:57:46 -0400 Subject: [PATCH] Update ember-cli to v1.13.7 --- .npmignore | 2 ++ .travis.yml | 14 ++++++++- .watchmanconfig | 3 ++ Brocfile.js | 21 ------------- bower.json | 16 +++++----- config/ember-try.js | 35 +++++++++++++++++++++ config/environment.js | 5 +++ ember-cli-build.js | 20 ++++++++++++ package.json | 38 ++++++++++++++--------- testem.json | 1 + tests/.jshintrc | 5 +-- tests/dummy/app/app.js | 4 ++- tests/dummy/app/index.html | 6 ++++ tests/dummy/app/templates/application.hbs | 2 +- tests/dummy/config/environment.js | 6 ++-- tests/dummy/public/crossdomain.xml | 18 +++++------ tests/dummy/public/robots.txt | 4 +-- tests/helpers/start-app.js | 1 - 18 files changed, 137 insertions(+), 64 deletions(-) create mode 100644 .watchmanconfig delete mode 100644 Brocfile.js create mode 100644 config/ember-try.js create mode 100644 config/environment.js create mode 100644 ember-cli-build.js diff --git a/.npmignore b/.npmignore index a28e4ab..d522ca2 100644 --- a/.npmignore +++ b/.npmignore @@ -1,6 +1,7 @@ bower_components/ tests/ tmp/ +dist/ .bowerrc .editorconfig @@ -9,5 +10,6 @@ tmp/ .npmignore **/.gitkeep bower.json +ember-cli-build.js Brocfile.js testem.json diff --git a/.travis.yml b/.travis.yml index 70a305e..8197d31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,19 @@ cache: directories: - node_modules +env: + - EMBER_TRY_SCENARIO=default + - EMBER_TRY_SCENARIO=ember-release + - EMBER_TRY_SCENARIO=ember-beta + - EMBER_TRY_SCENARIO=ember-canary + +matrix: + fast_finish: true + allow_failures: + - env: EMBER_TRY_SCENARIO=ember-canary + before_install: + - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH - "npm config set spin false" - "npm install -g npm@^2" @@ -19,4 +31,4 @@ install: - bower install script: - - npm test + - ember try $EMBER_TRY_SCENARIO test diff --git a/.watchmanconfig b/.watchmanconfig new file mode 100644 index 0000000..5e9462c --- /dev/null +++ b/.watchmanconfig @@ -0,0 +1,3 @@ +{ + "ignore_dirs": ["tmp"] +} diff --git a/Brocfile.js b/Brocfile.js deleted file mode 100644 index 042a64d..0000000 --- a/Brocfile.js +++ /dev/null @@ -1,21 +0,0 @@ -/* jshint node: true */ -/* global require, module */ - -var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); - -var app = new EmberAddon(); - -// Use `app.import` to add additional libraries to the generated -// output files. -// -// If you need to use different assets in different -// environments, specify an object as the first parameter. That -// object's keys should be the environment name and the values -// should be the asset to use in that environment. -// -// If the library that you are including contains AMD or ES6 -// modules that you would like to import into your application -// please specify an object with the list of modules as keys -// along with the exports of each module as its value. - -module.exports = app.toTree(); diff --git a/bower.json b/bower.json index 339006a..0207991 100644 --- a/bower.json +++ b/bower.json @@ -1,17 +1,17 @@ { "name": "ember-cli-bourbon", "dependencies": { - "jquery": "^1.11.1", - "ember": "1.11.1", - "ember-data": "1.0.0-beta.16.1", - "ember-resolver": "~0.1.15", - "loader.js": "ember-cli/loader.js#3.2.0", + "ember": "1.13.6", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", - "ember-qunit": "0.3.1", + "ember-data": "1.13.7", + "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", + "ember-qunit": "0.4.9", "ember-qunit-notifications": "0.0.7", - "qunit": "~1.17.1" + "ember-resolver": "~0.1.18", + "jquery": "^1.11.1", + "loader.js": "ember-cli/loader.js#3.2.0", + "qunit": "~1.18.0" }, "devDependencies": { "bourbon": "~4.2.1" diff --git a/config/ember-try.js b/config/ember-try.js new file mode 100644 index 0000000..83dab0f --- /dev/null +++ b/config/ember-try.js @@ -0,0 +1,35 @@ +module.exports = { + scenarios: [ + { + name: 'default', + dependencies: { } + }, + { + name: 'ember-release', + dependencies: { + 'ember': 'components/ember#release' + }, + resolutions: { + 'ember': 'release' + } + }, + { + name: 'ember-beta', + dependencies: { + 'ember': 'components/ember#beta' + }, + resolutions: { + 'ember': 'beta' + } + }, + { + name: 'ember-canary', + dependencies: { + 'ember': 'components/ember#canary' + }, + resolutions: { + 'ember': 'canary' + } + } + ] +}; diff --git a/config/environment.js b/config/environment.js new file mode 100644 index 0000000..0dfaed4 --- /dev/null +++ b/config/environment.js @@ -0,0 +1,5 @@ +'use strict'; + +module.exports = function(/* environment, appConfig */) { + return { }; +}; diff --git a/ember-cli-build.js b/ember-cli-build.js new file mode 100644 index 0000000..a72158c --- /dev/null +++ b/ember-cli-build.js @@ -0,0 +1,20 @@ +/* global require, module */ +var EmberApp = require('ember-cli/lib/broccoli/ember-addon'); + +module.exports = function(defaults) { + var app = new EmberApp(defaults, { + // See https://github.com/ember-cli/ember-cli/issues/4084 + sassOptions: { + extension: 'scss' + } + }); + + /* + This build file specifes the options for the dummy test app of this + addon, located in `/tests/dummy` + This build file does *not* influence how the addon or the app using it + behave. You most likely want to be modifying `./index.js` or app's build file + */ + + return app.toTree(); +}; diff --git a/package.json b/package.json index 6f48470..069e26b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ember-cli-bourbon", - "description": "Include boubon in an ember-cli app", "version": "1.0.1", + "description": "Include bourbon in an ember-cli app", "directories": { "doc": "doc", "test": "tests" @@ -9,7 +9,7 @@ "scripts": { "start": "ember server", "build": "ember build", - "test": "ember test" + "test": "ember try:testall" }, "repository": "https://github.com/yapplabs/ember-cli-bourbon", "engines": { @@ -17,26 +17,34 @@ }, "author": "Yapp Labs", "license": "MIT", - "dependencies": { - "broccoli-funnel": "^0.2.3" - }, "devDependencies": { "broccoli-asset-rev": "^2.0.2", - "ember-cli": "0.2.3", - "ember-cli-app-version": "0.3.3", - "ember-cli-dependency-checker": "0.0.8", - "ember-cli-htmlbars": "0.7.4", - "ember-cli-ic-ajax": "0.1.1", + "ember-cli": "1.13.7", + "ember-cli-app-version": "0.4.0", + "ember-cli-content-security-policy": "0.4.0", + "ember-cli-dependency-checker": "^1.0.0", + "ember-cli-htmlbars": "0.7.9", + "ember-cli-htmlbars-inline-precompile": "^0.1.1", + "ember-cli-ic-ajax": "0.2.1", "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-qunit": "0.3.10", - "ember-cli-sass": "^3.2.1", - "ember-cli-uglify": "1.0.1", - "ember-data": "1.0.0-beta.16.1", - "ember-export-application-global": "^1.0.2" + "ember-cli-qunit": "0.3.20", + "ember-cli-release": "0.2.3", + "ember-cli-sass": "4.0.1", + "ember-cli-sri": "^1.0.1", + "ember-cli-uglify": "^1.0.1", + "ember-data": "1.13.7", + "ember-disable-prototype-extensions": "^1.0.0", + "ember-disable-proxy-controllers": "^1.0.0", + "ember-export-application-global": "^1.0.3", + "ember-try": "0.0.6" }, "keywords": [ "ember-addon" ], + "dependencies": { + "broccoli-funnel": "^0.2.3", + "ember-cli-babel": "^5.0.0" + }, "ember-addon": { "configPath": "tests/dummy/config" } diff --git a/testem.json b/testem.json index 42a4ddb..0f35392 100644 --- a/testem.json +++ b/testem.json @@ -1,6 +1,7 @@ { "framework": "qunit", "test_page": "tests/index.html?hidepassed", + "disable_watching": true, "launch_in_ci": [ "PhantomJS" ], diff --git a/tests/.jshintrc b/tests/.jshintrc index ea8b88f..6ec0b7c 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -26,7 +26,7 @@ "node": false, "browser": false, "boss": true, - "curly": false, + "curly": true, "debug": false, "devel": false, "eqeqeq": true, @@ -47,5 +47,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true + "esnext": true, + "unused": true } diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js index 757df38..8d66b95 100644 --- a/tests/dummy/app/app.js +++ b/tests/dummy/app/app.js @@ -3,9 +3,11 @@ import Resolver from 'ember/resolver'; import loadInitializers from 'ember/load-initializers'; import config from './config/environment'; +var App; + Ember.MODEL_FACTORY_INJECTIONS = true; -var App = Ember.Application.extend({ +App = Ember.Application.extend({ modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, Resolver: Resolver diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html index 0f3e6af..1c49d36 100644 --- a/tests/dummy/app/index.html +++ b/tests/dummy/app/index.html @@ -11,9 +11,15 @@ + + {{content-for 'head-footer'}} + {{content-for 'body'}} + + + {{content-for 'body-footer'}} diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs index d08c11f..f8bc38e 100644 --- a/tests/dummy/app/templates/application.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -1,3 +1,3 @@ -

Welcome to Ember.js

+

Welcome to Ember

{{outlet}} diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index bc0d538..c59bcd5 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -21,16 +21,16 @@ module.exports = function(environment) { if (environment === 'development') { // ENV.APP.LOG_RESOLVER = true; - ENV.APP.LOG_ACTIVE_GENERATION = true; + // ENV.APP.LOG_ACTIVE_GENERATION = true; // ENV.APP.LOG_TRANSITIONS = true; // ENV.APP.LOG_TRANSITIONS_INTERNAL = true; - ENV.APP.LOG_VIEW_LOOKUPS = true; + // ENV.APP.LOG_VIEW_LOOKUPS = true; } if (environment === 'test') { // Testem prefers this... ENV.baseURL = '/'; - ENV.locationType = 'auto'; + ENV.locationType = 'none'; // keep test console output quieter ENV.APP.LOG_ACTIVE_GENERATION = false; diff --git a/tests/dummy/public/crossdomain.xml b/tests/dummy/public/crossdomain.xml index 29a035d..0c16a7a 100644 --- a/tests/dummy/public/crossdomain.xml +++ b/tests/dummy/public/crossdomain.xml @@ -1,15 +1,15 @@ - + - - + + - - + + diff --git a/tests/dummy/public/robots.txt b/tests/dummy/public/robots.txt index ee2cc21..f591645 100644 --- a/tests/dummy/public/robots.txt +++ b/tests/dummy/public/robots.txt @@ -1,3 +1,3 @@ -# robotstxt.org/ - +# http://www.robotstxt.org User-agent: * +Disallow: diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index 16cc7c3..0f7aab1 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -1,6 +1,5 @@ import Ember from 'ember'; import Application from '../../app'; -import Router from '../../router'; import config from '../../config/environment'; export default function startApp(attrs) {