chore: handle repo and package rename

serhalp · serhalp · commit 631d155220b6 · 2024-10-23T08:42:41.000-04:00
repo: netlify/next-runtime → opennextjs/opennextjs-netlify npm package: @netlify/plugin-nextjs → @opennextjs/netlify
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,4 +1,4 @@
-<!-- Before opening a pull request, ensure you've read our contributing guidelines, https://github.com/netlify/next-runtime/blob/main/CONTRIBUTING.md. -->
+<!-- Before opening a pull request, ensure you've read our contributing guidelines, https://github.com/opennextjs/opennextjs-netlify/blob/main/CONTRIBUTING.md. -->
 
 ## Description
 
diff --git a/.github/workflows/e2e-report.yml b/.github/workflows/e2e-report.yml
@@ -43,7 +43,7 @@ jobs:
           version=${version:-latest}
           OUTPUT_DIR="e2e-report/data"
           OUTPUT_FILENAME="test-results.json"
-          echo "Downloading ${version} test results from run https://github.com/netlify/next-runtime/actions/runs/${{ steps.get-run-id.outputs.runId }}"
+          echo "Downloading ${version} test results from run https://github.com/opennextjs/opennextjs-netlify/actions/runs/${{ steps.get-run-id.outputs.runId }}"
           rm "${OUTPUT_DIR}/${OUTPUT_FILENAME}"
           artifact_name="${version}-test-results.json"
           # NOTE: The artifact name is not necessarily the artifact *file* name. The file name here
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -39,7 +39,7 @@ env:
   NETLIFY_SITE_ID: 1d5a5c76-d445-4ae5-b694-b0d3f2e2c395
   NEXT_TEST_CONTINUE_ON_ERROR: 1
   next-path: next.js
-  runtime-path: next-runtime
+  runtime-path: opennextjs-netlify
   GH_TOKEN: ${{ github.token }}
 jobs:
   setup:
@@ -136,7 +136,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ steps.npm-cache.outputs.PATH }}
-          key: node-cache-${{ hashFiles('next-runtime/package-lock.json') }}
+          key: node-cache-${{ hashFiles('opennextjs-netlify/package-lock.json') }}
           restore-keys: |
             node-cache-
 
@@ -186,11 +186,11 @@ jobs:
         run: |
           # This is when the manifest version was changed
           if [ `npx semver -p -r ">=14.0.4-canary.26" ${{ matrix.version_spec.version }}` ]; then
-            echo "filters=../next-runtime/tests/netlify-e2e.cjs" >> $GITHUB_OUTPUT
-            echo "skip-retry=../next-runtime/tests/e2e-skip-retry.json" >> $GITHUB_OUTPUT
+            echo "filters=../opennextjs-netlify/tests/netlify-e2e.cjs" >> $GITHUB_OUTPUT
+            echo "skip-retry=../opennextjs-netlify/tests/e2e-skip-retry.json" >> $GITHUB_OUTPUT
           else
-            echo "filters=../next-runtime/tests/netlify-e2e-legacy.json" >> $GITHUB_OUTPUT
-            echo "skip-retry=../next-runtime/tests/e2e-skip-retry-legacy.json" >> $GITHUB_OUTPUT
+            echo "filters=../opennextjs-netlify/tests/netlify-e2e-legacy.json" >> $GITHUB_OUTPUT
+            echo "skip-retry=../opennextjs-netlify/tests/e2e-skip-retry-legacy.json" >> $GITHUB_OUTPUT
           fi
 
       - name: run tests
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -3,8 +3,8 @@
 🎉 Thanks for considering contributing to this project! 🎉
 
 When contributing to this repository, please first discuss the change you wish to make via an
