Skip to content

Commit

Permalink
Upgrade addon via ember init
Browse files Browse the repository at this point in the history
Remove unnecessary dependencies
Move bower deps to devDep
Remove ember-paper import from `app/`, got installed accidentally from the blueprint and should only be used for dummy app
  • Loading branch information
elwayman02 committed Nov 6, 2015
1 parent 9c8a5e4 commit 39d0f2f
Show file tree
Hide file tree
Showing 17 changed files with 74 additions and 41 deletions.
1 change: 1 addition & 0 deletions .jscsrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"preset": "ember-suave",
"esnext": true,
"disallowSpacesInNamedFunctionExpression": {
"beforeOpeningRoundBrace": true
Expand Down
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ dist/
.npmignore
**/.gitkeep
bower.json
ember-cli-build.js
testem.json
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp"]
"ignore_dirs": ["tmp", "dist"]
}
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,8 @@ export default Ember.Mixin.create(
## Development

- `git clone https://github.com/sir-dunxalot/ember-tooltips.git`
- `cd ember-tooltips`
- `npm install && bower install`
- `ember s`
- `ember test` or `/tests` route

Expand Down
1 change: 0 additions & 1 deletion app/styles/app.scss

This file was deleted.

27 changes: 14 additions & 13 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{
"name": "ember-tooltips",
"dependencies": {
"ember": "2.0.2",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.5",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
"ember-data": "2.0.0",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.7",
"ember-qunit": "0.4.10",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.21",
"ember": "2.1.0",
"ember-cli-shims": "0.0.6",
"ember-cli-test-loader": "0.2.1",
"ember-load-initializers": "0.1.7",
"jquery": "^1.11.3",
"loader.js": "ember-cli/loader.js#3.2.1",
"qunit": "~1.18.0",
"hammerjs": "~2.0.4",
"matchMedia": "0.2.0"
"loader.js": "3.3.0"
},
"devDependencies": {
"compass-mixins": "~1.0.2"
"compass-mixins": "~1.0.2",
"ember-qunit": "0.4.13",
"ember-qunit-notifications": "0.1.0",
"hammerjs": "~2.0.4",
"matchMedia": "0.2.0",
"qunit": "~1.19.0"
},
"resolutions": {
"ember": "2.1.0"
}
}
1 change: 1 addition & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*jshint node:true*/
module.exports = {
scenarios: [
{
Expand Down
1 change: 1 addition & 0 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*jshint node:true*/
'use strict';

module.exports = function(/* environment, appConfig */) {
Expand Down
11 changes: 6 additions & 5 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
/*jshint node:true*/
/* global require, module */
var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
var app = new EmberApp(defaults, {
var app = new EmberAddon(defaults, {
snippetSearchPaths: ['app', 'tests'],

sassOptions: {
extension: 'scss',
includePaths: [
'bower_components/compass-mixins/lib',
],
},
'bower_components/compass-mixins/lib'
]
}
});

/*
Expand Down
25 changes: 12 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,26 @@
"author": "",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.1.2",
"broccoli-asset-rev": "^2.2.0",
"ember-cli": "1.13.8",
"ember-cli-app-version": "0.5.0",
"ember-cli-app-version": "^1.0.0",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "^1.0.1",
"ember-cli-dependency-checker": "^1.1.0",
"ember-cli-github-pages": "0.0.6",
"ember-cli-htmlbars-inline-precompile": "^0.2.0",
"ember-cli-ic-ajax": "0.2.1",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "^1.0.0",
"ember-cli-release": "0.2.7",
"ember-cli-qunit": "^1.0.3",
"ember-cli-release": "0.2.8",
"ember-cli-sass": "4.2.1",
"ember-cli-uglify": "^1.2.0",
"ember-code-snippet": "1.1.0",
"ember-data": "2.0.0",
"ember-disable-prototype-extensions": "^1.0.0",
"ember-disable-proxy-controllers": "^1.0.0",
"ember-export-application-global": "^1.0.3",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.4",
"ember-paper": "0.2.8",
"ember-suave": "1.1.0",
"ember-try": "0.0.6",
"ember-suave": "1.2.2",
"ember-resolver": "^2.0.3",
"ember-try": "~0.0.8",
"publish": "^0.5.0",
"rsvp": "^3.1.0"
},
Expand All @@ -52,7 +51,7 @@
],
"dependencies": {
"ember-cli-babel": "^5.1.5",
"ember-cli-htmlbars": "0.7.9"
"ember-cli-htmlbars": "^1.0.1"
},
"ember-addon": {
"configPath": "tests/dummy/config",
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import Resolver from 'ember/resolver';
import Resolver from 'ember-resolver';
import loadInitializers from 'ember/load-initializers';
import config from './config/environment';

Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = function(environment) {
'style-src': "'self' 'unsafe-inline' *.google.com *.googleapis.com",
'font-src': "'self' *.gstatic.com *.googleapis.com",
'img-src': "'self' *.amazonaws.com",
},
}
};

if (environment === 'development') {
Expand Down
5 changes: 5 additions & 0 deletions tests/helpers/destroy-app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import Ember from 'ember';

export default function destroyApp(application) {
Ember.run(application, 'destroy');
}
23 changes: 23 additions & 0 deletions tests/helpers/module-for-acceptance.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { module } from 'qunit';
import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app';

export default function(name, options = {}) {
module(name, {
beforeEach() {
this.application = startApp();

if (options.beforeEach) {
options.beforeEach.apply(this, arguments);
}
},

afterEach() {
destroyApp(this.application);

if (options.afterEach) {
options.afterEach.apply(this, arguments);
}
},
});
}
2 changes: 1 addition & 1 deletion tests/helpers/resolver.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Resolver from 'ember/resolver';
import Resolver from 'ember-resolver';
import config from '../../config/environment';

const resolver = Resolver.create();
Expand Down
4 changes: 2 additions & 2 deletions tests/helpers/start-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import './async/mouse-over';
import './sync/inspect';

export default function startApp(attrs) {
let attributes = Ember.merge({}, config.APP);
let application;

let attributes = Ember.merge({}, config.APP);
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;

Ember.run(function() {
Ember.run(() => {
application = Application.create(attributes);
application.setupForTesting();
application.injectTestHelpers();
Expand Down
5 changes: 3 additions & 2 deletions tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
{{content-for 'test-head-footer'}}
</head>
<body>

{{content-for 'body'}}
{{content-for 'test-body'}}

<script src="assets/vendor.js"></script>
<script src="assets/test-support.js"></script>
<script src="assets/dummy.js"></script>
<script src="testem.js"></script>
<script src="testem.js" integrity=""></script>
<script src="assets/tests.js"></script>
<script src="assets/test-loader.js"></script>

{{content-for 'body-footer'}}
Expand Down

0 comments on commit 39d0f2f

Please sign in to comment.