Merge pull request #322 from instrumental-group/skip-tsconfig-paths-if-no-baseUrl

Don't use tsconfig-paths-webpack-plugin if no baseUrl defined

Author: jayair

src/webpack.config.js

@@ -414,7 +414,7 @@ function plugins() {
 function resolvePlugins() {
   const plugins = [];
 
-  if (ENABLE_TYPESCRIPT) {
+  if (ENABLE_TYPESCRIPT && (parsedTsConfig.options || {}).baseUrl) {
     plugins.push(
       new TsconfigPathsPlugin({
         configFile: tsConfigPath,

tests/helpers/run-sls-command.js

@@ -6,15 +6,17 @@ const execPromise = promisify(exec);
 const TIMEOUT = 30000;
 const INVOKE_CMD = "invoke local -f hello -l --data {}";
 
-async function runSlsCommand(cwd, cmd = INVOKE_CMD) {
+async function runSlsCommand(cwd, cmd = INVOKE_CMD, includeStderr = false) {
   await npmInstall(cwd);
 
-  const { stdout } = await execPromise(`serverless ${cmd}`, {
+  const { stdout, stderr } = await execPromise(`serverless ${cmd}`, {
     cwd,
-    TIMEOUT
+    TIMEOUT,
   });
 
-  return stdout.toString("utf8");
+  return includeStderr
+    ? stdout.toString("utf8") + stderr.toString("utf8")
+    : stdout.toString("utf8");
 }
 
 module.exports = runSlsCommand;

tests/typescript-no-baseUrl/handler.ts

@@ -0,0 +1,9 @@
+export const hello = async (event: any) => {
+  return {
+    statusCode: 200,
+    body: JSON.stringify({
+      message: "No baseUrl",
+      input: event,
+    }),
+  };
+};

tests/typescript-no-baseUrl/package-lock.json

@@ -0,0 +1,12 @@
+{
+  "name": "typescript-no-baseUrl",
+  "version": "1.0.0",
+  "description": "",
+  "main": "handler.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}

tests/typescript-no-baseUrl/package.json

@@ -0,0 +1,14 @@
+service: my-service
+
+plugins:
+  - '../../index'
+
+custom:
+
+provider:
+  name: aws
+  runtime: nodejs12.x
+
+functions:
+  hello:
+    handler: handler.hello

tests/typescript-no-baseUrl/serverless.yml

@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "target": "es6",
+    "moduleResolution": "node"
+  }
+}

tests/typescript-no-baseUrl/tsconfig.json

@@ -0,0 +1,16 @@
+const { runSlsCommand, clearNpmCache } = require("../helpers");
+
+beforeEach(async () => {
+  await clearNpmCache(__dirname);
+});
+
+afterAll(async () => {
+  await clearNpmCache(__dirname);
+});
+
+test("typescript-no-baseUrl", async () => {
+  const result = await runSlsCommand(__dirname, "package", true);
+
+  expect(result).not.toMatch(/Failed to load/);
+  expect(result).not.toMatch(/Found no baseUrl/);
+});