-[issue](https://github.com/netlify/next-runtime/issues/new/choose). Please use the issue templates.
-They are there to help you and to help the maintainers gather information.
+[issue](https://github.com/opennextjs/opennextjs-netlify/issues/new/choose). Please use the issue
+templates. They are there to help you and to help the maintainers gather information.
 
 Before working on an issue, ask to be assigned to it. This makes it clear to other potential
 contributors that someone is working on the issue.
@@ -31,7 +31,7 @@ Make sure everything is correctly setup with:
 npm test
 ```
 
-## Lambda Folder structure:
+## Lambda Folder structure
 
 For a simple next.js app
 
@@ -96,7 +96,7 @@ given prefix, run `npm run pretest -- <prefix>`.
 The e2e tests can be invoked with `npm run e2e` and perform a full e2e test. This means they do the
 following:
 
-1. Building the next-runtime (just running `npm run build` in the repository)
+1. Building the adapter (just running `npm run build` in the repository)
 2. Creating a temp directory and copying the provided fixture over to the directory.
 3. Packing the runtime with `npm pack` to the temp directory.
 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:
 ## How to make a minimal reproduction
 
 A reproducible test case is a small Next.js site built to demonstrate a problem - often this problem
-is caused by a bug in Next.js, next-runtime or user code. Your reproducible test case should contain
-the bare minimum features needed to clearly demonstrate the bug.
+is caused by a bug in Next.js, @opennextjs/netlify or user code. Your reproducible test case should
+contain the bare minimum features needed to clearly demonstrate the bug.
 
 Steps to create a reproducible test case:
 
diff --git a/README.md b/README.md
@@ -3,11 +3,11 @@
 # Next.js Runtime
 
 <p align="center">
-  <a aria-label="npm version" href="https://www.npmjs.com/package/@netlify/plugin-nextjs">
-    <img alt="" src="https://img.shields.io/npm/v/@netlify/plugin-nextjs">
+  <a aria-label="npm version" href="https://www.npmjs.com/package/@opennextjs/netlify">
+    <img alt="" src="https://img.shields.io/npm/v/@opennextjs/netlify">
   </a>
-  <a aria-label="MIT License" href="https://img.shields.io/npm/l/@netlify/plugin-nextjs">
-    <img alt="" src="https://img.shields.io/npm/l/@netlify/plugin-nextjs">
+  <a aria-label="MIT License" href="https://img.shields.io/npm/l/@opennextjs/netlify">
+    <img alt="" src="https://img.shields.io/npm/l/@opennextjs/netlify">
   </a>
 </p>
 
@@ -37,21 +37,21 @@ manually in the following ways:
 
 ### From the UI (Recommended)
 
-You can go to the [UI](https://app.netlify.com/plugins/@netlify/plugin-nextjs/install) and choose
-the site to install the Next.js Runtime on. This method is recommended because you will benefit from
+You can go to the [UI](https://app.netlify.com/plugins/@opennextjs/netlify/install) and choose the
+site to install the Next.js Runtime on. This method is recommended because you will benefit from
 auto-upgrades to important fixes and feature updates.
 
 ### From `npm`
 
 ```shell
-npm install -D @netlify/plugin-nextjs
+npm install -D @opennextjs/netlify
 ```
 
 ...then add the following to your `netlify.toml` file:
 
 ```toml
 [[plugins]]
-  package = "@netlify/plugin-nextjs"
+  package = "@opennextjs/netlify"
 ```
 
 This method is recommended if you wish to pin the Next.js Runtime to a specific version.
@@ -72,7 +72,8 @@ To upgrade from v4 to v5, please visit
 ## Feedback
 
 If you think you have found a bug in Next.js on Netlify,
-[please open an issue](https://github.com/netlify/next-runtime/issues). If you have comments or
-feature requests, [see the discussion board](https://github.com/netlify/next-runtime/discussions)
+[please open an issue](https://github.com/opennextjs/opennextjs-netlify/issues). If you have
+comments or feature requests,
+[see the discussion board](https://github.com/opennextjs/opennextjs-netlify/discussions)
 
 Please note that v4 will only receive security fixes and critical bug fixes.
diff --git a/e2e-report/netlify.toml b/e2e-report/netlify.toml
@@ -2,6 +2,3 @@
 base = "e2e-report/"
 command = "next build"
 publish = ".next"
-
-[[plugins]]
-package = "@netlify/plugin-nextjs"
diff --git a/e2e-report/package-lock.json b/e2e-report/package-lock.json
diff --git a/e2e-report/package.json b/e2e-report/package.json
@@ -9,7 +9,6 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@netlify/plugin-nextjs": "^5.8.1",
     "next": "^14.2.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
diff --git a/manifest.yml b/manifest.yml
@@ -1 +1 @@
-name: '@netlify/plugin-nextjs'
+name: '@opennextjs/netlify'
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@netlify/plugin-nextjs",
+  "name": "@opennextjs/netlify",
   "version": "5.8.1",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
@@ -34,7 +34,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/netlify/next-runtime.git"
+    "url": "git+https://github.com/opennextjs/opennextjs-netlify.git"
   },
   "keywords": [
     "nextjs",
@@ -44,9 +44,9 @@
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/netlify/next-runtime/issues"
+    "url": "https://github.com/opennextjs/opennextjs-netlify/issues"
   },
-  "homepage": "https://github.com/netlify/next-runtime#readme",
+  "homepage": "https://opennext.js.org/netlify",
   "devDependencies": {
     "@fastly/http-compute-js": "1.1.4",
     "@netlify/blobs": "^8.1.0",
diff --git a/run-local-test.sh b/run-local-test.sh
@@ -15,7 +15,7 @@ export NEXT_TEST_MODE=deploy
 export RUNTIME_DIR=$(pwd)
 cp tests/netlify-deploy.ts ../next.js/test/lib/next-modes/netlify-deploy.ts
 cd ../next.js/
-git apply ../next-runtime/tests/e2e-utils.patch || git apply ../next-runtime/tests/e2e-utils-v2.patch
+git apply ../opennextjs-netlify/tests/e2e-utils.patch || git apply ../opennextjs-netlify/tests/e2e-utils-v2.patch
 node run-tests.js --type e2e --debug --test-pattern $1
 git checkout -- test/lib/e2e-utils.ts
 
diff --git a/src/build/verification.ts b/src/build/verification.ts
@@ -57,7 +57,7 @@ export function verifyPublishDir(ctx: PluginContext) {
       !satisfies(ctx.nextVersion, SUPPORTED_NEXT_VERSIONS, { includePrerelease: true })
     ) {
       ctx.failBuild(
-        `@netlify/plugin-nextjs@5 requires Next.js version ${SUPPORTED_NEXT_VERSIONS}, but found ${ctx.nextVersion}. Please upgrade your project's Next.js version.`,
+        `@opennextjs/netlify@5 requires Next.js version ${SUPPORTED_NEXT_VERSIONS}, but found ${ctx.nextVersion}. Please upgrade your project's Next.js version.`,
       )
     }
   }
