From 19b99c03b2b58869ba76541306e4c58057ecf585 Mon Sep 17 00:00:00 2001 From: Ben Kiefer Date: Fri, 30 Oct 2015 20:38:41 -0500 Subject: [PATCH 1/2] update the dependencies for the application --- .npmignore | 2 +- Brocfile.js | 21 --------------------- bower.json | 12 ++++++------ ember-cli-build.js | 26 ++++++++++++++++++++++++++ package.json | 21 +++++++++++---------- 5 files changed, 44 insertions(+), 38 deletions(-) delete mode 100644 Brocfile.js create mode 100644 ember-cli-build.js diff --git a/.npmignore b/.npmignore index a28e4ab..7dd2037 100644 --- a/.npmignore +++ b/.npmignore @@ -9,5 +9,5 @@ tmp/ .npmignore **/.gitkeep bower.json -Brocfile.js +ember-cli-build.js testem.json 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 95be17e..e71a630 100644 --- a/bower.json +++ b/bower.json @@ -1,15 +1,15 @@ { "name": "ember-cli-auto-complete", "dependencies": { - "ember": "1.13.4", + "ember": "1.13.7", "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.5", - "ember-qunit": "0.4.1", + "ember-qunit": "0.4.9", "ember-qunit-notifications": "0.0.7", - "ember-resolver": "~0.1.18", - "jquery": "^1.11.1", - "loader.js": "ember-cli/loader.js#3.2.0", - "qunit": "~1.17.1" + "ember-resolver": "~0.1.15", + "jquery": "^1.11.3", + "loader.js": "ember-cli/loader.js#3.2.1", + "qunit": "~1.18.0" } } diff --git a/ember-cli-build.js b/ember-cli-build.js new file mode 100644 index 0000000..aaf801f --- /dev/null +++ b/ember-cli-build.js @@ -0,0 +1,26 @@ +/* jshint node: true */ +/* global require, module */ + +var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); + +/* + This Brocfile specifes the options for the dummy test app of this + addon, located in `/tests/dummy` + This Brocfile does *not* influence how the addon or the app using it + behave. You most likely want to be modifying `./index.js` or app's Brocfile + */ + +module.exports = function(defaults) { + var app = new EmberAddon(defaults, { + // Add options here + }); + + /* + 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 569cf86..1a55414 100644 --- a/package.json +++ b/package.json @@ -25,17 +25,18 @@ "author": "Toran Billups toranb@gmail.com", "license": "MIT", "devDependencies": { - "bower": "1.4.1", - "broccoli-asset-rev": "^2.0.2", - "ember-cli": "1.13.1", - "ember-cli-app-version": "0.3.3", + "bower": "1.6.5", + "broccoli-asset-rev": "^2.1.2", + "ember-cli": "1.13.8", + "ember-cli-app-version": "0.5.0", "ember-cli-content-security-policy": "0.4.0", - "ember-cli-dependency-checker": "0.0.8", - "ember-cli-htmlbars": "0.7.4", - "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-qunit": "0.3.10", - "ember-cli-uglify": "1.0.1", - "ember-export-application-global": "^1.0.2", + "ember-cli-dependency-checker": "1.0.1", + "ember-cli-htmlbars": "0.7.9", + "ember-cli-htmlbars-inline-precompile": "^0.2.0", + "ember-cli-inject-live-reload": "^1.3.1", + "ember-cli-qunit": "^1.0.0", + "ember-cli-uglify": "^1.2.0", + "ember-export-application-global": "^1.0.3", "ember-disable-prototype-extensions": "^1.0.0", "ember-try": "0.0.4", "phantomjs": "~1.9.13" From 492639460084d1718815290bddab5068db99309e Mon Sep 17 00:00:00 2001 From: Ben Kiefer Date: Sat, 31 Oct 2015 10:16:31 -0500 Subject: [PATCH 2/2] update ember resolver --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index e71a630..41e70ec 100644 --- a/bower.json +++ b/bower.json @@ -7,7 +7,7 @@ "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", "ember-qunit": "0.4.9", "ember-qunit-notifications": "0.0.7", - "ember-resolver": "~0.1.15", + "ember-resolver": "~0.1.18", "jquery": "^1.11.3", "loader.js": "ember-cli/loader.js#3.2.1", "qunit": "~1.18.0"