diff --git a/docker-compose-speckle.yml b/docker-compose-speckle.yml index 45e126400..ac37ffbbd 100644 --- a/docker-compose-speckle.yml +++ b/docker-compose-speckle.yml @@ -73,6 +73,7 @@ services: USE_FRONTEND_2: true FRONTEND_ORIGIN: 'http://127.0.0.1' + ONBOARDING_STREAM_URL: 'https://latest.speckle.systems/projects/843d07eb10' preview-service: build: @@ -84,8 +85,11 @@ services: mem_limit: '3000m' memswap_limit: '3000m' environment: + HOST: '127.0.0.1' LOG_LEVEL: 'info' PG_CONNECTION_STRING: 'postgres://speckle:speckle@postgres/speckle' + ports: + - 127.0.0.1:3001:3001 webhook-service: build: diff --git a/packages/preview-service/bin/www b/packages/preview-service/bin/www index 76fe3f2a1..c075d2132 100755 --- a/packages/preview-service/bin/www +++ b/packages/preview-service/bin/www @@ -26,7 +26,8 @@ const server = http.createServer(app) * Listen on provided port, on all network interfaces. */ -server.listen(port, '127.0.0.1') +const host = process.env.HOST || '127.0.0.1' +server.listen(port, host) server.on('error', onError) server.on('listening', onListening) diff --git a/packages/preview-service/render_page/src/app.js b/packages/preview-service/render_page/src/app.js index d9761f298..92aa2f5ee 100644 --- a/packages/preview-service/render_page/src/app.js +++ b/packages/preview-service/render_page/src/app.js @@ -1,7 +1,8 @@ +import './bootstrap' import { LegacyViewer } from '@speckle/viewer' import { DefaultViewerParams } from '@speckle/viewer' // import { logger } from '../../observability/logging' - +console.log('Initialising Viewer') const v = new LegacyViewer(document.getElementById('renderer'), DefaultViewerParams) window.v = v diff --git a/packages/preview-service/render_page/src/bootstrap.js b/packages/preview-service/render_page/src/bootstrap.js new file mode 100644 index 000000000..ec777e760 --- /dev/null +++ b/packages/preview-service/render_page/src/bootstrap.js @@ -0,0 +1,3 @@ +/** This is because of @speckle/shared imporing these, but we plan on improving this */ +window.znv = {} +window.zod = {} diff --git a/packages/preview-service/webpack.config.render_page.js b/packages/preview-service/webpack.config.render_page.js index 62bf4e615..ce99828ff 100644 --- a/packages/preview-service/webpack.config.render_page.js +++ b/packages/preview-service/webpack.config.render_page.js @@ -43,6 +43,11 @@ const config = { } ] }, + externals: { + znv: 'znv', + zod: 'zod' + }, + plugins: [ new CleanWebpackPlugin({ cleanStaleWebpackAssets: false }), new HtmlWebpackPlugin({ @@ -57,10 +62,7 @@ const config = { path.resolve('./node_modules'), path.resolve('.render_page/src') ], - extensions: ['.json', '.js'], - fallback: { - tty: false - } + extensions: ['.json', '.js'] }, devServer: { contentBase: path.join(__dirname, 'example'), diff --git a/packages/shared/src/environment/index.ts b/packages/shared/src/environment/index.ts index 60d11584b..8b97da126 100644 --- a/packages/shared/src/environment/index.ts +++ b/packages/shared/src/environment/index.ts @@ -1,15 +1,14 @@ import { parseEnv } from 'znv' import { z } from 'zod' -//INFO -// As a convention all feature flags should be prefixed with a FF_ -const featureFlagSchema = z.object({ - FF_AUTOMATE_MODULE_ENABLED: z.boolean().default(false), - FF_GENDOAI_MODULE_ENABLED: z.boolean().default(false), - FF_TEST_AUTOMATIONS_ENABLED: z.boolean().default(false) -}) - function parseFeatureFlags() { + //INFO + // As a convention all feature flags should be prefixed with a FF_ + const featureFlagSchema = z.object({ + FF_AUTOMATE_MODULE_ENABLED: z.boolean().default(false), + FF_GENDOAI_MODULE_ENABLED: z.boolean().default(false), + FF_TEST_AUTOMATIONS_ENABLED: z.boolean().default(false) + }) return parseEnv(process.env, featureFlagSchema.shape) }