@@ -85,7 +85,7 @@ export async function verifyAdvancedAPIRoutes(ctx: PluginContext) {
 
   if (unsupportedAPIRoutes.length !== 0) {
     ctx.failBuild(
-      `@netlify/plugin-nextjs@5 does not support advanced API routes. The following API routes should be migrated to Netlify background or scheduled functions:\n${unsupportedAPIRoutes.map((apiRouteConfig) => ` - ${apiRouteConfig.apiRoute} (type: "${apiRouteConfig.config.type}")`).join('\n')}\n\nRefer to https://ntl.fyi/next-scheduled-bg-function-migration as migration example.`,
+      `@opennextjs/netlify@5 does not support advanced API routes. The following API routes should be migrated to Netlify background or scheduled functions:\n${unsupportedAPIRoutes.map((apiRouteConfig) => ` - ${apiRouteConfig.apiRoute} (type: "${apiRouteConfig.config.type}")`).join('\n')}\n\nRefer to https://ntl.fyi/next-scheduled-bg-function-migration as migration example.`,
     )
   }
 }
@@ -119,7 +119,7 @@ export function verifyNetlifyForms(ctx: PluginContext, html: string) {
     formDetectionRegex.test(html)
   ) {
     ctx.failBuild(
-      '@netlify/plugin-nextjs@5 requires migration steps to support Netlify Forms. Refer to https://ntl.fyi/next-runtime-forms-migration for migration example.',
+      '@opennextjs/netlify@5 requires migration steps to support Netlify Forms. Refer to https://ntl.fyi/next-runtime-forms-migration for migration example.',
     )
   }
 }
