Merge pull request #1885 from embroider-build/portable-babel-launcher

Fix pre support in portable babel launcher

package.json

@@ -32,7 +32,8 @@
  "overrides": {
  "browserslist": "^4.14.0",
  "graceful-fs": "^4.0.0",
- "@types/eslint": "^8.37.0"
+ "@types/eslint": "^8.37.0",
+ "babel-plugin-module-resolver@5.0.1": "5.0.0"
  }
  },
  "devDependencies": {

packages/core/src/portable-babel-launcher.ts

@@ -34,15 +34,15 @@ export default function babelLauncher(
 
  function wrap1(original: any) {
  if (typeof original === 'function') {
- return function (this: any, state: any) {
- return original.call(this, convertState(state));
+ return function (this: any, file: any) {
+ return original.call(convertState(this), file);
  };
  }
  }
 
  function wrap2(original: Function) {
  return function (this: any, path: any, state: any) {
- return original.call(this, path, convertState(state));
+ return original.call(convertState(this), path, convertState(state));
  };
  }
 

tests/scenarios/compat-resolver-test.ts

@@ -1406,7 +1406,7 @@ Scenarios.fromProject(() => new Project())
  'templates/application.hbs.js': `
  import { precompileTemplate } from '@ember/template-compilation';
  export default precompileTemplate("{{#each things as |capitalize|}} {{(capitalize)}} {{/each}}", {
- scope: () => ({ thing }),
+ scope: () => ({ things }),
  });
  `,
  });
@@ -1416,7 +1416,7 @@ Scenarios.fromProject(() => new Project())
  expectTranspiled('templates/application.hbs.js').equalsCode(`
  import { precompileTemplate } from '@ember/template-compilation';
  export default precompileTemplate("{{#each things as |capitalize|}} {{(capitalize)}} {{/each}}", {
- scope: () => ({ thing }),
+ scope: () => ({ things }),
  });
  `);
  });
@@ -1426,7 +1426,7 @@ Scenarios.fromProject(() => new Project())
  'templates/application.hbs.js': `
  import { precompileTemplate } from '@ember/template-compilation';
  export default precompileTemplate("{{#each things as |capitalize|}} <capitalize /> {{/each}}", {
- scope: () => ({ thing }),
+ scope: () => ({ things }),
  });
  `,
  });
@@ -1436,7 +1436,7 @@ Scenarios.fromProject(() => new Project())
  expectTranspiled('templates/application.hbs.js').equalsCode(`
  import { precompileTemplate } from '@ember/template-compilation';
  export default precompileTemplate("{{#each things as |capitalize|}} <capitalize /> {{/each}}", {
- scope: () => ({ thing }),
+ scope: () => ({ things }),
  });
  `);
  });
@@ -1446,7 +1446,7 @@ Scenarios.fromProject(() => new Project())
  'templates/application.hbs.js': `
  import { precompileTemplate } from '@ember/template-compilation';
  export default precompileTemplate("{{#each things as |capitalize|}} <div {{capitalize}} /> {{/each}}", {
- scope: () => ({ thing }),
+ scope: () => ({ things }),
  });
  `,
  });
@@ -1456,7 +1456,7 @@ Scenarios.fromProject(() => new Project())
  expectTranspiled('templates/application.hbs.js').equalsCode(`
  import { precompileTemplate } from '@ember/template-compilation';
  export default precompileTemplate("{{#each things as |capitalize|}} <div {{capitalize}} /> {{/each}}", {
- scope: () => ({ thing }),
+ scope: () => ({ things }),
  });
  `);
  });
@@ -1466,7 +1466,7 @@ Scenarios.fromProject(() => new Project())
  'templates/application.hbs.js': `
  import { precompileTemplate } from '@ember/template-compilation';
  export default precompileTemplate("{{#each things as |capitalize|}} {{capitalize 1}} {{/each}}", {
- scope: () => ({ thing }),
+ scope: () => ({ things }),
  });
  `,
  });
@@ -1476,7 +1476,7 @@ Scenarios.fromProject(() => new Project())
  expectTranspiled('templates/application.hbs.js').equalsCode(`
  import { precompileTemplate } from '@ember/template-compilation';
  export default precompileTemplate("{{#each things as |capitalize|}} {{capitalize 1}} {{/each}}", {
- scope: () => ({ thing }),
+ scope: () => ({ things }),
  });
  `);
  });

tests/scenarios/stage1-test.ts

@@ -112,7 +112,7 @@ appScenarios
  );
 
  fileContents.matches(
- /hbs\(["']<div class={{embroider-sample-transforms-result}}>Extra<\/div>["']\)/,
+ /precompileTemplate\(["']<div class={{embroider-sample-transforms-result}}>Extra<\/div>["']\)/,
  'called template is still hbs and custom transforms have run'
  );
 
@@ -188,7 +188,7 @@ appScenarios
  );
 
  file.matches(
- /hbs\(["']<div class={{embroider-sample-transforms-result}}>Extra<\/div>["']\)/,
+ /precompileTemplate\(["']<div class={{embroider-sample-transforms-result}}>Extra<\/div>["']\)/,
  'called template is still hbs and custom transforms have run'
  );