mirror of
https://github.com/hanzoai/next.js.git
synced 2026-09-24 17:00:51 +00:00
skip generating cert each time (#67122)
<!-- Thanks for opening a PR! Your contribution is much appreciated. To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below. Choose the right checklist for the change(s) that you're making: ## For Contributors ### Improving Documentation - Run `pnpm prettier-fix` to fix formatting issues before opening the PR. - Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide ### Adding or Updating Examples - The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md - Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md ### Fixing a bug - Related issues linked using `fixes #number` - Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ### Adding a feature - Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas) - Related issues/discussions are linked using `fixes #number` - e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) - Documentation added - Telemetry added. In case of a feature if it's used or not. - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ## For Maintainers - Minimal description (aim for explaining to someone not on the team to understand the PR) - When linking to a Slack thread, you might want to share details of the conclusion - Link both the Linear (Fixes NEXT-xxx) and the GitHub issues - Add review comments if necessary to explain to the reviewer the logic behind a change ### What? ### Why? ### How? Closes NEXT- Fixes https://github.com/vercel/next.js/discussions/67120 --> --------- Co-authored-by: JJ Kasper <[email protected]>
This commit is contained in:
co-authored by
JJ Kasper
parent
c4ccacee89
commit
ce9c28fa2c
@@ -1,8 +1,9 @@
|
||||
import fs from 'fs'
|
||||
import path from 'path'
|
||||
import fs from 'node:fs'
|
||||
import path from 'node:path'
|
||||
import { X509Certificate, createPrivateKey } from 'node:crypto'
|
||||
import { getCacheDirectory } from './helpers/get-cache-directory'
|
||||
import * as Log from '../build/output/log'
|
||||
import { execSync } from 'child_process'
|
||||
import { execSync } from 'node:child_process'
|
||||
const { WritableStream } = require('node:stream/web') as {
|
||||
WritableStream: typeof global.WritableStream
|
||||
}
|
||||
@@ -112,6 +113,25 @@ export async function createSelfSignedCertificate(
|
||||
const keyPath = path.resolve(resolvedCertDir, 'localhost-key.pem')
|
||||
const certPath = path.resolve(resolvedCertDir, 'localhost.pem')
|
||||
|
||||
if (fs.existsSync(keyPath) && fs.existsSync(certPath)) {
|
||||
const cert = new X509Certificate(fs.readFileSync(certPath))
|
||||
const key = fs.readFileSync(keyPath)
|
||||
|
||||
if (
|
||||
cert.checkHost(host ?? 'localhost') &&
|
||||
cert.checkPrivateKey(createPrivateKey(key))
|
||||
) {
|
||||
Log.info('Using already generated self signed certificate')
|
||||
const caLocation = execSync(`"${binaryPath}" -CAROOT`).toString().trim()
|
||||
|
||||
return {
|
||||
key: keyPath,
|
||||
cert: certPath,
|
||||
rootCA: `${caLocation}/rootCA.pem`,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Log.info(
|
||||
'Attempting to generate self signed certificate. This may prompt for your password'
|
||||
)
|
||||
|
||||
@@ -33,4 +33,13 @@ describe('experimental-https-server (generated certificate)', () => {
|
||||
const html = await renderViaHTTP(next.url, '/2', undefined, { agent })
|
||||
expect(html).toContain('Hello from Pages')
|
||||
})
|
||||
|
||||
it('should successfully reuse generated certificates', async () => {
|
||||
await next.stop()
|
||||
await next.start()
|
||||
expect(next.url).toInclude('https://')
|
||||
expect(next.cliOutput).toContain(
|
||||
'Using already generated self signed certificate'
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -79,8 +79,6 @@ export class NextInstance {
|
||||
this.env = {}
|
||||
Object.assign(this, opts)
|
||||
|
||||
require('console').log('packageJson??', this.packageJson)
|
||||
|
||||
if (!isNextDeploy) {
|
||||
this.env = {
|
||||
...this.env,
|
||||
|
||||
Reference in New Issue
Block a user