@ms-cloudpack/config - npm Package Compare versions

Comparing version 0.17.29 to 0.17.30

lib/readUserConfig.js

@@ -21,3 +21,3 @@ import { readJson } from '@ms-cloudpack/json-utilities';
     for (const importSpecifier of extendsArray) {
-        const resolvedPath = await resolveParentConfig({ configPath, importSpecifier });
+        const resolvedPath = resolveParentConfig({ configPath, importSpecifier });
         if (resolvedPath) {
@@ -24,0 +24,0 @@ const parentConfig = await readUserConfigInternal(resolvedPath);

lib/resolveParentConfig.d.ts

@@ -10,3 +10,3 @@ /**
     importSpecifier: string;
-}): Promise<string | undefined>;
+}): string | undefined;
 //# sourceMappingURL=resolveParentConfig.d.ts.map

lib/resolveParentConfig.js

@@ -1,5 +0,6 @@
-import { resolve } from '@ms-cloudpack/package-utilities';
-import { parseImportString } from '@ms-cloudpack/path-string-parsing';
-import fs from 'fs';
-import path from 'path';
+import { moduleResolve } from 'import-meta-resolve';
+import { fileURLToPath, pathToFileURL } from 'url';
+// Conditions used for resolution if the package has an exports map.
+// More could be added later if desired ("default" is implicitly included).
+const conditions = new Set(['import', 'require', 'node']);
 /**
@@ -9,27 +10,14 @@ * Resolve an import specifier for a parent config file.
  */
-export async function resolveParentConfig(params) {
+export function resolveParentConfig(params) {
     const { importSpecifier, configPath } = params;
     let resolvedConfigPath;
-    if (importSpecifier.startsWith('.')) {
-        resolvedConfigPath = path.resolve(path.dirname(configPath), importSpecifier);
+    try {
+        const resolvedUrl = moduleResolve(importSpecifier, pathToFileURL(configPath), conditions);
+        resolvedConfigPath = fileURLToPath(resolvedUrl);
     }
-    else {
-        const parsedImport = parseImportString(importSpecifier);
-        const resolvedPackage = await resolve(parsedImport.packageName, path.dirname(configPath));
-        if (resolvedPackage) {
-            resolvedConfigPath = path.join(resolvedPackage, parsedImport.importPath);
-        }
+    catch (err) {
+        console.warn(`Error resolving config "extends": "${importSpecifier}": ${err.message || err}`);
     }
-    if (!resolvedConfigPath) {
-        console.warn(`Unable to resolve config "extends": "${importSpecifier}" from ${configPath}`);
-        return undefined;
-    }
-    // Explicitly check if the file exists and log a warning (so the user knows their config is wrong),
-    // rather than letting readJson quietly return nothing later.
-    if (!fs.existsSync(resolvedConfigPath)) {
-        console.warn(`Resolved config "extends": "${importSpecifier}" (from ${configPath}) to ${resolvedConfigPath}, but the file doesn't exist`);
-        return undefined;
-    }
     return resolvedConfigPath;
 }
 //# sourceMappingURL=resolveParentConfig.js.map

package.json

 {
   "name": "@ms-cloudpack/config",
-  "version": "0.17.29",
+  "version": "0.17.30",
   "description": "Configuration handling for cloudpack.",
@@ -17,7 +17,7 @@ "license": "MIT",
   "dependencies": {
-    "@ms-cloudpack/bundler-types": "^0.24.4",
-    "@ms-cloudpack/config-types": "^0.5.0",
+    "@ms-cloudpack/bundler-types": "^0.24.5",
+    "@ms-cloudpack/config-types": "^0.5.1",
     "@ms-cloudpack/json-utilities": "^0.1.4",
-    "@ms-cloudpack/package-utilities": "^5.10.4",
-    "@ms-cloudpack/path-string-parsing": "^1.1.3",
+    "@ms-cloudpack/package-utilities": "^5.10.5",
+    "import-meta-resolve": "^4.0.0",
     "merge": "^2.1.1",
@@ -24,0 +24,0 @@ "semver": "^7.6.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

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Improved metrics

Number of low supply chain risk alerts

1

decreased by-50%

Worsened metrics

Total package byte prevSize

72064

decreased by-2.21%

Lines of code

583

decreased by-2.02%

Dependency changes

• + Addedimport-meta-resolve@^4.0.0

• + Addedimport-meta-resolve@4.1.0(transitive)

• - Removed@ms-cloudpack/path-string-parsing@^1.1.3

• Updated@ms-cloudpack/bundler-types@^0.24.5

• Updated@ms-cloudpack/config-types@^0.5.1

• Updated@ms-cloudpack/package-utilities@^5.10.5