Skip to content

Commit 0adbd1d

Browse files
committed
chore: pr fixes Refs: RATY-357
1 parent a9d6aa9 commit 0adbd1d

6 files changed

Lines changed: 19 additions & 20 deletions

File tree

eslint.config.mjs

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,16 @@ import simpleImportSort from 'eslint-plugin-simple-import-sort';
1010
export default [
1111
{ ignores: ['build/', 'dist/', 'node_modules/', 'coverage/'] },
1212

13-
// src JS/JSX
13+
// Shared plugins/rules for src + server
1414
{
15-
files: ['src/**/*.{js,jsx}'],
15+
files: ['src/**/*.{js,jsx}', 'server/**/*.js'],
1616
languageOptions: {
1717
parser: tsParser,
1818
ecmaVersion: 'latest',
1919
sourceType: 'module',
2020
parserOptions: {
2121
ecmaFeatures: { jsx: true },
2222
},
23-
globals: {
24-
...globals.browser,
25-
globalThis: 'readonly',
26-
},
2723
},
2824
settings: {
2925
react: { version: '19.0.0' },
@@ -60,25 +56,27 @@ export default [
6056
},
6157
},
6258

59+
// src — browser globals
60+
{
61+
files: ['src/**/*.{js,jsx}'],
62+
languageOptions: {
63+
globals: {
64+
...globals.browser,
65+
globalThis: 'readonly',
66+
},
67+
},
68+
},
69+
6370
// server — Node.js globals + build-time injected constants
6471
{
6572
files: ['server/**/*.js'],
6673
languageOptions: {
67-
parser: tsParser,
68-
ecmaVersion: 'latest',
69-
sourceType: 'module',
70-
parserOptions: {
71-
ecmaFeatures: { jsx: true },
72-
},
7374
globals: {
7475
...globals.node,
7576
GIT_TAG: 'readonly',
7677
GIT_COMMIT: 'readonly',
7778
},
7879
},
79-
settings: {
80-
react: { version: '19.0.0' },
81-
},
8280
},
8381

8482
// test files — vitest globals

server/ieMiddleware.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ function IETemplate() {
155155
class WrappedTemplate extends React.Component {
156156
// Remove the server-side injected CSS.
157157
componentDidMount() {
158+
// eslint-disable-next-line no-undef
158159
const jssStyles = document.getElementById('jss-server-side');
159160
if (jssStyles && jssStyles.parentNode) {
160161
jssStyles.parentNode.removeChild(jssStyles);

server/readiness.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { version } from '../package.json';
22

3-
const getReadiness = (req, res, next) => {
3+
const getReadiness = (req, res) => {
44
res.header('Content-Type', 'application/json');
55
res.header('Cache-Control', 'no-cache, no-store, must-revalidate');
66

server/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ app.use('/', (req, res, next) => {
136136
app.use(paths.event.regex, fetchEventData);
137137
app.use(paths.unit.regex, fetchSelectedUnitData);
138138

139-
app.get('/*', (req, res, next) => {
139+
app.get('/*', (req, res) => {
140140
const [nonce, cspHeaders] = generateCSPHeaders();
141141
const cache = createEmotionCache(nonce);
142142
const { extractCriticalToChunks, constructStyleTagsFromChunks } =

server/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const redirectables = [
1919
const pathName = pathArray.join('/');
2020

2121
return `${pathName}${queryString ? `?${queryString}` : ''}`;
22-
} catch (e) {
22+
} catch {
2323
return null;
2424
}
2525
},

src/routes/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,13 @@ export const DefaultRoutes = () => (
298298
<Route path="area" element={<Area />} />
299299
<Route
300300
path="division/:city?/:area?"
301-
render={() => (
301+
element={
302302
<>
303303
<PageHandler page="division" />
304304
<DivisionView />
305305
<HomeView />
306306
</>
307-
)}
307+
}
308308
/>
309309
<Route path="info/:page?" element={<Info />} />
310310
<Route path="" element={<Home />} />

0 commit comments

Comments
 (0)