@balena/pinejs 19.7.2-build-esm-debc5e08e09b78ba96aec7ee219676236007e113-1 → 19.7.2-build-update-deps-a909ee054f395de407ec4e1275fd0f5b7514fe29-1

package/src/sbvr-api/abstract-sql.ts

@@ -7,12 +7,12 @@ import {
 	odataNameToSqlName,
 	isBindReference,
 } from '@balena/odata-to-abstract-sql';
-import deepFreeze from 'deep-freeze';
+import deepFreeze = require('deep-freeze');
 import memoize from 'memoizee';
-import * as env from '../config-loader/env.js';
-import { BadRequestError, SqlCompilationError } from './errors.js';
-import * as sbvrUtils from './sbvr-utils.js';
-import type { ODataRequest } from './uri-parser.js';
+import * as env from '../config-loader/env';
+import { BadRequestError, SqlCompilationError } from './errors';
+import * as sbvrUtils from './sbvr-utils';
+import type { ODataRequest } from './uri-parser';
 
 const getMemoizedCompileRule = memoize(
 	(engine: AbstractSQLCompiler.Engines) =>

package/src/sbvr-api/cached-compile.ts

@@ -12,7 +12,7 @@ let cache: null | {
 } = null;
 let fs: undefined | typeof Fs;
 try {
-	fs = await import('fs');
+	fs = require('fs');
 } catch {
 	// Ignore error
 }

package/src/sbvr-api/control-flow.ts

@@ -1,4 +1,4 @@
-import type { Resolvable } from './common-types.js';
+import type { Resolvable } from './common-types';
 
 import _ from 'lodash';
 import { TypedError } from 'typed-error';

package/src/sbvr-api/errors.ts

@@ -1,4 +1,4 @@
-import type { AnyObject, Tail } from './common-types.js';
+import type { AnyObject, Tail } from './common-types';
 
 import { TypedError } from 'typed-error';
 

package/src/sbvr-api/express-extension.ts

@@ -3,7 +3,7 @@
 declare global {
 	// eslint-disable-next-line @typescript-eslint/no-namespace
 	namespace Express {
-		type PineUser = import('./sbvr-utils.js').User;
+		type PineUser = import('./sbvr-utils').User;
 
 		// Augment Express.User to include the props of our PineUser.
 		// eslint-disable-next-line @typescript-eslint/no-empty-interface
@@ -11,7 +11,7 @@ declare global {
 
 		interface Request {
 			user?: User;
-			apiKey?: import('./sbvr-utils.js').ApiKey;
+			apiKey?: import('./sbvr-utils').ApiKey;
 		}
 	}
 }

package/src/sbvr-api/hooks.ts

@@ -1,12 +1,12 @@
-import type { OptionalField, Resolvable } from './common-types.js';
-import type { Result, Tx } from '../database-layer/db.js';
-import type { ODataRequest, ParsedODataRequest } from './uri-parser.js';
+import type { OptionalField, Resolvable } from './common-types';
+import type { Result, Tx } from '../database-layer/db';
+import type { ODataRequest, ParsedODataRequest } from './uri-parser';
 import type { AnyObject } from 'pinejs-client-core';
 import type { TypedError } from 'typed-error';
 import type { SupportedMethod } from '@balena/odata-to-abstract-sql';
 
 import _ from 'lodash';
-import { settleMapSeries } from './control-flow.js';
+import { settleMapSeries } from './control-flow';
 import memoize from 'memoizee';
 import {
 	type User,
@@ -15,7 +15,7 @@ import {
 	getAbstractSqlModel,
 	api,
 	type Response,
-} from './sbvr-utils.js';
+} from './sbvr-utils';
 
 export interface HookReq {
 	user?: User;

package/src/sbvr-api/odata-response.ts

@@ -18,17 +18,13 @@ declare module '@balena/abstract-sql-compiler' {
 	}
 }
 
-import type { Result, Row } from '../database-layer/db.js';
+import type { Result, Row } from '../database-layer/db';
 
 import { sqlNameToODataName } from '@balena/odata-to-abstract-sql';
-import type { SbvrType } from '@balena/sbvr-types';
+import sbvrTypes, { type SbvrType } from '@balena/sbvr-types';
 import _ from 'lodash';
-import {
-	sbvrTypes,
-	resolveNavigationResource,
-	resolveSynonym,
-} from './sbvr-utils.js';
-import { getWebresourceHandler } from '../webresource-handler/index.js';
+import { resolveNavigationResource, resolveSynonym } from './sbvr-utils';
+import { getWebresourceHandler } from '../webresource-handler';
 
 const checkForExpansion = async (
 	vocab: string,

package/src/sbvr-api/permissions.ts

@@ -1,4 +1,4 @@
-import type AuthModel from './user.js';
+import type AuthModel from './user';
 import type {
 	AbstractSqlModel,
 	AbstractSqlQuery,
@@ -14,16 +14,16 @@ import type {
 	SelectNode,
 	SelectQueryNode,
 } from '@balena/abstract-sql-compiler';
-import './express-extension.js';
+import './express-extension';
 import type * as Express from 'express';
 import type {
 	ODataBinds,
 	ODataQuery,
 	SupportedMethod,
 } from '@balena/odata-parser';
-import type { Tx } from '../database-layer/db.js';
-import type { ApiKey, User } from '../sbvr-api/sbvr-utils.js';
-import type { AnyObject, Dictionary } from './common-types.js';
+import type { Tx } from '../database-layer/db';
+import type { ApiKey, User } from '../sbvr-api/sbvr-utils';
+import type { AnyObject, Dictionary } from './common-types';
 
 import {
 	isBindReference,
@@ -36,28 +36,28 @@ import * as ODataParser from '@balena/odata-parser';
 
 import _ from 'lodash';
 import memoize from 'memoizee';
-import randomstring from 'randomstring';
-import * as env from '../config-loader/env.js';
-import * as sbvrUtils from '../sbvr-api/sbvr-utils.js';
-import { type HookReq, addPureHook, addHook } from './hooks.js';
+import * as randomstring from 'randomstring';
+import * as env from '../config-loader/env';
+import * as sbvrUtils from '../sbvr-api/sbvr-utils';
+import { type HookReq, addPureHook, addHook } from './hooks';
 import {
 	BadRequestError,
 	PermissionError,
 	PermissionParsingError,
-} from './errors.js';
+} from './errors';
 import {
 	memoizedGetOData2AbstractSQL,
 	memoizedParseOdata,
 	metadataEndpoints,
 	type ODataRequest,
-} from './uri-parser.js';
-import memoizeWeak from 'memoizee/weak.js';
-import type { Config } from '../config-loader/config-loader.js';
+} from './uri-parser';
+import memoizeWeak from 'memoizee/weak';
+import type { Config } from '../config-loader/config-loader';
 import type { ODataOptions } from 'pinejs-client-core';
-import type { Permission } from './user.js';
-import { importSBVR } from '../server-glue/sbvr-loader.js';
+import type { Permission } from './user';
+import { requireSBVR } from '../server-glue/sbvr-loader';
 
-const userModel = await importSBVR('./user.sbvr', import.meta);
+const userModel = requireSBVR('./user.sbvr', require);
 
 const DEFAULT_ACTOR_BIND = '@__ACTOR_ID';
 const DEFAULT_ACTOR_BIND_REGEX = new RegExp(
@@ -1779,7 +1779,7 @@ export const addPermissions = async (
 	}
 };
 
-declare module './sbvr-utils.js' {
+declare module './sbvr-utils' {
 	export interface API {
 		[authModelConfig.apiRoot]: PinejsClient<AuthModel>;
 	}

package/src/sbvr-api/sbvr-utils.ts

@@ -1,7 +1,7 @@
 import type * as Express from 'express';
-import type * as Db from '../database-layer/db.js';
-import type { Model } from '../config-loader/config-loader.js';
-import type { AnyObject, RequiredField } from './common-types.js';
+import type * as Db from '../database-layer/db';
+import type { Model } from '../config-loader/config-loader';
+import type { AnyObject, RequiredField } from './common-types';
 import type {
 	PickDeferred,
 	Resource,
@@ -21,14 +21,12 @@ declare global {
 import _ from 'lodash';
 
 import type { TypedError } from 'typed-error';
-import { cachedCompile } from './cached-compile.js';
+import { cachedCompile } from './cached-compile';
 
 type LFModel = any[];
 import * as AbstractSQLCompiler from '@balena/abstract-sql-compiler';
-import AbstractSqlCompilerPackage from '@balena/abstract-sql-compiler/package.json' with { type: 'json' };
-const { version: AbstractSQLCompilerVersion } = AbstractSqlCompilerPackage;
-
-import LF2AbstractSQL from '@balena/lf-to-abstract-sql';
+import { version as AbstractSQLCompilerVersion } from '@balena/abstract-sql-compiler/package.json';
+import * as LF2AbstractSQL from '@balena/lf-to-abstract-sql';
 
 import {
 	type ODataBinds,
@@ -36,22 +34,21 @@ import {
 	sqlNameToODataName,
 	type SupportedMethod,
 } from '@balena/odata-to-abstract-sql';
-import $sbvrTypes from '@balena/sbvr-types';
-const { default: sbvrTypes } = $sbvrTypes;
-import deepFreeze from 'deep-freeze';
+import sbvrTypes from '@balena/sbvr-types';
+import deepFreeze = require('deep-freeze');
 import type { ODataOptions, Params } from 'pinejs-client-core';
 import { PinejsClientCore, type PromiseResultTypes } from 'pinejs-client-core';
 
-import { ExtendedSBVRParser } from '../extended-sbvr-parser/extended-sbvr-parser.js';
+import { ExtendedSBVRParser } from '../extended-sbvr-parser/extended-sbvr-parser';
 
-import * as asyncMigrator from '../migrator/async.js';
-import * as syncMigrator from '../migrator/sync.js';
-import { generateODataMetadata } from '../odata-metadata/odata-metadata-generator.js';
-import { importSBVR } from '../server-glue/sbvr-loader.js';
+import * as asyncMigrator from '../migrator/async';
+import * as syncMigrator from '../migrator/sync';
+import { generateODataMetadata } from '../odata-metadata/odata-metadata-generator';
+import { requireSBVR } from '../server-glue/sbvr-loader';
 
-import type DevModel from './dev.js';
-const devModel = await importSBVR('./dev.sbvr', import.meta);
-import * as permissions from './permissions.js';
+import type DevModel from './dev';
+const devModel = requireSBVR('./dev.sbvr', require);
+import * as permissions from './permissions';
 import {
 	BadRequestError,
 	ConflictError,
@@ -66,9 +63,9 @@ import {
 	statusCodeToError,
 	TranslationError,
 	UnauthorizedError,
-} from './errors.js';
-import * as uriParser from './uri-parser.js';
-export type { ODataRequest } from './uri-parser.js';
+} from './errors';
+import * as uriParser from './uri-parser';
+export type { ODataRequest } from './uri-parser';
 import {
 	type HookReq,
 	type HookArgs,
@@ -76,7 +73,7 @@ import {
 	getHooks,
 	runHooks,
 	type InstantiatedHooks,
-} from './hooks.js';
+} from './hooks';
 export {
 	type HookReq,
 	type HookArgs,
@@ -84,33 +81,30 @@ export {
 	type Hooks,
 	addPureHook,
 	addSideEffectHook,
-} from './hooks.js';
+} from './hooks';
 
-import memoizeWeak from 'memoizee/weak.js';
-import * as controlFlow from './control-flow.js';
+import memoizeWeak from 'memoizee/weak';
+import * as controlFlow from './control-flow';
 
 export let db = undefined as any as Db.Database;
 
 export { sbvrTypes };
 
-import LF2AbstractSQLPackage from '@balena/lf-to-abstract-sql/package.json' with { type: 'json' };
-const { version: LF2AbstractSQLVersion } = LF2AbstractSQLPackage;
-import SbvrTypesPackage from '@balena/sbvr-types/package.json' with { type: 'json' };
-const { version: sbvrTypesVersion } = SbvrTypesPackage;
-
+import { version as LF2AbstractSQLVersion } from '@balena/lf-to-abstract-sql/package.json';
+import { version as sbvrTypesVersion } from '@balena/sbvr-types/package.json';
 import {
 	compileRequest,
 	getAndCheckBindValues,
 	isRuleAffected,
-} from './abstract-sql.js';
-export { resolveOdataBind } from './abstract-sql.js';
-import * as odataResponse from './odata-response.js';
-import { env } from '../server-glue/module.js';
-import { translateAbstractSqlModel } from './translations.js';
+} from './abstract-sql';
+export { resolveOdataBind } from './abstract-sql';
+import * as odataResponse from './odata-response';
+import { env } from '../server-glue/module';
+import { translateAbstractSqlModel } from './translations';
 import {
 	type MigrationExecutionResult,
 	setExecutedMigrations,
-} from '../migrator/utils.js';
+} from '../migrator/utils';
 
 const LF2AbstractSQLTranslator = LF2AbstractSQL.createTranslator(sbvrTypes);
 const LF2AbstractSQLTranslatorVersion = `${LF2AbstractSQLVersion}+${sbvrTypesVersion}`;

package/src/sbvr-api/translations.ts

@@ -14,7 +14,7 @@ import type {
 	UnknownTypeNodes,
 	NullNode,
 } from '@balena/abstract-sql-compiler';
-import type { Dictionary } from './common-types.js';
+import type { Dictionary } from './common-types';
 
 export type AliasValidNodeType =
 	| ReferencedFieldNode

package/src/sbvr-api/uri-parser.ts

@@ -5,26 +5,26 @@ import type {
 	ODataQuery,
 	SupportedMethod,
 } from '@balena/odata-parser';
-import type { Tx } from '../database-layer/db.js';
-import type { InstantiatedHooks } from './hooks.js';
-import type { AnyObject } from './common-types.js';
+import type { Tx } from '../database-layer/db';
+import type { InstantiatedHooks } from './hooks';
+import type { AnyObject } from './common-types';
 
-import ODataParser from '@balena/odata-parser';
+import * as ODataParser from '@balena/odata-parser';
 export const SyntaxError = ODataParser.SyntaxError;
 import { OData2AbstractSQL } from '@balena/odata-to-abstract-sql';
 import _ from 'lodash';
-import memoizeWeak from 'memoizee/weak.js';
+import memoizeWeak from 'memoizee/weak';
 
-export { BadRequestError, ParsingError, TranslationError } from './errors.js';
+export { BadRequestError, ParsingError, TranslationError } from './errors';
 import deepFreeze from 'deep-freeze';
-import * as env from '../config-loader/env.js';
+import * as env from '../config-loader/env';
 import {
 	BadRequestError,
 	ParsingError,
 	PermissionError,
 	TranslationError,
-} from './errors.js';
-import * as sbvrUtils from './sbvr-utils.js';
+} from './errors';
+import * as sbvrUtils from './sbvr-utils';
 
 export type OdataBinds = ODataBinds;
 

package/src/server-glue/global-ext.d.ts

@@ -5,4 +5,7 @@ declare namespace NodeJS {
 	export interface Process {
 		browser: boolean;
 	}
+	export interface Global {
+		nodeRequire: NodeRequire;
+	}
 }

package/src/server-glue/module.ts

@@ -1,27 +1,27 @@
 import type * as Express from 'express';
 
-import './sbvr-loader.js';
+import './sbvr-loader';
 
-import * as dbModule from '../database-layer/db.js';
-import * as configLoader from '../config-loader/config-loader.js';
-import * as migrator from '../migrator/sync.js';
-import type * as migratorUtils from '../migrator/utils.js';
-import * as tasks from '../tasks/index.js';
+import * as dbModule from '../database-layer/db';
+import * as configLoader from '../config-loader/config-loader';
+import * as migrator from '../migrator/sync';
+import type * as migratorUtils from '../migrator/utils';
+import * as tasks from '../tasks';
 
-import * as sbvrUtils from '../sbvr-api/sbvr-utils.js';
-import { PINEJS_ADVISORY_LOCK } from '../config-loader/env.js';
+import * as sbvrUtils from '../sbvr-api/sbvr-utils';
+import { PINEJS_ADVISORY_LOCK } from '../config-loader/env';
 
-export * as dbModule from '../database-layer/db.js';
-export { PinejsSessionStore } from '../pinejs-session-store/pinejs-session-store.js';
-export { mountLoginRouter } from '../passport-pinejs/mount-login-router.js';
-export * as sbvrUtils from '../sbvr-api/sbvr-utils.js';
-export * as permissions from '../sbvr-api/permissions.js';
-export * as errors from '../sbvr-api/errors.js';
-export * as env from '../config-loader/env.js';
-export * as types from '../sbvr-api/common-types.js';
-export * as hooks from '../sbvr-api/hooks.js';
-export * as tasks from '../tasks/index.js';
-export * as webResourceHandler from '../webresource-handler/index.js';
+export * as dbModule from '../database-layer/db';
+export { PinejsSessionStore } from '../pinejs-session-store/pinejs-session-store';
+export { mountLoginRouter } from '../passport-pinejs/mount-login-router';
+export * as sbvrUtils from '../sbvr-api/sbvr-utils';
+export * as permissions from '../sbvr-api/permissions';
+export * as errors from '../sbvr-api/errors';
+export * as env from '../config-loader/env';
+export * as types from '../sbvr-api/common-types';
+export * as hooks from '../sbvr-api/hooks';
+export * as tasks from '../tasks';
+export * as webResourceHandler from '../webresource-handler';
 export type { configLoader as ConfigLoader };
 export type { migratorUtils as Migrator };
 

package/src/server-glue/sbvr-loader.ts

@@ -1,23 +1,35 @@
-/**
- *
- * @param filePath The module to load
- * @param parentUrl Use import.meta.url
- * @returns
- */
-export async function loadSBVR(filePath: string, meta: ImportMeta) {
-	return await (
-		await import('fs')
-	).promises.readFile(new URL(meta.resolve(filePath)), 'utf8');
+import type * as Fs from 'fs';
+
+if (!process.browser) {
+	if (typeof nodeRequire === 'undefined' || nodeRequire == null) {
+		// `nodeRequire` is a special variable we use to bypass webpack's resolving of `require`
+		// statements on build for the cases where we need to always use the nodejs require, eg
+		// in the config-loader which dynamically loads code at runtime, and for adding custom
+		// filetype handlers - it works by being replaced with `require` after the webpack build
+		// finishes.
+		// In the case of `nodeRequire` being undefined it means we're being run in a nodejs
+		// environment directly, without a webpack build, and have to manually create it as an
+		// alias for the nodejs require so that things continue to work.
+
+		// Alias require as nodeRequire for the config-loader hack.
+		global.nodeRequire = require;
+	}
+	// Register a .sbvr loader
+	// eslint-disable-next-line @typescript-eslint/no-var-requires
+	const fs: typeof Fs = require('fs');
+	nodeRequire.extensions['.sbvr'] = (module: NodeModule, filename: string) =>
+		(module.exports = fs.readFileSync(filename, 'utf8'));
 }
 
 /**
  *
  * @param filePath The module to load
- * @param parentUrl Use `import.meta.url`
+ * @param parentUrl Use `require`
  * @returns The sbvr file contents
  */
-export async function importSBVR(filePath: string, meta: ImportMeta) {
-	return await (
-		await import('fs')
-	).promises.readFile(new URL(meta.resolve(filePath)), 'utf8');
+export function requireSBVR(filePath: string, require: NodeRequire) {
+	return (require('fs') as typeof import('fs')).readFileSync(
+		require.resolve(filePath),
+		'utf8',
+	);
 }

package/src/server-glue/server.ts

@@ -1,9 +1,18 @@
-import * as Pinejs from './module.js';
-export { sbvrUtils, PinejsSessionStore } from './module.js';
+import type BodyParser from 'body-parser';
+import type Compression from 'compression';
+import type CookieParser from 'cookie-parser';
+import type ExpressSession from 'express-session';
+import type MethodOverride from 'method-override';
+import type * as Passport from 'passport';
+import type * as Path from 'path';
+import type ServeStatic from 'serve-static';
 
-export { ExtendedSBVRParser } from '../extended-sbvr-parser/extended-sbvr-parser.js';
+import * as Pinejs from './module';
+export { sbvrUtils, PinejsSessionStore } from './module';
 
-import { mountLoginRouter } from '../passport-pinejs/mount-login-router.js';
+export { ExtendedSBVRParser } from '../extended-sbvr-parser/extended-sbvr-parser';
+
+import { mountLoginRouter } from '../passport-pinejs/mount-login-router';
 
 import express from 'express';
 
@@ -18,18 +27,20 @@ switch (app.get('env')) {
 }
 
 if (!process.browser) {
-	const { default: passport } = await import('passport');
-	const { default: path } = await import('path');
-	const { default: compression } = await import('compression');
-	const { default: serveStatic } = await import('serve-static');
-	const { default: cookieParser } = await import('cookie-parser');
-	const { default: bodyParser } = await import('body-parser');
-	const { default: methodOverride } = await import('method-override');
-	const { default: expressSession } = await import('express-session');
+	/* eslint-disable @typescript-eslint/no-var-requires */
+	const passport: typeof Passport = require('passport');
+	const path: typeof Path = require('path');
+	const compression: typeof Compression = require('compression');
+	const serveStatic: typeof ServeStatic = require('serve-static');
+	const cookieParser: typeof CookieParser = require('cookie-parser');
+	const bodyParser: typeof BodyParser = require('body-parser');
+	const methodOverride: typeof MethodOverride = require('method-override');
+	const expressSession: typeof ExpressSession = require('express-session');
+	/* eslint-enable @typescript-eslint/no-var-requires */
 
 	app.use(compression());
 
-	const root = process.argv[2] || import.meta.dirname;
+	const root = process.argv[2] || __dirname;
 	app.use('/', serveStatic(path.join(root, 'static')));
 
 	app.use(cookieParser());

package/src/tasks/common.ts

@@ -3,4 +3,4 @@ import Ajv from 'ajv';
 // Root path for the tasks API
 export const apiRoot = 'tasks';
 
-export const ajv = new Ajv.default();
+export const ajv = new Ajv();

package/src/tasks/index.ts

@@ -1,20 +1,20 @@
 import type { Schema } from 'ajv';
-import cronParser from 'cron-parser';
-import { tasks as tasksEnv } from '../config-loader/env.js';
-import { addPureHook } from '../sbvr-api/hooks.js';
-import * as sbvrUtils from '../sbvr-api/sbvr-utils.js';
-import type { ConfigLoader } from '../server-glue/module.js';
-import { ajv, apiRoot } from './common.js';
-import type { TaskHandler } from './worker.js';
-import { Worker } from './worker.js';
-import type TasksModel from './tasks.js';
-import type { Task } from './tasks.js';
+import * as cronParser from 'cron-parser';
+import { tasks as tasksEnv } from '../config-loader/env';
+import { addPureHook } from '../sbvr-api/hooks';
+import * as sbvrUtils from '../sbvr-api/sbvr-utils';
+import type { ConfigLoader } from '../server-glue/module';
+import { ajv, apiRoot } from './common';
+import type { TaskHandler } from './worker';
+import { Worker } from './worker';
+import type TasksModel from './tasks';
+import type { Task } from './tasks';
 import type { FromSchema } from 'json-schema-to-ts';
-import { importSBVR } from '../server-glue/sbvr-loader.js';
+import { requireSBVR } from '../server-glue/sbvr-loader';
 
-export type * from './tasks.js';
+export type * from './tasks';
 
-const modelText = await importSBVR('./tasks.sbvr', import.meta);
+const modelText = requireSBVR('./tasks.sbvr', require);
 
 // Create index for polling tasks table
 const initSql = `
@@ -25,7 +25,7 @@ CREATE INDEX IF NOT EXISTS idx_task_poll ON task USING btree (
 ) WHERE status = 'queued';
 `;
 
-declare module '../sbvr-api/sbvr-utils.js' {
+declare module '../sbvr-api/sbvr-utils' {
 	export interface API {
 		[apiRoot]: PinejsClient<TasksModel>;
 	}

package/src/tasks/worker.ts

@@ -1,14 +1,14 @@
 import type { ValidateFunction } from 'ajv';
 import { setTimeout } from 'node:timers/promises';
 import type { AnyObject } from 'pinejs-client-core';
-import { tasks as tasksEnv } from '../config-loader/env.js';
-import type * as Db from '../database-layer/db.js';
-import * as permissions from '../sbvr-api/permissions.js';
-import { PinejsClient } from '../sbvr-api/sbvr-utils.js';
-import { sbvrUtils } from '../server-glue/module.js';
-import { ajv } from './common.js';
-import type { Task } from './tasks.js';
-import type TasksModel from './tasks.js';
+import { tasks as tasksEnv } from '../config-loader/env';
+import type * as Db from '../database-layer/db';
+import * as permissions from '../sbvr-api/permissions';
+import { PinejsClient } from '../sbvr-api/sbvr-utils';
+import { sbvrUtils } from '../server-glue/module';
+import { ajv } from './common';
+import type { Task } from './tasks';
+import type TasksModel from './tasks';
 
 interface TaskArgs<T = AnyObject> {
 	api: PinejsClient;

package/src/webresource-handler/handlers/NoopHandler.ts

@@ -1,9 +1,5 @@
 import type { WebResourceType as WebResource } from '@balena/sbvr-types';
-import type {
-	IncomingFile,
-	UploadResponse,
-	WebResourceHandler,
-} from '../index.js';
+import type { IncomingFile, UploadResponse, WebResourceHandler } from '..';
 
 export class NoopHandler implements WebResourceHandler {
 	public async handleFile(resource: IncomingFile): Promise<UploadResponse> {

package/src/webresource-handler/handlers/S3Handler.ts

@@ -5,7 +5,7 @@ import {
 	type UploadResponse,
 	WebResourceError,
 	type WebResourceHandler,
-} from '../index.js';
+} from '..';
 import {
 	S3Client,
 	type S3ClientConfig,

package/src/webresource-handler/handlers/index.ts

@@ -1,2 +1,2 @@
-export * from './NoopHandler.js';
-export * from './S3Handler.js';
+export * from './NoopHandler';
+export * from './S3Handler';