diff --git a/.gitignore b/.gitignore index 268293051..7cf896f11 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,5 @@ kubeconfig minio-data/ postgres-data/ redis-data/ + +.tshy-build \ No newline at end of file diff --git a/.prettierignore b/.prettierignore index 8446705fe..511e294a8 100644 --- a/.prettierignore +++ b/.prettierignore @@ -36,3 +36,5 @@ venv **/generated/graphql.ts storybook-static +.tshy +.tshy-build \ No newline at end of file diff --git a/packages/dui3/lib/core/configs/apollo.ts b/packages/dui3/lib/core/configs/apollo.ts index bec60494b..4c5f2ba6c 100644 --- a/packages/dui3/lib/core/configs/apollo.ts +++ b/packages/dui3/lib/core/configs/apollo.ts @@ -20,7 +20,7 @@ import { incomingOverwritesExistingMergeFunction } from '~~/lib/core/helpers/apolloSetup' import { onError } from '@apollo/client/link/error' -import { Observability } from '@speckle/shared' +import * as Observability from '@speckle/shared/dist/esm/observability/index.js' let subscriptionsStopped = false const errorRpm = Observability.simpleRpmCounter() diff --git a/packages/fileimport-service/ifc/api.js b/packages/fileimport-service/ifc/api.js index 787d612af..ea62993ca 100644 --- a/packages/fileimport-service/ifc/api.js +++ b/packages/fileimport-service/ifc/api.js @@ -6,7 +6,7 @@ const { chunk } = require('lodash') const { logger: parentLogger } = require('../observability/logging') const knex = require('../knex') -const { Observability } = require('@speckle/shared') +const Observability = require('@speckle/shared/dist/commonjs/observability/index.js') const Streams = () => knex('streams') const Branches = () => knex('branches') const Objects = () => knex('objects') diff --git a/packages/fileimport-service/ifc/import_file.js b/packages/fileimport-service/ifc/import_file.js index 08d11381f..ae0f0bbb0 100644 --- a/packages/fileimport-service/ifc/import_file.js +++ b/packages/fileimport-service/ifc/import_file.js @@ -4,7 +4,7 @@ const { logger: parentLogger } = require('../observability/logging') const TMP_RESULTS_PATH = '/tmp/import_result.json' const { parseAndCreateCommit } = require('./index') -const { Observability } = require('@speckle/shared') +const Observability = require('@speckle/shared/dist/commonjs/observability/index.js') async function main() { const cmdArgs = process.argv.slice(2) diff --git a/packages/fileimport-service/ifc/index.js b/packages/fileimport-service/ifc/index.js index e3c1b9ba7..81ec4c1a5 100644 --- a/packages/fileimport-service/ifc/index.js +++ b/packages/fileimport-service/ifc/index.js @@ -2,7 +2,7 @@ const { performance } = require('perf_hooks') const { fetch } = require('undici') const Parser = require('./parser_v2') const ServerAPI = require('./api.js') -const { Observability } = require('@speckle/shared') +const Observability = require('@speckle/shared/dist/commonjs/observability/index.js') const { logger: parentLogger } = require('../observability/logging') async function parseAndCreateCommit({ diff --git a/packages/fileimport-service/ifc/parser_v2.js b/packages/fileimport-service/ifc/parser_v2.js index 2d524a182..251df7a11 100644 --- a/packages/fileimport-service/ifc/parser_v2.js +++ b/packages/fileimport-service/ifc/parser_v2.js @@ -7,7 +7,7 @@ const { GeometryTypes, IfcTypesMap } = require('./utils') -const { Observability } = require('@speckle/shared') +const Observability = require('@speckle/shared/dist/commonjs/observability/index.js') const { logger: parentLogger } = require('../observability/logging') module.exports = class IFCParser { diff --git a/packages/fileimport-service/observability/logging.js b/packages/fileimport-service/observability/logging.js index 8af131883..31f688f13 100644 --- a/packages/fileimport-service/observability/logging.js +++ b/packages/fileimport-service/observability/logging.js @@ -1,4 +1,4 @@ -const { Observability } = require('@speckle/shared') +const Observability = require('@speckle/shared/dist/commonjs/observability/index.js') // loggers for specific components within normal operation const logger = Observability.extendLoggerComponent( diff --git a/packages/frontend-2/components/project/page/discussions/Tab.vue b/packages/frontend-2/components/project/page/discussions/Tab.vue index 07a7850f1..2f15fa444 100644 --- a/packages/frontend-2/components/project/page/discussions/Tab.vue +++ b/packages/frontend-2/components/project/page/discussions/Tab.vue @@ -16,7 +16,7 @@