Skip to content

Commit

Permalink
[MIRROR] Fixes tgui dev server [NO GBP] [MDB IGNORE] (#806)
Browse files Browse the repository at this point in the history
* Fixes tgui dev server [NO GBP] (#79898)

---------

Co-authored-by: SkyratBot <[email protected]>
Co-authored-by: Jeremiah <[email protected]>
  • Loading branch information
3 people authored Nov 24, 2023
1 parent b38fa13 commit 70f7cbe
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 20 deletions.
4 changes: 2 additions & 2 deletions tgui/packages/tgui-dev-server/dreamseeker.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import { exec } from 'child_process';
import { promisify } from 'util';
import { createLogger } from './logging';
import { require } from './require';
import { createLogger } from './logging.js';
import { require } from './require.js';

const axios = require('axios');
const logger = createLogger('dreamseeker');
Expand Down
4 changes: 2 additions & 2 deletions tgui/packages/tgui-dev-server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* @license MIT
*/

import { createCompiler } from './webpack';
import { reloadByondCache } from './reloader';
import { createCompiler } from './webpack.js';
import { reloadByondCache } from './reloader.js';

const noHot = process.argv.includes('--no-hot');
const noTmp = process.argv.includes('--no-tmp');
Expand Down
6 changes: 3 additions & 3 deletions tgui/packages/tgui-dev-server/link/retrace.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

import fs from 'fs';
import { basename } from 'path';
import { createLogger } from '../logging';
import { require } from '../require';
import { resolveGlob } from '../util';
import { createLogger } from '../logging.js';
import { require } from '../require.js';
import { resolveGlob } from '../util.js';

const SourceMap = require('source-map');
const { parse: parseStackTrace } = require('stacktrace-parser');
Expand Down
6 changes: 3 additions & 3 deletions tgui/packages/tgui-dev-server/link/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

import http from 'http';
import { inspect } from 'util';
import { createLogger, directLog } from '../logging';
import { require } from '../require';
import { loadSourceMaps, retrace } from './retrace';
import { createLogger, directLog } from '../logging.js';
import { require } from '../require.js';
import { loadSourceMaps, retrace } from './retrace.js';

const WebSocket = require('ws');

Expand Down
8 changes: 4 additions & 4 deletions tgui/packages/tgui-dev-server/reloader.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
import fs from 'fs';
import os from 'os';
import { basename } from 'path';
import { DreamSeeker } from './dreamseeker';
import { createLogger } from './logging';
import { resolveGlob, resolvePath } from './util';
import { regQuery } from './winreg';
import { DreamSeeker } from './dreamseeker.js';
import { createLogger } from './logging.js';
import { resolveGlob, resolvePath } from './util.js';
import { regQuery } from './winreg.js';

const logger = createLogger('reloader');

Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui-dev-server/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import fs from 'fs';
import path from 'path';
import { require } from './require';
import { require } from './require.js';

const globPkg = require('glob');

Expand Down
8 changes: 4 additions & 4 deletions tgui/packages/tgui-dev-server/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
import fs from 'fs';
import { createRequire } from 'module';
import { dirname } from 'path';
import { loadSourceMaps, setupLink } from './link/server';
import { createLogger } from './logging';
import { reloadByondCache } from './reloader';
import { resolveGlob } from './util';
import { loadSourceMaps, setupLink } from './link/server.js';
import { createLogger } from './logging.js';
import { reloadByondCache } from './reloader.js';
import { resolveGlob } from './util.js';

const logger = createLogger('webpack');

Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui-dev-server/winreg.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import { exec } from 'child_process';
import { promisify } from 'util';
import { createLogger } from './logging';
import { createLogger } from './logging.js';

const logger = createLogger('winreg');

Expand Down
1 change: 1 addition & 0 deletions tgui/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ module.exports = (env = {}, argv) => {
filename: '[name].bundle.js',
chunkFilename: '[name].bundle.js',
chunkLoadTimeout: 15000,
publicPath: '/',
},
resolve: {
extensions: ['.tsx', '.ts', '.js', '.jsx'],
Expand Down

0 comments on commit 70f7cbe

Please sign in to comment.