fix: Avoid re-registration of ts-node (#9254)

serverless · Apr 7, 2021 · 88baf06 · 88baf06
1 parent c88a2ea
commit 88baf06
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/lib/configuration/read.js b/lib/configuration/read.js
@@ -89,27 +89,29 @@ const parseConfigurationFile = async (configurationPath) => {
       }
     }
     case '.ts': {
-      const tsNodePath = await (async () => {
+      if (!process[Symbol.for('ts-node.register.instance')]) {
+        const tsNodePath = await (async () => {
+          try {
+            return await resolveTsNode(path.dirname(configurationPath));
+          } catch (error) {
+            throw new ServerlessError(
+              `Cannot parse "${path.basename(
+                configurationPath
+              )}": Resolution of "ts-node" failed with: ${error.message}`,
+              'CONFIGURATION_RESOLUTION_ERROR'
+            );
+          }
+        })();
         try {
-          return await resolveTsNode(path.dirname(configurationPath));
+          require(tsNodePath).register();
         } catch (error) {
           throw new ServerlessError(
             `Cannot parse "${path.basename(
               configurationPath
-            )}": Resolution of "ts-node" failed with: ${error.message}`,
+            )}": Register of "ts-node" failed with: ${error.message}`,
             'CONFIGURATION_RESOLUTION_ERROR'
           );
         }
-      })();
-      try {
-        require(tsNodePath).register();
-      } catch (error) {
-        throw new ServerlessError(
-          `Cannot parse "${path.basename(configurationPath)}": Register of "ts-node" failed with: ${
-            error.message
-          }`,
-          'CONFIGURATION_RESOLUTION_ERROR'
-        );
       }
     }
     // fallthrough

diff --git a/test/unit/lib/configuration/read.test.js b/test/unit/lib/configuration/read.test.js
@@ -84,6 +84,22 @@ describe('test/unit/lib/configuration/read.test.js', () => {
     }
   });
 
+  it('should register ts-node only if it is not already registered', async () => {
+    try {
+      expect(process[Symbol.for('ts-node.register.instance')]).to.be.undefined;
+      process[Symbol.for('ts-node.register.instance')] = 'foo';
+      configurationPath = 'serverless.ts';
+      const configuration = {
+        service: 'test-ts',
+        provider: { name: 'aws' },
+      };
+      await fs.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
+      expect(await readConfiguration(configurationPath)).to.deep.equal(configuration);
+    } finally {
+      delete process[Symbol.for('ts-node.register.instance')];
+    }
+  });
+
   it('should support deferred configuration result', async () => {
     // JS configurations are required (so immune to modules caching).
     // In this tests we cannot use same JS configuration path twice for testing