From 65f58d5a8ade668b3bfbc21bc27a401f28ec2479 Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Wed, 18 Oct 2023 23:05:57 -0700 Subject: [PATCH] fix: pb_hooks module not building when @pockethost/common was included --- packages/daemon/pb_hooks/lib.js | 14 +++++++++----- packages/daemon/src/util/assert.ts | 2 +- packages/daemon/tsup.config.js | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/daemon/pb_hooks/lib.js b/packages/daemon/pb_hooks/lib.js index b4e50491..8f5522f9 100644 --- a/packages/daemon/pb_hooks/lib.js +++ b/packages/daemon/pb_hooks/lib.js @@ -65,7 +65,7 @@ __export(lib_exports, { return _getRecord }, _unsafe_assert: function () { - return import_common.assert + return assert }, endOfMonth: function () { return endOfMonth @@ -96,8 +96,12 @@ __export(lib_exports, { }, }) module.exports = __toCommonJS(lib_exports) -// src/util/assert.ts -var import_common = require('@pockethost/common') +// ../common/src/assert.ts +function assert(v, msg) { + if (!v) { + throw new Error(msg || 'Assertion failure') + } +} // ../../node_modules/@s-libs/micro-dash/fesm2022/micro-dash.mjs function keysOfNonArray(object) { return object ? Object.getOwnPropertyNames(object) : [] @@ -135,7 +139,7 @@ function startOfMonth(now) { } var dao = function () { var _dao = $app.dao() - ;(0, import_common.assert)(_dao) + assert(_dao) return _dao } var queryOne = function (sql, bindings, defaultResult) { @@ -172,7 +176,7 @@ function _getRecordByIdOrRecord(recordOrInstanceId, name) { return _getRecord(name, recordOrInstanceId) return recordOrInstanceId })() - ;(0, import_common.assert)(record) + assert(record) return record } function updateInstance(recordOrInstanceId, fields) { diff --git a/packages/daemon/src/util/assert.ts b/packages/daemon/src/util/assert.ts index b4d3a08c..7f52b671 100644 --- a/packages/daemon/src/util/assert.ts +++ b/packages/daemon/src/util/assert.ts @@ -1,2 +1,2 @@ -import { assert } from '@pockethost/common' +import { assert } from '@pockethost/common/src/assert' export { assert } diff --git a/packages/daemon/tsup.config.js b/packages/daemon/tsup.config.js index b5ed13c4..b522a709 100644 --- a/packages/daemon/tsup.config.js +++ b/packages/daemon/tsup.config.js @@ -1,5 +1,5 @@ import { defineConfig } from 'tsup' export default defineConfig({ - noExternal: ['@s-libs/micro-dash'], + noExternal: ['@s-libs/micro-dash', '@pockethost/common'], })