Skip to content

Commit

Permalink
asdf
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanpenner committed Sep 2, 2021
1 parent b679143 commit b8ce0ed
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
3 changes: 1 addition & 2 deletions packages/compat/src/compat-adapters/ember-cli-fastboot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,9 @@ class RewriteManifest extends Plugin {

json['ember-addon'] = {
version: 2,
type: 'addon'
type: 'addon',
};


outputJSONSync(join(this.outputPath, '_fastboot_', 'package.json'), json, { spaces: 2 });
}
}
4 changes: 2 additions & 2 deletions packages/compat/src/default-pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ export default function defaultPipeline<PackagerOptions>(

let embroiderApp = new App(emberApp, addons, options);

if (process.env.STAGE2_ONLY || !Packager) {
if (process.env.STAGE2_ONLY || !packager) {
return mergeTrees([embroiderApp.tree, writeFile('.stage2-output', () => outputPath)]);
}

let BroccoliPackager = toBroccoliPlugin(Packager);
let BroccoliPackager = toBroccoliPlugin(packager);
let variants = (options && options.variants) || defaultVariants(emberApp);
return new BroccoliPackager(embroiderApp, variants, options && options.packagerOptions);
}
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/babel-plugin-adjust-imports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ function handleExternal(specifier: string, sourceFile: AdjustFile, opts: Options

if (!pkg || !pkg.isV2Ember()) {
if (specifier === 'ember') {
debugger;
throw `OH NO ${JSON.stringify(pkg)} ${pkg && JSON.stringify(pkg.packageJSON) } ${pkg && pkg.isV2Ember()}`;
// debugger;
throw `OH NO ${JSON.stringify(pkg)} ${pkg && JSON.stringify(pkg.packageJSON)} ${pkg && pkg.isV2Ember()}`;
}

return specifier;
Expand Down Expand Up @@ -456,13 +456,13 @@ function rewriteTopLevelImport(
}

if (source.value === 'ember') {
debugger;
// debugger;
}
let specifier = adjustSpecifier(source.value, state.adjustFile, opts, false);
if (specifier !== source.value) {
source.value = specifier;
} else if (source.value === 'ember') {
debugger
// debugger;
throw new Error(`EWUT! ${source.value} ${specifier}`);
}
}
Expand Down

0 comments on commit b8ce0ed

Please sign in to comment.