Skip to content

Commit 1873d11

Browse files
committed
chore: scrub references to next-runtime-minimal
1 parent 3216224 commit 1873d11

File tree

8 files changed

+190
-213
lines changed

8 files changed

+190
-213
lines changed

.github/workflows/e2e-report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Download latest e2e results
3131
if: ${{ steps.get-run-id.outputs.runId }}
3232
run: |
33-
echo "Downloading latest test results from run https://github.com/netlify/next-runtime-minimal/actions/runs/${{ steps.get-run-id.outputs.runId }}"
33+
echo "Downloading latest test results from run https://github.com/netlify/next-runtime/actions/runs/${{ steps.get-run-id.outputs.runId }}"
3434
rm e2e-report/data/test-results.json
3535
gh run download ${{ steps.get-run-id.outputs.runId }} -n "latest-test-results.json" -D e2e-report/data/ --repo $GITHUB_REPOSITORY
3636
- name: Install site dependencies

.github/workflows/test-e2e.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ env:
3939
NETLIFY_SITE_ID: 1d5a5c76-d445-4ae5-b694-b0d3f2e2c395
4040
NEXT_TEST_CONTINUE_ON_ERROR: 1
4141
next-path: next.js
42-
runtime-path: next-runtime-minimal
42+
runtime-path: next-runtime
4343
GH_TOKEN: ${{ github.token }}
4444
jobs:
4545
setup:
@@ -143,7 +143,7 @@ jobs:
143143
uses: actions/cache@v4
144144
with:
145145
path: ${{ steps.npm-cache.outputs.PATH }}
146-
key: node-cache-${{ hashFiles('next-runtime-minimal/package-lock.json') }}
146+
key: node-cache-${{ hashFiles('next-runtime/package-lock.json') }}
147147
restore-keys: |
148148
node-cache-
149149
@@ -191,11 +191,11 @@ jobs:
191191
run: |
192192
# This is when the manifest version was changed
193193
if [ `npx semver -p -r ">=14.0.4-canary.26" ${{ matrix.version_spec.version }}` ]; then
194-
echo "filters=../next-runtime-minimal/tests/netlify-e2e.cjs" >> $GITHUB_OUTPUT
195-
echo "skip-retry=../next-runtime-minimal/tests/e2e-skip-retry.json" >> $GITHUB_OUTPUT
194+
echo "filters=../next-runtime/tests/netlify-e2e.cjs" >> $GITHUB_OUTPUT
195+
echo "skip-retry=../next-runtime/tests/e2e-skip-retry.json" >> $GITHUB_OUTPUT
196196
else
197-
echo "filters=../next-runtime-minimal/tests/netlify-e2e-legacy.json" >> $GITHUB_OUTPUT
198-
echo "skip-retry=../next-runtime-minimal/tests/e2e-skip-retry-legacy.json" >> $GITHUB_OUTPUT
197+
echo "filters=../next-runtime/tests/netlify-e2e-legacy.json" >> $GITHUB_OUTPUT
198+
echo "skip-retry=../next-runtime/tests/e2e-skip-retry-legacy.json" >> $GITHUB_OUTPUT
199199
fi
200200
201201
- name: run tests
@@ -243,7 +243,7 @@ jobs:
243243
- name: Get and format Github issues
244244
if: success() || failure()
245245
run: |
246-
gh issue list --label "Next.js e2e test failure" --json number,body > report/issues.json
246+
gh issue list --label "Next.js e2e test failure" --json url,body > report/issues.json
247247
deno run -A tools/deno/ghIssues2json.ts tests/test-config.json report/issues.json
248248
249249
- name: Publish Test Report

CHANGELOG.md

+169-192
Large diffs are not rendered by default.

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535
"repository": {
3636
"type": "git",
37-
"url": "git+https://github.com/netlify/next-runtime-minimal.git"
37+
"url": "git+https://github.com/netlify/next-runtime.git"
3838
},
3939
"keywords": [
4040
"nextjs",
@@ -44,9 +44,9 @@
4444
],
4545
"license": "MIT",
4646
"bugs": {
47-
"url": "https://github.com/netlify/next-runtime-minimal/issues"
47+
"url": "https://github.com/netlify/next-runtime/issues"
4848
},
49-
"homepage": "https://github.com/netlify/next-runtime-minimal#readme",
49+
"homepage": "https://github.com/netlify/next-runtime#readme",
5050
"devDependencies": {
5151
"@fastly/http-compute-js": "1.1.4",
5252
"@netlify/blobs": "^7.3.0",

run-local-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export NEXT_TEST_MODE=deploy
1515
export RUNTIME_DIR=$(pwd)
1616
cp tests/netlify-deploy.ts ../next.js/test/lib/next-modes/netlify-deploy.ts
1717
cd ../next.js/
18-
git apply ../next-runtime-minimal/tests/e2e-utils.patch
18+
git apply ../next-runtime/tests/e2e-utils.patch
1919
node run-tests.js --type e2e --debug --test-pattern $1
2020
git checkout -- test/lib/e2e-utils.ts
2121

tests/netlify-deploy.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ export class NextDeployInstance extends NextInstance {
6666
[build]
6767
command = "npm run build"
6868
publish = ".next"
69-
69+
7070
[[plugins]]
7171
package = "${path.relative(
7272
this.testDir,
73-
process.env.RUNTIME_DIR || `${process.cwd()}/../next-runtime-minimal`,
73+
process.env.RUNTIME_DIR || `${process.cwd()}/../next-runtime`,
7474
)}"
7575
`
7676

@@ -83,7 +83,7 @@ export class NextDeployInstance extends NextInstance {
8383
require('console').log(`Using Netlify CLI version:`, res.stdout)
8484
} catch (_) {
8585
require('console').log(`You need to have netlify-cli installed.
86-
86+
8787
You can do this by running: "npm install -g netlify-cli@latest" or "yarn global add netlify-cli@latest"`)
8888
}
8989

tools/build.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ async function bundle(entryPoints, format, watch) {
3636
name: 'mark-runtime-modules-as-external',
3737
setup(pluginBuild) {
3838
pluginBuild.onResolve({ filter: /^\..*\.c?js$/ }, (args) => {
39-
if (args.importer.includes(join('next-runtime-minimal', 'src'))) {
39+
if (args.importer.includes(join('next-runtime', 'src'))) {
4040
return { path: args.path, external: true }
4141
}
4242
})

tools/deno/ghIssues2json.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ async function writeToConfig(
1414
}
1515

1616
async function formatIssues(file: string) {
17-
const issues = JSON.parse(await Deno.readTextFile(file))
17+
const issues = JSON.parse(await Deno.readTextFile(file)) as { body: string; url: string }[]
1818
const annotations: Annotation[] = []
1919

20-
issues.forEach((issue: { body: string; number: number }) => {
21-
const name = issue.body.match(/^test: (.+)$/m) || []
22-
const reason = issue.body.match(/^reason: (.+)$/m) || []
20+
issues.forEach(({ url, body }) => {
21+
const name = body.match(/^test: (.+)$/m) || []
22+
const reason = body.match(/^reason: (.+)$/m) || []
2323
const testNames = name[1]?.split(',')
2424

2525
testNames?.forEach((name) => {
2626
annotations.push({
27-
link: `https://github.com/netlify/next-runtime-minimal/issues/${issue.number}`,
27+
link: url,
2828
reason: reason[1],
2929
name: name.trim(),
3030
})

0 commit comments

Comments
 (0)