Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
thoov committed Apr 1, 2021
1 parent e07d055 commit 97786e0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 3 additions & 3 deletions packages/compat/src/v1-app.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Memoize } from 'typescript-memoize';
import { sync as pkgUpSync } from 'pkg-up';
import { join, dirname, isAbsolute, sep } from 'path';
import { join, dirname, isAbsolute } from 'path';
import Funnel from 'broccoli-funnel';
import mergeTrees from 'broccoli-merge-trees';
import { WatchedDir } from 'broccoli-source';
Expand Down Expand Up @@ -522,7 +522,7 @@ export default class V1App {
if (this.transformedNodeFiles().has(asset)) {
// transformed node assets become local paths, because we have copied
// those ones into our synthesized vendor package.
return `.${sep}${asset}`;
return `./${asset}`;
}
let preresolved = this.preresolvedNodeFile(asset);
if (preresolved) {
Expand All @@ -535,7 +535,7 @@ export default class V1App {
if (asset.startsWith('.') || isAbsolute(asset)) {
return asset;
}
return `.${sep}${asset}`;
return `./${asset}`;
}

private preprocessJS(tree: Node): Node {
Expand Down
2 changes: 0 additions & 2 deletions packages/core/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,6 @@ export class AppBuilder<TreeNames> {
styles.push(resolve.sync(mod, options));
}
} else {
console.log(mod);
console.log(options);
result.push(resolve.sync(mod, options));
}
}
Expand Down

0 comments on commit 97786e0

Please sign in to comment.