Skip to content

Commit 694d38e

Browse files
authored
Move server.js and start-server.js to src/frame (#45767)
1 parent 4fd4050 commit 694d38e

File tree

8 files changed

+11
-13
lines changed

8 files changed

+11
-13
lines changed

.github/workflows/check-broken-links-github-github.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
ENABLED_LANGUAGES: en
6161
run: |
6262
63-
node server.js &
63+
node src/frame/server.js &
6464
sleep 5
6565
curl --retry-connrefused --retry 3 -I http://localhost:4000/
6666

Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,10 @@ COPY --chown=node:node src ./src
9191
COPY --chown=node:node .remotejson-cache* ./.remotejson-cache
9292
COPY --chown=node:node data ./data
9393
COPY --chown=node:node next.config.js ./
94-
COPY --chown=node:node server.js ./server.js
95-
COPY --chown=node:node start-server.js ./start-server.js
9694

9795
EXPOSE $PORT
9896

99-
CMD ["node", "server.js"]
97+
CMD ["node", "src/frame/server.js"]
10098

10199
# --------------------------------------------------------------------------------
102100
# PRODUCTION IMAGE - includes all translations

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
"default": "./src/*"
1515
}
1616
},
17-
"exports": "./server.js",
17+
"exports": "./src/frame/server.js",
1818
"scripts": {
1919
"build": "next build",
20-
"debug": "cross-env NODE_ENV=development ENABLED_LANGUAGES=en nodemon --inspect server.js",
20+
"debug": "cross-env NODE_ENV=development ENABLED_LANGUAGES=en nodemon --inspect src/frame/server.js",
2121
"dev": "cross-env npm start",
2222
"fixture-dev": "cross-env ROOT=tests/fixtures npm start",
2323
"fixture-test": "cross-env ROOT=tests/fixtures npm test -- tests/rendering-fixtures",
@@ -35,14 +35,14 @@
3535
"rest-dev": "node src/rest/scripts/update-files.js",
3636
"show-action-deps": "echo 'Action Dependencies:' && rg '^[\\s|-]*(uses:.*)$' .github -I -N --no-heading -r '$1$2' | sort | uniq | cut -c 7-",
3737
"prestart": "node src/workflows/cmp-files.js package-lock.json .installed.package-lock.json || npm install && cp package-lock.json .installed.package-lock.json",
38-
"start": "cross-env NODE_ENV=development ENABLED_LANGUAGES=en nodemon server.js",
39-
"start-all-languages": "cross-env NODE_ENV=development nodemon server.js",
40-
"start-for-playwright": "cross-env ROOT=tests/fixtures TRANSLATIONS_FIXTURE_ROOT=tests/fixtures/translations ENABLED_LANGUAGES=en,ja NODE_ENV=test node server.js",
38+
"start": "cross-env NODE_ENV=development ENABLED_LANGUAGES=en nodemon src/frame/server.js",
39+
"start-all-languages": "cross-env NODE_ENV=development nodemon src/frame/server.js",
40+
"start-for-playwright": "cross-env ROOT=tests/fixtures TRANSLATIONS_FIXTURE_ROOT=tests/fixtures/translations ENABLED_LANGUAGES=en,ja NODE_ENV=test node src/frame/server.js",
4141
"sync-rest": "node src/rest/scripts/update-files.js",
4242
"sync-search": "cross-env NODE_OPTIONS='--max_old_space_size=8192' start-server-and-test sync-search-server 4002 sync-search-indices",
4343
"sync-search-ghes-release": "cross-env GHES_RELEASE=1 start-server-and-test sync-search-server 4002 sync-search-indices",
4444
"sync-search-indices": "node src/search/scripts/sync-search-indices.js",
45-
"sync-search-server": "cross-env NODE_ENV=production PORT=4002 MINIMAL_RENDER=true CHANGELOG_DISABLED=true node server.js",
45+
"sync-search-server": "cross-env NODE_ENV=production PORT=4002 MINIMAL_RENDER=true CHANGELOG_DISABLED=true node src/frame/server.js",
4646
"sync-webhooks": "src/rest/scripts/update-files.js -o webhooks",
4747
"test": "cross-env NODE_OPTIONS='--max_old_space_size=4096 --experimental-vm-modules' jest --logHeapUsage",
4848
"test-watch": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --watch --notify --notifyMode=change --coverage",
File renamed without changes.
File renamed without changes.

src/tests/scripts/start-server-for-jest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env node
22

3-
import { main } from '../../../start-server.js'
3+
import { main } from '#src/frame/start-server.js'
44

55
import { PORT, START_JEST_SERVER, isServerHealthy, isPortRunning } from './server-for-jest.js'
66

tests/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ since the server won't need to start and stop every time you run tests.
8484
In one terminal, type:
8585

8686
```shell
87-
NODE_ENV=test PORT=4000 node server.js
87+
NODE_ENV=test PORT=4000 node src/frame/server.js
8888
```
8989

9090
In another terminal, type:

tests/rendering-fixtures/playwright-rendering.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { test, expect } from '@playwright/test'
55
// In GitHub Actions, we rely on setting the environment variable directly
66
// but for convenience, for local development, engineers might have a
77
// .env file that can set environment variable. E.g. ELASTICSEARCH_URL.
8-
// The `start-server.js` script uses dotenv too, but since Playwright
8+
// The `src/frame/start-server.js` script uses dotenv too, but since Playwright
99
// tests only interface with the server via HTTP, we too need to find
1010
// this out.
1111
dotenv.config()

0 commit comments

Comments
 (0)