Merge pull request #359 from ember-cli/bugfix/ensure-locals-are-used-…

…everywher [BUGFIX] Ensure locals are used instead of scope everywhere
ember-cli · Mar 21, 2021 · 07c1a2f · 07c1a2f
2 parents e79b770 + dae410e
commit 07c1a2f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/__tests__/template-literal-tests.js b/__tests__/template-literal-tests.js
@@ -208,7 +208,7 @@ describe('htmlbars-inline-precompile: useTemplateLiteralProposalSemantics', func
     expect(optionsReceived).toEqual({
       contents: source,
       isProduction: undefined,
-      scope: ['baz', 'foo', 'bar'],
+      locals: ['baz', 'foo', 'bar'],
       strictMode: true,
     });
   });

diff --git a/__tests__/template-tag-tests.js b/__tests__/template-tag-tests.js
@@ -241,7 +241,7 @@ describe('htmlbars-inline-precompile: useTemplateTagProposalSemantics', function
     expect(optionsReceived).toEqual({
       contents: source,
       isProduction: undefined,
-      scope: ['baz', 'foo', 'bar'],
+      locals: ['baz', 'foo', 'bar'],
       strictMode: true,
     });
   });

diff --git a/__tests__/tests.js b/__tests__/tests.js
@@ -134,7 +134,7 @@ describe('htmlbars-inline-precompile', function () {
 
           ensureModuleApiPolyfill: false,
           isProduction: true,
-          scope: null,
+          locals: null,
         },
       ],
     ];
@@ -195,7 +195,7 @@ describe('htmlbars-inline-precompile', function () {
     expect(optionsReceived).toEqual({
       contents: source,
       isProduction: true,
-      scope: null,
+      locals: null,
       strictMode: false,
     });
   });
@@ -310,7 +310,7 @@ describe('htmlbars-inline-precompile', function () {
     expect(optionsReceived).toEqual({
       contents: source,
       isProduction: undefined,
-      scope: null,
+      locals: null,
       strictMode: false,
     });
   });

diff --git a/index.js b/index.js
@@ -383,15 +383,19 @@ module.exports = function (babel) {
       let template = path.node.quasi.quasis.map((quasi) => quasi.value.cooked).join('');
 
       let { isProduction } = state.opts;
-      let scope = shouldUseAutomaticScope(options) ? getScope(path.scope) : null;
+      let locals = shouldUseAutomaticScope(options) ? getScope(path.scope) : null;
       let strictMode = shouldUseStrictMode(options);
 
       let emberIdentifier = state.ensureImport('createTemplateFactory', '@ember/template-factory');
 
       replacePath(
         path,
         state,
-        compileTemplate(precompile, template, emberIdentifier, { isProduction, scope, strictMode }),
+        compileTemplate(precompile, template, emberIdentifier, {
+          isProduction,
+          locals,
+          strictMode,
+        }),
         options
       );
     },
@@ -475,7 +479,7 @@ module.exports = function (babel) {
       if (shouldUseAutomaticScope(options)) {
         // If using the transform semantics, then users are not expected to pass
         // options, so we override any existing scope
-        compilerOptions.scope = getScope(path.scope);
+        compilerOptions.locals = getScope(path.scope);
       }
 
       if (shouldUseStrictMode(options)) {