Merge pull request #707 from embroider-build/fixup-new-babel-typings

Fixup types for newer @babel/types.
embroider-build · Mar 4, 2021 · 221831a · 221831a
2 parents 9d13424 + ae11381
commit 221831a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/core/src/babel-plugin-adjust-imports.ts b/packages/core/src/babel-plugin-adjust-imports.ts
@@ -397,7 +397,7 @@ export default function main() {
       ) {
         let { opts, emberCLIVanillaJobs } = state;
         const { source } = path.node;
-        if (source === null) {
+        if (source === null || source === undefined) {
           return;
         }
 

diff --git a/packages/macros/tests/babel/eval.test.ts b/packages/macros/tests/babel/eval.test.ts
@@ -110,7 +110,7 @@ describe('evaluation', function () {
   });
 });
 
-function nodePathNotNull(path: NodePath<Expression | null>): path is NodePath<Expression> {
+function isNodePathPresent(path: NodePath<Expression | null | undefined>): path is NodePath<Expression> {
   return path.node != null;
 }
 
@@ -120,7 +120,7 @@ function testEval() {
       exit(path: NodePath<VariableDeclarator>) {
         let id = path.get('id').node;
         let value = path.get('init');
-        if (isIdentifier(id) && id.name === 'result' && nodePathNotNull(value)) {
+        if (isIdentifier(id) && id.name === 'result' && isNodePathPresent(value)) {
           let evaluator = new Evaluator({
             locals: {
               knownValue: 2,