Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #187

Merged
merged 8 commits into from
Dec 1, 2016
Merged

Update dependencies #187

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
06e8990
package.json: Adjust "npm test" to run "ember try:each"
Turbo87 Nov 30, 2016
b5caa50
.gitignore: Add ".node_modules.ember-try" folder
Turbo87 Nov 30, 2016
335a895
Update "broccoli-funnel" to v1.0.5
Turbo87 Nov 30, 2016
6dab78c
Update "broccoli-merge-trees" to v1.1.5
Turbo87 Nov 30, 2016
bef160e
Replace deprecated "broccoli-sourcemap-concat" with "broccoli-concat"
Turbo87 Nov 30, 2016
5d4d34b
Update "pretender" to v1.4.1
Turbo87 Nov 30, 2016
f8d347c
Update "ember-cli" to v2.10.0
Turbo87 Nov 30, 2016
dd8642a
Remove "ember-try" dependency
Turbo87 Dec 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ bower_components
tmp
dist
build
/.node_modules.ember-try
3 changes: 0 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ install:
- npm install -g bower
- npm install --no-optional
- bower install

script:
- ./node_modules/.bin/ember try:each
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"devDependencies": {
"qunit": "^1.23.1",
"pretender": "~0.10.1",
"pretender": "^1.4.1",
"ember-cli-shims": "0.0.6",
"ember-cli-test-loader": "0.0.4",
"jquery": "~2.1.4"
Expand Down
9 changes: 5 additions & 4 deletions ember-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var Funnel = require('broccoli-funnel');
var mergeTrees = require('broccoli-merge-trees');
var Babel = require('broccoli-babel-transpiler');
var concat = require('broccoli-sourcemap-concat');
var concat = require('broccoli-concat');
var JSHint = require('broccoli-jshint');
var existsSync = require('exists-sync');

Expand Down Expand Up @@ -46,7 +46,8 @@ module.exports = function(options) {
var addonTree = mergeTrees(addonTreesFor('addon'));
var addonModulesTree = new Funnel(addonTree, {
srcDir: 'modules',
destDir: '/'
destDir: '/',
allowEmpty: true,
});

var main = mergeTrees(mainTrees.concat(addonModulesTree));
Expand Down Expand Up @@ -77,7 +78,7 @@ module.exports = function(options) {
}

var vendor = concat('bower_components', {
inputFiles: inputFiles,
headerFiles: inputFiles,
outputFile: '/assets/vendor.js'
});

Expand All @@ -94,7 +95,7 @@ module.exports = function(options) {
});

var testSupport = concat('bower_components', {
inputFiles: ['ember-cli-shims/app-shims.js',
headerFiles: ['ember-cli-shims/app-shims.js',
'ember-cli-test-loader/test-loader.js'],
outputFile: '/assets/test-support.js'
});
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"scripts": {
"start": "ember serve",
"test": "ember test"
"test": "ember try:each"
},
"authors": [
"Dan Gebhardt",
Expand All @@ -22,11 +22,11 @@
"readmeFilename": "README.md",
"devDependencies": {
"broccoli-babel-transpiler": "^5.5.0",
"broccoli-funnel": "^0.2.15",
"broccoli-concat": "^3.0.5",
"broccoli-funnel": "^1.0.5",
"broccoli-jshint": "^1.1.2",
"broccoli-merge-trees": "^0.2.4",
"broccoli-sourcemap-concat": "^0.4.4",
"ember-cli": "1.13.13",
"broccoli-merge-trees": "^1.1.5",
"ember-cli": "^2.10.0",
"ember-cli-release": "^1.0.0-beta.1",
"ember-try": "0.2.2",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can remove this

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, remove it

"exists-sync": "0.0.3",
Expand Down