tsconfig-loader - npm Package Compare versions

Comparing version 1.0.0 to 1.1.0

lib/index.js

@@ -16,2 +16,3 @@ "use strict";
 const StripBom = require("strip-bom");
+const resolve_1 = require("resolve");
 function loadTsconfig({ filename = process.env.TS_NODE_PROJECT, cwd = process.cwd(), } = {}) {
@@ -66,7 +67,12 @@ const configPath = resolveConfigPath(cwd, filename);
     if (extendedConfig) {
-        if (extendedConfig.indexOf('.json') === -1) {
-            extendedConfig += '.json';
-        }
         const currentDir = path.dirname(configFilePath);
-        const base = loadTsconfigFile(path.join(currentDir, extendedConfig)) || {};
+        extendedConfig = resolve_1.sync(extendedConfig, {
+            basedir: currentDir,
+            extensions: ['.json'],
+            packageFilter: (pkg) => {
+                pkg.main = 'tsconfig.json';
+                return pkg;
+            },
+        });
+        const base = loadTsconfigFile(extendedConfig) || {};
         // baseUrl should be interpreted as relative to the base tsconfig,
@@ -76,3 +82,3 @@ // but we need to update it so it is relative to the original tsconfig being loaded
             const extendsDir = path.dirname(extendedConfig);
-            base.compilerOptions.baseUrl = path.join(extendsDir, base.compilerOptions.baseUrl);
+            base.compilerOptions.baseUrl = path.relative(path.dirname(configFilePath), path.join(extendsDir, base.compilerOptions.baseUrl));
         }
@@ -79,0 +85,0 @@ return deepmerge(base, config);

package.json

@@ -24,2 +24,3 @@ {
     "json5": "^2.1.1",
+    "resolve": "^1.15.1",
     "strip-bom": "^4.0.0"
@@ -32,2 +33,3 @@ },
     "@types/node": "^13.7.7",
+    "@types/resolve": "^1.14.0",
     "husky": "^3.0.8",
@@ -79,3 +81,3 @@ "jest": "^24.9.0",
   },
-  "version": "1.0.0"
+  "version": "1.1.0"
 }

src/__tests__/index.test.ts

@@ -91,2 +91,10 @@ import {readFileSync} from 'fs';
   });
+  it('should extend npm packages', () => {
+    const result = loadTsconfig({
+      cwd: `${__dirname}/fixtures/tsconfig-with-extends-npm`,
+    });
+    expect(result?.tsConfig.compilerOptions).toEqual(
+      require('@forbeslindesay/tsconfig/tsconfig.json').compilerOptions,
+    );
+  });
 });

src/index.ts

@@ -8,2 +8,3 @@ // Extracted & adapted from https://github.com/dividab/tsconfig-paths/blob/6da68cbec7f11aa84ec7aeb14732d9edcdb82b68/src/tsconfig-loader.ts
 import StripBom = require('strip-bom');
+import {sync as resolve} from 'resolve';
 import {JSONSchemaForTheTypeScriptCompilerSConfigurationFile} from './tsconfig';
@@ -88,8 +89,12 @@
   if (extendedConfig) {
-    if (extendedConfig.indexOf('.json') === -1) {
-      extendedConfig += '.json';
-    }
-
     const currentDir = path.dirname(configFilePath);
-    const base = loadTsconfigFile(path.join(currentDir, extendedConfig)) || {};
+    extendedConfig = resolve(extendedConfig, {
+      basedir: currentDir,
+      extensions: ['.json'],
+      packageFilter: (pkg) => {
+        pkg.main = 'tsconfig.json';
+        return pkg;
+      },
+    });
+    const base = loadTsconfigFile(extendedConfig) || {};
 
@@ -100,5 +105,5 @@ // baseUrl should be interpreted as relative to the base tsconfig,
       const extendsDir = path.dirname(extendedConfig);
-      base.compilerOptions.baseUrl = path.join(
-        extendsDir,
-        base.compilerOptions.baseUrl,
+      base.compilerOptions.baseUrl = path.relative(
+        path.dirname(configFilePath),
+        path.join(extendsDir, base.compilerOptions.baseUrl),
       );
@@ -105,0 +110,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

220951

increased by0.88%

Number of package files

34

increased by3.03%

Lines of code

3096

increased by0.75%

Worsened metrics

Dependency count

4

increased by33.33%

Dev dependency count

14

increased by7.69%

Dependency changes

• + Addedresolve@^1.15.1

• + Addedfunction-bind@1.1.2(transitive)

• + Addedhasown@2.0.2(transitive)

• + Addedis-core-module@2.15.1(transitive)

• + Addedpath-parse@1.0.7(transitive)

• + Addedresolve@1.22.8(transitive)

• + Addedsupports-preserve-symlinks-flag@1.0.0(transitive)