Skip to content

Commit c1a20f7

Browse files
piehserhalp
andauthored
chore: handle repo rename (#2696)
Co-authored-by: Philippe Serhal <philippe.serhal@netlify.com>
1 parent eba1610 commit c1a20f7

12 files changed

+29
-28
lines changed

.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Before opening a pull request, ensure you've read our contributing guidelines, https://github.com/netlify/next-runtime/blob/main/CONTRIBUTING.md. -->
1+
<!-- Before opening a pull request, ensure you've read our contributing guidelines, https://github.com/opennextjs/opennextjs-netlify/blob/main/CONTRIBUTING.md. -->
22

33
## Description
44

.github/workflows/e2e-report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
version=${version:-latest}
4444
OUTPUT_DIR="e2e-report/data"
4545
OUTPUT_FILENAME="test-results.json"
46-
echo "Downloading ${version} test results from run https://github.com/netlify/next-runtime/actions/runs/${{ steps.get-run-id.outputs.runId }}"
46+
echo "Downloading ${version} test results from run https://github.com/opennextjs/opennextjs-netlify/actions/runs/${{ steps.get-run-id.outputs.runId }}"
4747
rm "${OUTPUT_DIR}/${OUTPUT_FILENAME}"
4848
artifact_name="${version}-test-results.json"
4949
# NOTE: The artifact name is not necessarily the artifact *file* name. The file name here

.github/workflows/test-e2e.yml

+6-6
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
42+
runtime-path: opennextjs-netlify
4343
GH_TOKEN: ${{ github.token }}
4444
jobs:
4545
setup:
@@ -136,7 +136,7 @@ jobs:
136136
uses: actions/cache@v4
137137
with:
138138
path: ${{ steps.npm-cache.outputs.PATH }}
139-
key: node-cache-${{ hashFiles('next-runtime/package-lock.json') }}
139+
key: node-cache-${{ hashFiles('opennextjs-netlify/package-lock.json') }}
140140
restore-keys: |
141141
node-cache-
142142
@@ -186,11 +186,11 @@ jobs:
186186
run: |
187187
# This is when the manifest version was changed
188188
if [ `npx semver -p -r ">=14.0.4-canary.26" ${{ matrix.version_spec.version }}` ]; then
189-
echo "filters=../next-runtime/tests/netlify-e2e.cjs" >> $GITHUB_OUTPUT
190-
echo "skip-retry=../next-runtime/tests/e2e-skip-retry.json" >> $GITHUB_OUTPUT
189+
echo "filters=../opennextjs-netlify/tests/netlify-e2e.cjs" >> $GITHUB_OUTPUT
190+
echo "skip-retry=../opennextjs-netlify/tests/e2e-skip-retry.json" >> $GITHUB_OUTPUT
191191
else
192-
echo "filters=../next-runtime/tests/netlify-e2e-legacy.json" >> $GITHUB_OUTPUT
193-
echo "skip-retry=../next-runtime/tests/e2e-skip-retry-legacy.json" >> $GITHUB_OUTPUT
192+
echo "filters=../opennextjs-netlify/tests/netlify-e2e-legacy.json" >> $GITHUB_OUTPUT
193+
echo "skip-retry=../opennextjs-netlify/tests/e2e-skip-retry-legacy.json" >> $GITHUB_OUTPUT
194194
fi
195195
196196
- name: run tests

CONTRIBUTING.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
🎉 Thanks for considering contributing to this project! 🎉
44

55
When contributing to this repository, please first discuss the change you wish to make via an
6-
[issue](https://github.com/netlify/next-runtime/issues/new/choose). Please use the issue templates.
7-
They are there to help you and to help the maintainers gather information.
6+
[issue](https://github.com/opennextjs/opennextjs-netlify/issues/new/choose). Please use the issue
7+
templates. They are there to help you and to help the maintainers gather information.
88

99
Before working on an issue, ask to be assigned to it. This makes it clear to other potential
1010
contributors that someone is working on the issue.
@@ -31,7 +31,7 @@ Make sure everything is correctly setup with:
3131
npm test
3232
```
3333

34-
## Lambda Folder structure:
34+
## Lambda Folder structure
3535

3636
For a simple next.js app
3737

@@ -96,7 +96,7 @@ given prefix, run `npm run pretest -- <prefix>`.
9696
The e2e tests can be invoked with `npm run e2e` and perform a full e2e test. This means they do the
9797
following:
9898

99-
1. Building the next-runtime (just running `npm run build` in the repository)
99+
1. Building the adapter (just running `npm run build` in the repository)
100100
2. Creating a temp directory and copying the provided fixture over to the directory.
101101
3. Packing the runtime with `npm pack` to the temp directory.
102102
4. Installing the runtime from the created zip artifact of `npm pack` (this is like installing a
@@ -147,8 +147,8 @@ Most common commit message prefixes are:
147147
## How to make a minimal reproduction
148148

149149
A reproducible test case is a small Next.js site built to demonstrate a problem - often this problem
150-
is caused by a bug in Next.js, next-runtime or user code. Your reproducible test case should contain
151-
the bare minimum features needed to clearly demonstrate the bug.
150+
is caused by a bug in Next.js, @opennextjs/netlify or user code. Your reproducible test case should
151+
contain the bare minimum features needed to clearly demonstrate the bug.
152152

153153
Steps to create a reproducible test case:
154154

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ To upgrade from v4 to v5, please visit
7272
## Feedback
7373

7474
If you think you have found a bug in Next.js on Netlify,
75-
[please open an issue](https://github.com/netlify/next-runtime/issues). If you have comments or
76-
feature requests, [see the discussion board](https://github.com/netlify/next-runtime/discussions)
75+
[please open an issue](https://github.com/opennextjs/opennextjs-netlify/issues). If you have
76+
comments or feature requests,
77+
[see the discussion board](https://github.com/opennextjs/opennextjs-netlify/discussions)
7778

7879
Please note that v4 will only receive security fixes and critical bug fixes.

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.git"
37+
"url": "git+https://github.com/opennextjs/opennextjs-netlify.git"
3838
},
3939
"keywords": [
4040
"nextjs",
@@ -44,9 +44,9 @@
4444
],
4545
"license": "MIT",
4646
"bugs": {
47-
"url": "https://github.com/netlify/next-runtime/issues"
47+
"url": "https://github.com/opennextjs/opennextjs-netlify/issues"
4848
},
49-
"homepage": "https://github.com/netlify/next-runtime#readme",
49+
"homepage": "https://opennext.js.org/netlify",
5050
"devDependencies": {
5151
"@fastly/http-compute-js": "1.1.4",
5252
"@netlify/blobs": "^8.1.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/tests/e2e-utils.patch || git apply ../next-runtime/tests/e2e-utils-v2.patch
18+
git apply ../opennextjs-netlify/tests/e2e-utils.patch || git apply ../opennextjs-netlify/tests/e2e-utils-v2.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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ type NetlifyDeployResponse = {
1616
}
1717

1818
async function packNextRuntimeImpl() {
19-
const runtimePackDir = await fs.mkdtemp(path.join(tmpdir(), 'next-runtime-pack'))
19+
const runtimePackDir = await fs.mkdtemp(path.join(tmpdir(), 'opennextjs-netlify-pack'))
2020

2121
const { stdout } = await execa(
2222
'npm',
2323
['pack', '--json', '--ignore-scripts', `--pack-destination=${runtimePackDir}`],
24-
{ cwd: process.env.RUNTIME_DIR || `${process.cwd()}/../next-runtime` },
24+
{ cwd: process.env.RUNTIME_DIR || `${process.cwd()}/../opennextjs-netlify` },
2525
)
2626
const [{ filename, name }] = JSON.parse(stdout)
2727

tests/utils/create-e2e-fixture.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ interface E2EConfig {
5151
* @param fixture name of the folder inside the fixtures folder
5252
*/
5353
export const createE2EFixture = async (fixture: string, config: E2EConfig = {}) => {
54-
const isolatedFixtureRoot = await mkdtemp(join(tmpdir(), 'netlify-next-runtime-'))
54+
const isolatedFixtureRoot = await mkdtemp(join(tmpdir(), 'opennextjs-netlify-'))
5555
let deployID: string
5656
let logs: string
5757
const _cleanup = (failure: boolean = false) => {

tests/utils/fixture.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export const createFixture = async (fixture: string, ctx: FixtureTestContext) =>
9595
delete globalThis[Symbol.for('next-patch')]
9696
}
9797

98-
ctx.cwd = await mkdtemp(join(tmpdir(), 'netlify-next-runtime-'))
98+
ctx.cwd = await mkdtemp(join(tmpdir(), 'opennextjs-netlify-'))
9999
vi.spyOn(process, 'cwd').mockReturnValue(ctx.cwd)
100100

101101
ctx.cleanup = []
@@ -156,7 +156,7 @@ export const createFixture = async (fixture: string, ctx: FixtureTestContext) =>
156156
}
157157

158158
export const createFsFixture = async (fixture: Record<string, string>, ctx: FixtureTestContext) => {
159-
ctx.cwd = await mkdtemp(join(tmpdir(), 'netlify-next-runtime-'))
159+
ctx.cwd = await mkdtemp(join(tmpdir(), 'opennextjs-netlify-'))
160160
vi.spyOn(process, 'cwd').mockReturnValue(ctx.cwd)
161161
ctx.cleanup = [
162162
async () => {
@@ -261,7 +261,7 @@ export async function runPlugin(
261261
}
262262
// create zip location in a new temp folder to avoid leaking node_modules through nodes resolve algorithm
263263
// that always looks up a parent directory for node_modules
264-
ctx.functionDist = await mkdtemp(join(tmpdir(), 'netlify-next-runtime-dist'))
264+
ctx.functionDist = await mkdtemp(join(tmpdir(), 'opennextjs-netlify-dist'))
265265
// bundle the function to get the bootstrap layer and all the important parts
266266
await zipFunctions([internalSrcFolder], ctx.functionDist, {
267267
basePath: ctx.cwd,

tests/utils/helpers.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export const startMockBlobStore = async (ctx: FixtureTestContext) => {
4848
ctx.blobServer = new BlobsServer({
4949
port,
5050
token: BLOB_TOKEN,
51-
directory: await mkdtemp(join(tmpdir(), 'netlify-next-runtime-blob-')),
51+
directory: await mkdtemp(join(tmpdir(), 'opennextjs-netlify-blob-')),
5252
})
5353
await ctx.blobServer.start()
5454
ctx.blobServerGetSpy = vi.spyOn(ctx.blobServer, 'get')

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', 'src'))) {
39+
if (args.importer.includes(join('opennextjs-netlify', 'src'))) {
4040
return { path: args.path, external: true }
4141
}
4242
})

0 commit comments

Comments
 (0)