From fdafc5e7c867cdf0d3d15c2d7857b98c99764d33 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Fri, 14 Jun 2024 12:21:20 +0200 Subject: [PATCH] refactor: rename {build:render-html => render:html} --- .github/workflows/dev-build.yml | 2 +- .github/workflows/performance.yml | 2 +- .github/workflows/prod-build.yml | 2 +- .github/workflows/stage-build.yml | 2 +- .github/workflows/testing.yml | 2 +- .github/workflows/xyz-build.yml | 2 +- package.json | 4 ++-- scripts/testing.sh | 2 +- testing/README.md | 2 +- testing/scripts/functional-test.sh | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index bbf8daf398d9..cf1b9c6de18a 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -160,7 +160,7 @@ jobs: yarn build --sitemap-index # SSR all pages - yarn build:render-html + yarn render:html # Generate whatsdeployed files. yarn tool whatsdeployed --output client/build/_whatsdeployed/code.json diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 326a1ba2b66e..2cbc8d4176f7 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -55,7 +55,7 @@ jobs: yarn build:prepare # BUILD_FOLDERSEARCH=mdn/kitchensink yarn build:json BUILD_FOLDERSEARCH=web/javascript/reference/global_objects/array/foreach yarn build:json - yarn build:render-html + yarn render:html - name: Serve and lhci env: diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml index 07d8cfbaa350..aff6bafc6b2b 100644 --- a/.github/workflows/prod-build.yml +++ b/.github/workflows/prod-build.yml @@ -284,7 +284,7 @@ jobs: yarn build --sitemap-index # SSR all pages - yarn build:render-html + yarn render:html # Generate whatsdeployed files. yarn tool whatsdeployed --output client/build/_whatsdeployed/code.json diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml index afbd84c8f548..8f09fdfe0418 100644 --- a/.github/workflows/stage-build.yml +++ b/.github/workflows/stage-build.yml @@ -300,7 +300,7 @@ jobs: yarn build --sitemap-index # SSR all pages - yarn build:render-html + yarn render:html # Generate whatsdeployed files. yarn tool whatsdeployed --output client/build/_whatsdeployed/code.json diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index e57696a8b4fa..39db6121a43f 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -91,7 +91,7 @@ jobs: run: | yarn build:prepare yarn build:json - yarn build:render-html + yarn render:html yarn start:static-server > /tmp/stdout.log 2> /tmp/stderr.log & sleep 1 diff --git a/.github/workflows/xyz-build.yml b/.github/workflows/xyz-build.yml index 1ee09b927dfa..69c440851c43 100644 --- a/.github/workflows/xyz-build.yml +++ b/.github/workflows/xyz-build.yml @@ -191,7 +191,7 @@ jobs: yarn build --sitemap-index # SSR all pages - yarn build:render-html + yarn render:html # Generate whatsdeployed files. yarn tool whatsdeployed --output client/build/_whatsdeployed/code.json diff --git a/package.json b/package.json index 84d7b9f5abcf..a917c03b10a7 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "build:glean": "cd client && cross-env VIRTUAL_ENV=venv glean translate src/telemetry/metrics.yaml src/telemetry/pings.yaml -f typescript -o src/telemetry/generated", "build:json": "cross-env NODE_ENV=production NODE_OPTIONS='--no-warnings=ExperimentalWarning --loader ts-node/esm' node build/cli.ts -n", "build:prepare": "yarn build:client && yarn build:ssr && yarn tool popularities && yarn tool spas && yarn tool gather-git-history && yarn tool build-robots-txt", - "build:render-html": "cross-env NODE_ENV=production NODE_OPTIONS='--no-warnings=ExperimentalWarning --loader ts-node/esm' node build/ssr-cli.ts", "build:ssr": "cross-env NODE_ENV=production NODE_OPTIONS='--no-warnings=ExperimentalWarning --loader ts-node/esm' node ssr/prepare.ts && cd ssr && webpack --mode=production", "build:sw": "cd client/pwa && yarn && yarn build:prod", "build:sw-dev": "cd client/pwa && yarn && yarn build", @@ -41,6 +40,7 @@ "prepare": "(husky || true) && yarn install:all && yarn install:all:npm", "prettier-check": "prettier --check .", "prettier-format": "prettier --write .", + "render:html": "cross-env NODE_ENV=production NODE_OPTIONS='--no-warnings=ExperimentalWarning --loader ts-node/esm' node build/ssr-cli.ts", "start": "(test -f client/build/index.html || yarn build:client) && (test -f ssr/dist/main.js || yarn build:ssr) && (test -f popularities.json || yarn tool popularities) && (test -d client/build/en-us/_spas || yarn tool spas) && nf -j Procfile.start start", "start:client": "cd client && cross-env NODE_ENV=development BABEL_ENV=development PORT=3000 node scripts/start.js", "start:server": "node-dev --experimental-loader ts-node/esm server/index.ts", @@ -54,7 +54,7 @@ "test:headless": "playwright test headless", "test:kumascript": "yarn jest --rootDir kumascript --env=node", "test:libs": "yarn jest --rootDir libs --env=node", - "test:prepare": "yarn build:prepare && yarn build:json && yarn build:render-html && yarn start:static-server", + "test:prepare": "yarn build:prepare && yarn build:json && yarn render:html && yarn start:static-server", "test:testing": "yarn jest --rootDir testing", "tool": "cross-env NODE_OPTIONS='--no-warnings=ExperimentalWarning --loader ts-node/esm' node ./tool/cli.ts", "watch:ssr": "cd ssr && webpack --mode=production --watch" diff --git a/scripts/testing.sh b/scripts/testing.sh index 6c7055a8b15d..4b5517a9fbfc 100755 --- a/scripts/testing.sh +++ b/scripts/testing.sh @@ -24,7 +24,7 @@ export ENV_FILE=".env.testing" yarn build:prepare yarn build:json -yarn build:render-html +yarn render:html nohup yarn start:static-server > testing.log 2>&1 & PID=$! diff --git a/testing/README.md b/testing/README.md index fe2ba009da37..e69a756f48b6 100644 --- a/testing/README.md +++ b/testing/README.md @@ -22,7 +22,7 @@ To run these tests, first run: export ENV_FILE=.env.testing yarn build:prepare yarn build:json -yarn build:render-html +yarn render:html yarn start:static-server ``` diff --git a/testing/scripts/functional-test.sh b/testing/scripts/functional-test.sh index ab784b3b6f4c..a3e878b2d0c7 100755 --- a/testing/scripts/functional-test.sh +++ b/testing/scripts/functional-test.sh @@ -5,6 +5,6 @@ export ENV_FILE=.env.testing yarn build:prepare yarn build:json -yarn build:render-html +yarn render:html yarn test:testing $@