@akala/pm 5.2.28 → 5.2.30

package/src/commands/$init.ts

@@ -7,7 +7,7 @@ import { Container, Metadata, ignoredCommands, configure, SelfDefinedCommand } f
 import { PassThrough } from 'stream';
 import { EventEmitter } from 'events';
 import { CliContext } from '@akala/cli';
-import Configuration from '@akala/config';
+import { Configuration } from '@akala/config';
 
 export async function metadata(container: Container<unknown>, deep?: boolean): Promise<Metadata.Container>
 {
@@ -48,6 +48,16 @@ export function isRunningContainer(c: Container<unknown>): c is RunningContainer
 {
     return 'running' in c;
 }
+declare var require: NodeRequire | undefined;
+
+function requireOrImportJson<T = any>(path: string): Promise<T>
+{
+    if (require)
+        return Promise.resolve(require(path));
+    else
+        //@ts-ignore
+        return import(path, { assert: { type: 'json' } }).then(i => i.default)
+}
 
 export default async function (this: State, container: RunningContainer & pmContainer.container, context: CliContext<{ config: string, keepAttached: boolean }>): Promise<void>
 {
@@ -95,7 +105,7 @@ export default async function (this: State, container: RunningContainer & pmCont
     }
     else
         this.config = Configuration.new<StateConfiguration>(configPath, {
-            containers: { pm: { commandable: true, stateless: false, path: await import(new URL('../../../commands.json', import.meta.url).toString(), { assert: { type: 'json' } }) } },
+            containers: { pm: { commandable: true, stateless: false, path: await requireOrImportJson('../../../commands.json') } },
             mapping: { pm: { cwd: process.cwd(), container: 'pm' } },
             plugins: []
         }) as State['config'];

package/src/commands/connect.ts

@@ -1,6 +1,6 @@
 import { ErrorWithStatus } from "@akala/core";
 import { serveMetadata, ServeMetadata, ServeOptions } from "@akala/commands";
-import Configuration from "@akala/config";
+import { Configuration } from "@akala/config";
 import State, { SidecarConfiguration } from '../state.js';
 
 export default async function connect(this: State, name: string): Promise<ServeMetadata>

package/src/commands/start.ts

@@ -9,9 +9,11 @@ import { ErrorWithStatus } from "@akala/core";
 import getRandomName from "./name.js";
 import { ProxyConfiguration } from "@akala/config";
 import { IpcAdapter } from "../ipc-adapter.js";
-import module from 'module'
+import path from 'path'
+import { fileURLToPath } from 'url'
 
-const require = module.createRequire(import.meta.url);
+//@ts-ignore
+const _dirname = typeof __dirname !== 'undefined' ? __dirname : path.dirname(fileURLToPath(import.meta.url))
 
 export default async function start(this: State, pm: pmContainer.container & Container<State>, name: string, context?: CliContext<{ new?: boolean, name: string, keepAttached?: boolean, inspect?: boolean, verbose?: boolean, wait?: boolean }>): Promise<void | { execPath: string, args: string[], cwd: string, stdio: StdioOptions, shell: boolean, windowsHide: boolean }>
 {
@@ -59,7 +61,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
     }
 
     if (!def?.type || def.type == 'nodejs')
-        args.unshift(require.resolve('../fork'))
+        args.unshift(path.resolve(_dirname, '../fork'))
 
     if (context.options && context.options.inspect)
         args.unshift('--inspect-brk');

package/src/container.ts

@@ -1,4 +1,5 @@
 //eslint-disable-next-line @typescript-eslint/no-unused-vars
+//@ts-ignore 6133
 import {Arguments, Argument0, Argument1, Argument2, Argument3, Argument4, Argument5, Argument6, Argument7, Argument8, Argument9, Argument10, Argument11, Argument12, Argument13, Argument14, Argument15, Argument16, Argument17 } from '@akala/core';
 // eslint-disable-next-line @typescript-eslint/no-namespace
 namespace commands

package/src/fork.ts

@@ -7,14 +7,10 @@ import { lstat } from 'fs/promises';
 import pmDef from './container.js';
 import { IpcAdapter } from "./ipc-adapter.js";
 import { logger, Logger, MiddlewareComposite, module as coreModule } from '@akala/core';
-import program, { buildCliContextFromProcess, ErrorMessage, NamespaceMiddleware } from '@akala/cli';
+import { program, buildCliContextFromProcess, ErrorMessage, NamespaceMiddleware } from '@akala/cli';
 import { Stats } from 'fs';
 import { registerCommands, SelfDefinedCommand, parseMetadata, StructuredParameters } from '@akala/commands';
 
-// import module from 'module'
-
-// const require = module.createRequire(import.meta.url.substring('file://'.length));
-
 var isPm = false;
 
 program.option('help')

package/src/standalone.ts

@@ -5,7 +5,7 @@ import * as path from 'path'
 import * as ac from '@akala/commands';
 import { lstat } from 'fs/promises';
 import { logger, Logger, MiddlewareComposite } from '@akala/core';
-import program, { buildCliContextFromProcess, ErrorMessage, NamespaceMiddleware } from '@akala/cli';
+import { program, buildCliContextFromProcess, ErrorMessage, NamespaceMiddleware } from '@akala/cli';
 import { Stats } from 'fs';
 
 program.option('help')

package/tsconfig.cjs.json

@@ -5,6 +5,7 @@
         "rootDir": "src",
         "outDir": "dist/cjs",
         "customConditions": [
+            "require",
             "node"
         ]
     },