Skip to content

Commit

Permalink
Upgraded dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
t-sauer committed Jul 8, 2017
1 parent 5603c16 commit 57ac736
Show file tree
Hide file tree
Showing 10 changed files with 1,054 additions and 658 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
node_modules
tmp
tmp/*
dist
.vscode
3 changes: 3 additions & 0 deletions .watchmanconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
}
17 changes: 17 additions & 0 deletions config/targets.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
let browsers = [
'> 5%',
'last 2 Edge versions',
'last 2 Chrome versions',
'last 2 Firefox versions',
'last 2 Safari versions',
'IE 11'
];

if (process.env.EMBER_ENV === 'test') {
browsers = [
'last 1 Chrome versions',
'last 1 Firefox versions'
];
}

module.exports = { browsers };
13 changes: 0 additions & 13 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,5 @@ module.exports = function(defaults) {
// Add options here
});

// 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.

return app.toTree();
};
15 changes: 10 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,24 @@
"test": "ember test"
},
"devDependencies": {
"@glimmer/application": "^0.4.0",
"@glimmer/application-pipeline": "^0.6.9",
"@glimmer/blueprint": "^0.1.12",
"@glimmer/component": "^0.3.8",
"@glimmer/application": "^0.7.2",
"@glimmer/application-pipeline": "^0.8.0",
"@glimmer/blueprint": "^0.5.0",
"@glimmer/inline-precompile": "^1.0.0",
"@glimmer/resolver": "^0.3.0",
"@glimmer/test-helpers": "^0.30.0",
"@types/qunit": "^2.0.31",
"broccoli-asset-rev": "^2.5.0",
"ember-cli": "beta",
"ember-cli": "2.14.0",
"ember-cli-dependency-checker": "^2.0.1",
"ember-cli-deploy": "^1.0.0",
"ember-cli-deploy-build": "^1.0.0",
"ember-cli-deploy-git": "^1.1.1",
"ember-cli-inject-live-reload": "^1.6.1",
"ember-cli-sass": "^6.2.0",
"ember-cli-uglify": "^1.2.0",
"tslint": "^5.2.0",
"qunitjs": "^2.3.3",
"typescript": "^2.2.2"
},
"engines": {
Expand Down
13 changes: 13 additions & 0 deletions src/ui/components/glimmeroids-app/component-test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import hbs from '@glimmer/inline-precompile';
import { setupRenderingTest } from '@glimmer/test-helpers';

const { module, test } = QUnit;

module('Component: glimmeroids-app', function(hooks) {
setupRenderingTest(hooks);

test('it renders', async function(assert) {
await this.render(hbs`<glimmeroids-app />`);
assert.ok(this.containerElement.textContent);
});
});
7 changes: 7 additions & 0 deletions src/utils/test-helpers/test-helper.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { setApp, start } from '@glimmer/test-helpers';
import App from '../../main';

QUnit.config.autostart = false;
setApp(App);
import '../../../tests';
start();
7 changes: 7 additions & 0 deletions testem.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"framework": "qunit",
"src_files": ["src/**/*"],
"serve_files": ["index.js"],
"disable_watching": true,
"launch_in_ci": ["Firefox", "Chrome"]
}
6 changes: 4 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
"experimentalDecorators": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noImplicitAny": true,
"noImplicitReturns": true
"noImplicitReturns": true,
"types": [
"qunit"
]
},
"exclude": [
"node_modules",
Expand Down
Loading

0 comments on commit 57ac736

Please sign in to comment.