Skip to content

Commit 50fbb7f

Browse files
committed
fix: revert to old build style
1 parent 3799485 commit 50fbb7f

20 files changed

Lines changed: 24 additions & 25 deletions

File tree

apps/juxtaposition-ui/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN --mount=type=bind,source=package.json,target=package.json \
2727
npm ci
2828

2929
COPY . .
30-
RUN npm run build
30+
# RUN npm run build
3131

3232

3333
# * Running the final application
@@ -43,7 +43,6 @@ USER node
4343
COPY package.json .
4444

4545
COPY --from=dependencies ${app_dir}/node_modules ${app_dir}/node_modules
46-
COPY --from=build ${app_dir}/tsconfig.json ${app_dir}/tsconfig.json
4746
COPY --from=build ${app_dir}/src ${app_dir}/src
4847

4948
CMD ["npm", "run", "start"]

apps/juxtaposition-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"lint": "eslint .",
1010
"lint:fix": "eslint . --fix",
1111
"build": "tsup && tsc --noEmit",
12-
"start": "tsx src/server.js"
12+
"start": "node src/server.js"
1313
},
1414
"dependencies": {
1515
"@aws-sdk/client-s3": "^3.729.0",
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { createConfigLoader } from '@neato/config';
2-
import { z } from 'zod';
1+
const { createConfigLoader } = require('@neato/config');
2+
const { z } = require('zod');
33

44
// schema is mapped later to nested object to keep env vars consistent with other projects
55
const schema = z.object({
@@ -28,7 +28,7 @@ const schema = z.object({
2828
redisPort: z.coerce.number().default(6379)
2929
});
3030

31-
export const fragments: Record<string, any> = {
31+
module.exports.fragments = {
3232
docker: {
3333
http: {
3434
cors: 'http://localhost:3000 http://localhost:5173',
@@ -57,11 +57,11 @@ const unmappedConfig = createConfigLoader()
5757
.addFromFile('.env', { prefix: 'PN_JUXTAPOSITION_UI_' })
5858
.addFromFile('config.json')
5959
.addZodSchema(schema)
60-
.addConfigFragments(fragments)
60+
.addConfigFragments(module.exports.fragments)
6161
.setFragmentKey('USE_PRESETS')
6262
.load();
6363

64-
export const config = {
64+
module.exports.config = {
6565
logFolder: unmappedConfig.logFolder,
6666
http: {
6767
port: unmappedConfig.httpPort

apps/juxtaposition-ui/src/database.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const { POST } = require('./models/post');
99
const { SETTINGS } = require('./models/settings');
1010
const { REPORT } = require('./models/report');
1111
const logger = require('./logger');
12-
const { config } = require('@/config');
12+
const { config } = require('./config');
1313

1414
let connection;
1515
mongoose.set('strictQuery', true);

apps/juxtaposition-ui/src/logger.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const fs = require('fs-extra');
2-
const { config } = require('@/config');
2+
const { config } = require('./config');
33
require('colors');
44

55
fs.ensureDirSync(config.logFolder);

apps/juxtaposition-ui/src/middleware/checkBan.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const moment = require('moment/moment');
22
const db = require('../database');
3-
const { config } = require('@/config');
3+
const { config } = require('../config');
44

55
async function checkBan(request, response, next) {
66
// Initialize access levels so the template engine can always access them

apps/juxtaposition-ui/src/middleware/consoleAuth.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const util = require('../util');
2-
const { config } = require('@/config');
2+
const { config } = require('../config');
33

44
async function auth(request, response, next) {
55
// Get pid and fetch user data

apps/juxtaposition-ui/src/middleware/discovery.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const db = require('../database');
2-
const { config } = require('@/config');
2+
const { config } = require('../config');
33

44
async function checkDiscovery(request, response, next) {
55
const discovery = await db.getEndPoint(config.server_environment);

apps/juxtaposition-ui/src/middleware/webAuth.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const util = require('../util');
2-
const { config } = require('@/config');
2+
const { config } = require('../config');
33

44
const cookieDomain = config.http.cookie_domain || '.pretendo.network';
55

apps/juxtaposition-ui/src/redisCache.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const redis = require('redis');
22
const logger = require('./logger');
3-
const { config } = require('@/config');
3+
const { config } = require('./config');
44
const { host, port } = config.redis;
55

66
const redisClient = redis.createClient({

0 commit comments

Comments
 (0)