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

Update and pin "loader.js" to v4.1.0 #146

Merged
merged 1 commit into from
Apr 17, 2017
Merged

Update and pin "loader.js" to v4.1.0 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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 @@ -19,7 +19,7 @@
"devDependencies": {
"mocha": "^2.5.3",
"chai": "^3.5.0",
"loader": "stefanpenner/loader.js#1.0.1",
"loader.js": "4.1.0",
Copy link
Member

Choose a reason for hiding this comment

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

Should be getting this as a normal NPM dep, not via bower.

Copy link
Member Author

Choose a reason for hiding this comment

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

hmpf... I just copied this from ember-qunit 🙁

Copy link
Member

Choose a reason for hiding this comment

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

Ya, ember-qunit should be getting it from npm too 😉

Copy link
Member

Choose a reason for hiding this comment

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

Seems fine to lock it down for the local test harness stuff though

"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
"pretender": "^0.6.0",
"jquery": "~2.1.1",
Expand Down
2 changes: 1 addition & 1 deletion ember-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = function(defaults) {
// --- Compile ES6 modules ---

var loader = new Funnel('bower_components', {
srcDir: 'loader',
srcDir: 'loader.js/lib/loader',
files: ['loader.js'],
destDir: '/assets/'
});
Expand Down