Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ ember install ember-cli-nprogress
### Showing `NProgress` while a model loads
```javascript
import Ember from 'ember';
import progress from 'ember-cli-nprogress';
import nprogress from 'nprogress';

export default Ember.Route.extend({
model(params){
progress.start();
nprogress.start();

let promise = this.store.findRecord('post', params.id);
return promise.then(function(post){
progress.done();
nprogress.done();
return post;
});
}
Expand Down
4 changes: 3 additions & 1 deletion addon/initializers/nprogress.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import nprogress from 'nprogress';
export const scheduler = run.later.bind(undefined, undefined);

export function initialize() {
nprogress.configure({ scheduler });
if (typeof FastBoot === 'undefined') {
nprogress.configure({ scheduler });
}
}

export default {
Expand Down
26 changes: 18 additions & 8 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const path = require('path');
const Funnel = require('broccoli-funnel');
const MergeTrees = require('broccoli-merge-trees');
const debug = require('debug')('ember-cli-nprogress:addon');
const FastbootTransform = require('fastboot-transform');

/* identical to ember-cli/lib/models/addon.js's `_findHost` */
/* used instead of breaking backwards compat. w/ older versions of cli */
Expand All @@ -29,10 +30,11 @@ module.exports = {

var host = findHost(this);

host.import('vendor/nprogress/nprogress.js', {
using: [
{ transformation: 'amd', as: 'nprogress' }
]
host.import('vendor/nprogress/nprogress.js');
host.import('vendor/nprogress-shim.js', {
exports: {
nprogress: ['default']
}
});

host.import('vendor/nprogress/nprogress.css');
Expand All @@ -42,16 +44,24 @@ module.exports = {

treeForVendor(vendorTree) {
const trees = [];
const nprogressTree = new Funnel(path.dirname(require.resolve('nprogress/nprogress.js')), {
files: ['nprogress.js', 'nprogress.css'],

const nprogressJs = FastbootTransform(new Funnel(path.dirname(require.resolve('nprogress/nprogress.js')), {
files: ['nprogress.js'],
destDir: 'nprogress'
});
}));

const nprogressCss = new Funnel(path.dirname(require.resolve('nprogress/nprogress.js')), {
files: ['nprogress.css'],
destDir: 'nprogress'
})

if (vendorTree !== undefined) {
trees.push(vendorTree);
}

trees.push(nprogressTree);
trees.push(nprogressJs);

trees.push(nprogressCss);

return new MergeTrees(trees);
}
Expand Down
8 changes: 8 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"dependencies": {
"debug": "^2.3.3",
"ember-cli-babel": "^6.6.0",
"fastboot-transform": "^0.1.2",
"nprogress": "alexlafroscia/nprogress#allow-alternate-scheduler"
},
"devDependencies": {
Expand Down
12 changes: 12 additions & 0 deletions vendor/nprogress-shim.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
(function() {

function generateModule(name, values) {
define(name, [], function() {
'use strict';

return values;
});
}

generateModule('nprogress', { 'default': window.NProgress });
})();