Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fix-mirror-state-dynamic-provider.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@opsen/docker-compose': patch
---

Fix MirrorStateProvider dynamic provider module resolution to survive Pulumi closure serialization
23 changes: 16 additions & 7 deletions packages/docker-compose/src/mirror-state/mirror-state.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
import { dynamic, type CustomResourceOptions } from '@pulumi/pulumi'

import type { MirrorStateProviderInputs, MirrorStateInputs } from './types'
// Imported dynamically inside provider methods to avoid capturing module
// references in Pulumi's closure serialization (breaks with pnpm store paths).
type ServerModule = typeof import('./server')
type CommonModule = typeof import('./common')

// Resolve absolute paths at module load time so they survive Pulumi's closure
// serialization. The dynamic provider runs plain Node.js (no tsx), so paths must
// point to compiled .js files in dist/. When loaded via tsx from src/, remap accordingly.
function resolveForDynamicProvider(relativePath: string): string {
let resolved = require.resolve(relativePath)
resolved = resolved.replace(/\.ts$/, '.js').replace(/\/src\//, '/dist/')
return resolved
}
const serverPath = resolveForDynamicProvider('./server')
const commonPath = resolveForDynamicProvider('./common')

export class MirrorStateProvider implements dynamic.ResourceProvider {
async create(inputs: MirrorStateProviderInputs): Promise<dynamic.CreateResult> {
// eslint-disable-next-line @typescript-eslint/no-require-imports
const server: ServerModule = require('./server')
const server: ServerModule = require(serverPath)
const hash = await server.sendData(inputs)
return {
id: `${inputs.connection.user}: ${inputs.remotePath}`,
Expand All @@ -23,7 +32,7 @@ export class MirrorStateProvider implements dynamic.ResourceProvider {
news: MirrorStateProviderInputs,
): Promise<dynamic.UpdateResult> {
// eslint-disable-next-line @typescript-eslint/no-require-imports
const server: ServerModule = require('./server')
const server: ServerModule = require(serverPath)
const hash = await server.sendData(news)
return { outs: { ...news, filesHash: hash } }
}
Expand All @@ -34,9 +43,9 @@ export class MirrorStateProvider implements dynamic.ResourceProvider {
news: MirrorStateProviderInputs,
): Promise<dynamic.DiffResult> {
// eslint-disable-next-line @typescript-eslint/no-require-imports
const server: ServerModule = require('./server')
const server: ServerModule = require(serverPath)
// eslint-disable-next-line @typescript-eslint/no-require-imports
const common: CommonModule = require('./common')
const common: CommonModule = require(commonPath)
try {
const remoteState = await server.getData(news)
return {
Expand All @@ -55,7 +64,7 @@ export class MirrorStateProvider implements dynamic.ResourceProvider {

async delete(_id: string, props: MirrorStateProviderInputs): Promise<void> {
// eslint-disable-next-line @typescript-eslint/no-require-imports
const server: ServerModule = require('./server')
const server: ServerModule = require(serverPath)
await server.removeData(props)
}
}
Expand Down
Loading