Skip to content
This repository has been archived by the owner on Sep 30, 2021. It is now read-only.

Commit

Permalink
Updating to ember-cli@1.13.8
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathanKingston committed Aug 30, 2015
1 parent 7b75a81 commit dfa7267
Show file tree
Hide file tree
Showing 12 changed files with 58 additions and 56 deletions.
1 change: 1 addition & 0 deletions .npmignore
Expand Up @@ -10,5 +10,6 @@ dist/
.npmignore
**/.gitkeep
bower.json
ember-cli-build.js
Brocfile.js
testem.json
3 changes: 3 additions & 0 deletions .watchmanconfig
@@ -0,0 +1,3 @@
{
"ignore_dirs": ["tmp"]
}
21 changes: 0 additions & 21 deletions Brocfile.js

This file was deleted.

1 change: 0 additions & 1 deletion app/acceptance-tests/main.js

This file was deleted.

16 changes: 8 additions & 8 deletions bower.json
@@ -1,16 +1,16 @@
{
"name": "ember-cli-sri",
"dependencies": {
"ember": "1.12.0",
"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-data": "1.0.0-beta.17",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
"ember-qunit": "0.3.3",
"ember-data": "1.13.8",
"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",
"jquery": "^1.11.1",
"loader.js": "ember-cli/loader.js#3.2.0",
"qunit": "~1.17.1"
"ember-resolver": "~0.1.18",
"jquery": "^1.11.3",
"loader.js": "ember-cli/loader.js#3.2.1",
"qunit": "~1.18.0"
}
}
17 changes: 17 additions & 0 deletions ember-cli-build.js
@@ -0,0 +1,17 @@
/* global require, module */
var EmberApp = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
var app = new EmberApp(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();
};
45 changes: 24 additions & 21 deletions package.json
Expand Up @@ -7,8 +7,8 @@
"test": "tests"
},
"scripts": {
"start": "ember server",
"build": "ember build",
"start": "ember server",
"test": "ember try:testall"
},
"repository": {
Expand All @@ -21,31 +21,34 @@
"author": "Jonathan Kingston",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.2",
"broccoli-sri-hash": "^1.0.2",
"ember-cli": "0.2.5",
"ember-cli-app-version": "0.3.3",
"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": "^1.0.0",
"ember-cli-htmlbars": "0.7.6",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.3.13",
"ember-cli-uglify": "^1.0.1",
"ember-data": "1.0.0-beta.17",
"ember-cli-dependency-checker": "^1.0.1",
"ember-cli-htmlbars": "0.7.9",
"ember-cli-htmlbars-inline-precompile": "^0.2.0",
"ember-cli-ic-ajax": "0.2.1",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "^1.0.0",
"ember-cli-release": "0.2.3",
"ember-cli-uglify": "^1.2.0",
"ember-data": "1.13.8",
"ember-disable-proxy-controllers": "^1.0.0",
"ember-export-application-global": "^1.0.3",
"ember-disable-prototype-extensions": "^1.0.0",
"ember-disable-proxy-controllers": "^0.7.0",
"ember-export-application-global": "^1.0.2",
"ember-try": "0.0.4",
"phantomjs": "^1.9.17"
},
"dependencies": {
"broccoli-sri-hash": "^1.0.0",
"ember-cli-babel": "^5.0.0"
"ember-try": "0.0.6"
},
"keywords": [
"ember-addon"
"ember-addon",
"SRI",
"infosec",
"security"
],
"dependencies": {
"broccoli-sri-hash": "^1.0.2",
"ember-cli-babel": "^5.1.3"
},
"ember-addon": {
"configPath": "tests/dummy/config",
"after": [
Expand Down
5 changes: 3 additions & 2 deletions tests/.jshintrc
Expand Up @@ -26,7 +26,7 @@
"node": false,
"browser": false,
"boss": true,
"curly": false,
"curly": true,
"debug": false,
"devel": false,
"eqeqeq": true,
Expand All @@ -47,5 +47,6 @@
"strict": false,
"white": false,
"eqnull": true,
"esnext": true
"esnext": true,
"unused": true
}
1 change: 0 additions & 1 deletion tests/acceptance/main-test.js
Expand Up @@ -18,7 +18,6 @@ test('visiting /main', function(assert) {
visit('/main');

andThen(function() {
var integrity = find('body').text();
var scripts = document.querySelectorAll('script,link');
[].forEach.call(scripts, function (script) {
var integrity = script.getAttribute('integrity');
Expand Down
1 change: 1 addition & 0 deletions tests/dummy/app/app.js
Expand Up @@ -9,6 +9,7 @@ Ember.MODEL_FACTORY_INJECTIONS = true;

App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver: Resolver
});

Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/application.hbs
@@ -1,3 +1,3 @@
<h2 id="title">Welcome to Ember.js</h2>
<h2 id="title">Welcome to Ember</h2>

{{outlet}}
1 change: 0 additions & 1 deletion 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) {
Expand Down

0 comments on commit dfa7267

Please sign in to comment.