@highstate/cli 0.7.3 → 0.7.4

package/dist/main.js

@@ -10,8 +10,8 @@ import pino, { levels } from 'pino';
 import { readFile, writeFile } from 'node:fs/promises';
 import { parseAsync } from 'oxc-parser';
 import { walk } from 'oxc-walker';
-import { resolve, relative, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { resolve, dirname, relative } from 'node:path';
+import { pathToFileURL, fileURLToPath } from 'node:url';
 import { sha256 } from 'crypto-hash';
 import { resolve as resolve$1 } from 'import-meta-resolve';
 import { pipe, mapValues, mapKeys } from 'remeda';
@@ -1185,7 +1185,8 @@ function cleanJsdoc(str) {
 }
 
 class SourceHashCalculator {
-  constructor(packageJson, logger) {
+  constructor(packageJsonPath, packageJson, logger) {
+    this.packageJsonPath = packageJsonPath;
     this.packageJson = packageJson;
     this.logger = logger;
   }
@@ -1247,7 +1248,8 @@ class SourceHashCalculator {
       case "npm": {
         let resolvedUrl;
         try {
-          resolvedUrl = resolve$1(dependency.package, import.meta.url);
+          const baseUrl = pathToFileURL(dirname(this.packageJsonPath));
+          resolvedUrl = resolve$1(dependency.package, baseUrl.toString());
         } catch (error) {
           this.logger.error(`failed to resolve package "%s"`, dependency.package);
           throw error;
@@ -1445,8 +1447,13 @@ class BuildCommand extends Command {
       external: ["@pulumi/pulumi"],
       esbuildPlugins: this.library ? [schemaTransformerPlugin] : []
     });
+    const packageJsonPath = await resolvePackageJSON();
     const upToDatePackageJson = await readPackageJSON();
-    const sourceHashCalculator = new SourceHashCalculator(upToDatePackageJson, logger);
+    const sourceHashCalculator = new SourceHashCalculator(
+      packageJsonPath,
+      upToDatePackageJson,
+      logger
+    );
     const distPaths = Object.values(entry).map((value) => value.distPath);
     await sourceHashCalculator.writeHighstateManifest("./dist", distPaths);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/cli",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "The CLI for the Highstate project.",
   "type": "module",
   "files": [
@@ -18,6 +18,7 @@
     "build": "pkgroll --clean --tsconfig=tsconfig.build.json"
   },
   "dependencies": {
+    "@highstate/backend": "^0.7.4",
     "clipanion": "^4.0.0-rc.4",
     "consola": "^3.4.0",
     "crypto-hash": "^3.1.0",
@@ -34,8 +35,5 @@
   "devDependencies": {
     "pkgroll": "^2.5.1"
   },
-  "peerDependencies": {
-    "@highstate/backend": "workspace:^0.7.2"
-  },
-  "gitHead": "5cf7cec27262c8fa1d96f6478833b94841459d64"
+  "gitHead": "c482cdf650746f6814122602d65bf5b842a2bc2c"
 }

package/src/commands/build.ts

@@ -1,5 +1,5 @@
 import { Command, Option } from "clipanion"
-import { readPackageJSON } from "pkg-types"
+import { readPackageJSON, resolvePackageJSON } from "pkg-types"
 import { mapKeys, mapValues, pipe } from "remeda"
 import { build } from "tsup"
 import { logger, schemaTransformerPlugin, SourceHashCalculator } from "../shared"
@@ -84,9 +84,14 @@ export class BuildCommand extends Command {
       esbuildPlugins: this.library ? [schemaTransformerPlugin] : [],
     })
 
+    const packageJsonPath = await resolvePackageJSON()
     const upToDatePackageJson = await readPackageJSON()
 
-    const sourceHashCalculator = new SourceHashCalculator(upToDatePackageJson, logger)
+    const sourceHashCalculator = new SourceHashCalculator(
+      packageJsonPath,
+      upToDatePackageJson,
+      logger,
+    )
     const distPaths = Object.values(entry).map(value => value.distPath)
 
     await sourceHashCalculator.writeHighstateManifest("./dist", distPaths)

package/src/shared/source-hash-calculator.ts

@@ -1,7 +1,7 @@
 import type { Logger } from "pino"
 import { dirname, relative, resolve } from "node:path"
 import { readFile, writeFile } from "node:fs/promises"
-import { fileURLToPath } from "node:url"
+import { fileURLToPath, pathToFileURL } from "node:url"
 import { readPackageJSON, resolvePackageJSON, type PackageJson } from "pkg-types"
 import { sha256 } from "crypto-hash"
 import { resolve as importMetaResolve } from "import-meta-resolve"
@@ -27,6 +27,7 @@ export class SourceHashCalculator {
   private readonly fileHashes = new Map<string, Promise<string>>()
 
   constructor(
+    private readonly packageJsonPath: string,
     private readonly packageJson: PackageJson,
     private readonly logger: Logger,
   ) {}
@@ -102,7 +103,9 @@ export class SourceHashCalculator {
       case "npm": {
         let resolvedUrl
         try {
-          resolvedUrl = importMetaResolve(dependency.package, import.meta.url)
+          const baseUrl = pathToFileURL(dirname(this.packageJsonPath))
+
+          resolvedUrl = importMetaResolve(dependency.package, baseUrl.toString())
         } catch (error) {
           this.logger.error(`failed to resolve package "%s"`, dependency.package)
           throw error