diff --git a/tests/integration/advanced-api-routes.test.ts b/tests/integration/advanced-api-routes.test.ts
@@ -26,7 +26,7 @@ it<FixtureTestContext>('test', async (ctx) => {
   const runPluginPromise = runPlugin(ctx)
 
   await expect(runPluginPromise).rejects.toThrow(
-    '@netlify/plugin-nextjs@5 does not support advanced API routes. The following API routes should be migrated to Netlify background or scheduled functions:',
+    '@opennextjs/netlify@5 does not support advanced API routes. The following API routes should be migrated to Netlify background or scheduled functions:',
   )
 
   // list API routes to migrate
diff --git a/tests/integration/netlify-forms.test.ts b/tests/integration/netlify-forms.test.ts
@@ -25,7 +25,7 @@ it<FixtureTestContext>('should fail build when netlify forms are used', async (c
   const runPluginPromise = runPlugin(ctx)
 
   await expect(runPluginPromise).rejects.toThrow(
-    '@netlify/plugin-nextjs@5 requires migration steps to support Netlify Forms. Refer to https://ntl.fyi/next-runtime-forms-migration for migration example.',
+    '@opennextjs/netlify@5 requires migration steps to support Netlify Forms. Refer to https://ntl.fyi/next-runtime-forms-migration for migration example.',
   )
 })
 
diff --git a/tests/netlify-deploy.ts b/tests/netlify-deploy.ts
@@ -16,12 +16,12 @@ type NetlifyDeployResponse = {
 }
 
 async function packNextRuntimeImpl() {
-  const runtimePackDir = await fs.mkdtemp(path.join(tmpdir(), 'next-runtime-pack'))
+  const runtimePackDir = await fs.mkdtemp(path.join(tmpdir(), 'opennextjs-netlify-pack'))
 
   const { stdout } = await execa(
     'npm',
     ['pack', '--json', '--ignore-scripts', `--pack-destination=${runtimePackDir}`],
-    { cwd: process.env.RUNTIME_DIR || `${process.cwd()}/../next-runtime` },
+    { cwd: process.env.RUNTIME_DIR || `${process.cwd()}/../opennextjs-netlify` },
   )
   const [{ filename, name }] = JSON.parse(stdout)
 
diff --git a/tests/smoke/deploy.test.ts b/tests/smoke/deploy.test.ts
@@ -66,7 +66,7 @@ describe('version check', () => {
     async () => {
       await expect(selfCleaningFixtureFactories.next12_1_0()).rejects.toThrow(
         new RegExp(
-          `@netlify/plugin-nextjs@5 requires Next.js version >=13.5.0, but found 12.1.0. Please upgrade your project's Next.js version.`,
+          `@opennextjs/netlify@5 requires Next.js version >=13.5.0, but found 12.1.0. Please upgrade your project's Next.js version.`,
         ),
       )
     },
@@ -83,7 +83,7 @@ describe('version check', () => {
         selfCleaningFixtureFactories.yarnMonorepoMultipleNextVersionsSiteIncompatible(),
       ).rejects.toThrow(
         new RegExp(
-          `@netlify/plugin-nextjs@5 requires Next.js version >=13.5.0, but found 13.4.1. Please upgrade your project's Next.js version.`,
+          `@opennextjs/netlify@5 requires Next.js version >=13.5.0, but found 13.4.1. Please upgrade your project's Next.js version.`,
         ),
       )
     },
@@ -101,7 +101,7 @@ describe('version check', () => {
         fixtureFactories.npmNestedSiteMultipleNextVersionsIncompatible(),
       ).rejects.toThrow(
         new RegExp(
-          `@netlify/plugin-nextjs@5 requires Next.js version >=13.5.0, but found 13.4.1. Please upgrade your project's Next.js version.`,
+          `@opennextjs/netlify@5 requires Next.js version >=13.5.0, but found 13.4.1. Please upgrade your project's Next.js version.`,
         ),
       )
     },
diff --git a/tests/smoke/fixtures/npm-monorepo-empty-base/apps/site/netlify.toml b/tests/smoke/fixtures/npm-monorepo-empty-base/apps/site/netlify.toml
@@ -2,6 +2,3 @@
 base = ""
 command = "npm run build"
 publish = "apps/site/.next"
-
-[[plugins]]
-package = "@netlify/plugin-nextjs"
diff --git a/tests/smoke/fixtures/npm-monorepo-site-created-at-build/netlify.toml b/tests/smoke/fixtures/npm-monorepo-site-created-at-build/netlify.toml
@@ -1,6 +1,3 @@
 [build]
 command = "node setup-site.mjs && npm install && npm run build -w apps/site"
 publish = "./apps/site/.next"
-
-[[plugins]]
-package = "@netlify/plugin-nextjs"
diff --git a/tests/utils/create-e2e-fixture.ts b/tests/utils/create-e2e-fixture.ts
@@ -51,7 +51,7 @@ interface E2EConfig {
  * @param fixture name of the folder inside the fixtures folder
  */
 export const createE2EFixture = async (fixture: string, config: E2EConfig = {}) => {
-  const isolatedFixtureRoot = await mkdtemp(join(tmpdir(), 'netlify-next-runtime-'))
+  const isolatedFixtureRoot = await mkdtemp(join(tmpdir(), 'opennextjs-netlify-'))
   let deployID: string
   let logs: string
   const _cleanup = (failure: boolean = false) => {
diff --git a/tests/utils/fixture.ts b/tests/utils/fixture.ts
@@ -95,7 +95,7 @@ export const createFixture = async (fixture: string, ctx: FixtureTestContext) =>
     delete globalThis[Symbol.for('next-patch')]
   }
 
-  ctx.cwd = await mkdtemp(join(tmpdir(), 'netlify-next-runtime-'))
+  ctx.cwd = await mkdtemp(join(tmpdir(), 'opennextjs-netlify-'))
   vi.spyOn(process, 'cwd').mockReturnValue(ctx.cwd)
 
   ctx.cleanup = []
@@ -156,7 +156,7 @@ export const createFixture = async (fixture: string, ctx: FixtureTestContext) =>
 }
 
 export const createFsFixture = async (fixture: Record<string, string>, ctx: FixtureTestContext) => {
-  ctx.cwd = await mkdtemp(join(tmpdir(), 'netlify-next-runtime-'))
+  ctx.cwd = await mkdtemp(join(tmpdir(), 'opennextjs-netlify-'))
   vi.spyOn(process, 'cwd').mockReturnValue(ctx.cwd)
   ctx.cleanup = [
     async () => {
@@ -261,7 +261,7 @@ export async function runPlugin(
     }
     // create zip location in a new temp folder to avoid leaking node_modules through nodes resolve algorithm
     // that always looks up a parent directory for node_modules
-    ctx.functionDist = await mkdtemp(join(tmpdir(), 'netlify-next-runtime-dist'))
+    ctx.functionDist = await mkdtemp(join(tmpdir(), 'opennextjs-netlify-dist'))
     // bundle the function to get the bootstrap layer and all the important parts
     await zipFunctions([internalSrcFolder], ctx.functionDist, {
       basePath: ctx.cwd,
diff --git a/tests/utils/helpers.ts b/tests/utils/helpers.ts
@@ -48,7 +48,7 @@ export const startMockBlobStore = async (ctx: FixtureTestContext) => {
   ctx.blobServer = new BlobsServer({
     port,
     token: BLOB_TOKEN,
-    directory: await mkdtemp(join(tmpdir(), 'netlify-next-runtime-blob-')),
+    directory: await mkdtemp(join(tmpdir(), 'opennextjs-netlify-blob-')),
   })
   await ctx.blobServer.start()
   ctx.blobServerGetSpy = vi.spyOn(ctx.blobServer, 'get')
diff --git a/tools/build.js b/tools/build.js
@@ -36,7 +36,7 @@ async function bundle(entryPoints, format, watch) {
         name: 'mark-runtime-modules-as-external',
         setup(pluginBuild) {
           pluginBuild.onResolve({ filter: /^\..*\.c?js$/ }, (args) => {
-            if (args.importer.includes(join('next-runtime', 'src'))) {
+            if (args.importer.includes(join('opennextjs-netlify', 'src'))) {
               return { path: args.path, external: true }
             }
           })

Original file line number	Diff line number	Diff 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. -->`
`2`	`2`
`3`	`3`	`## Description`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-name: '@netlify/plugin-nextjs'`
	`1`	`+name: '@opennextjs/netlify'`