Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: framework detection test race condition #6564

Merged
merged 9 commits into from
May 9, 2024
Merged

fix: framework detection test race condition #6564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1e7ed8c
chore: replace deprecated buildAsync call
mrstork May 7, 2024
9cac214
chore: don't mix await and .then()
mrstork May 7, 2024
8e4b812
chore: move away from deprecated withSiteBuilder implementation
mrstork May 7, 2024
cf3c115
test: remove final reference to cleanupAsync and remove function
mrstork May 7, 2024
adfd122
test: remove redundant and flaky test
mrstork May 7, 2024
3b155b3
fix: clean up a few lint warnings
mrstork May 7, 2024
fdbeb40
Merge branch 'main' into fix/framework-detection-test-race-condition
mrstork May 8, 2024
dd5329f
Merge branch 'main' into fix/framework-detection-test-race-condition
mrstork May 9, 2024
840efed
Merge branch 'main' into fix/framework-detection-test-race-condition
mrstork May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/utils/dev.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,15 @@ export const injectEnvVariables = (env) => {
}
}

// @ts-expect-error TS(7031) FIXME: Binding element 'configuredPort' implicitly has an... Remove this comment to see the full error message
export const acquirePort = async ({ configuredPort, defaultPort, errorMessage }) => {
export const acquirePort = async ({
configuredPort,
defaultPort,
errorMessage,
}: {
configuredPort?: number
defaultPort: number
errorMessage: string
}) => {
const acquiredPort = await getPort({ port: configuredPort || defaultPort })
if (configuredPort && acquiredPort !== configuredPort) {
throw new Error(`${errorMessage}: '${configuredPort}'`)
Expand Down
25 changes: 5 additions & 20 deletions tests/integration/__snapshots__/framework-detection.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`frameworks/framework-detection > should default to process.cwd() and st
◈ Unable to determine public folder to serve files from. Using current working directory
◈ Setup a netlify.toml file with a [dev] section to specify your dev server settings.
◈ See docs at: https://docs.netlify.com/cli/local-development/#project-detection
◈ Running static server from \\"site-with-index-file\\"
◈ Running static server from \\"should-default-to-process-cwd-and-static-server\\"
◈ Setting up local development server

◈ Static server listening to 88888
Expand Down Expand Up @@ -35,7 +35,7 @@ exports[`frameworks/framework-detection > should filter frameworks with no dev c
◈ Unable to determine public folder to serve files from. Using current working directory
◈ Setup a netlify.toml file with a [dev] section to specify your dev server settings.
◈ See docs at: https://docs.netlify.com/cli/local-development/#project-detection
◈ Running static server from \\"site-with-gulp\\"
◈ Running static server from \\"should-filter-frameworks-with-no-dev-command\\"
◈ Setting up local development server

◈ Static server listening to 88888
Expand All @@ -54,21 +54,6 @@ exports[`frameworks/framework-detection > should force a specific framework when
◈ Failed running command: react-scripts start. Please verify 'react-scripts' exists"
`;

exports[`frameworks/framework-detection > should log the command if using static server and \`command\` is configured 1`] = `
"◈ Netlify Dev ◈
◈ Using simple static server because '--dir' flag was specified
◈ Running static server from \\"site-with-index-file/public\\"
◈ Setting up local development server

◈ Static server listening to 88888

┌──────────────────────────────────────────────────┐
│ │
│ ◈ Server now ready on http://localhost:88888 │
│ │
└──────────────────────────────────────────────────┘"
`;

exports[`frameworks/framework-detection > should not run framework detection if command and targetPort are configured 1`] = `
"◈ Netlify Dev ◈
◈ Unable to determine public folder to serve files from. Using current working directory
Expand Down Expand Up @@ -162,7 +147,7 @@ exports[`frameworks/framework-detection > should throw when forcing a non suppor
exports[`frameworks/framework-detection > should use static server when --dir flag is passed 1`] = `
"◈ Netlify Dev ◈
◈ Using simple static server because '--dir' flag was specified
◈ Running static server from \\"site-with-index-file/public\\"
◈ Running static server from \\"should-use-static-server-when-dir-flag-is-passed/public\\"
◈ Setting up local development server

◈ Static server listening to 88888
Expand All @@ -180,7 +165,7 @@ exports[`frameworks/framework-detection > should use static server when framewor
◈ Unable to determine public folder to serve files from. Using current working directory
◈ Setup a netlify.toml file with a [dev] section to specify your dev server settings.
◈ See docs at: https://docs.netlify.com/cli/local-development/#project-detection
◈ Running static server from \\"site-with-index-file\\"
◈ Running static server from \\"should-use-static-server-when-framework-is-set-to-static\\"
◈ Setting up local development server

◈ Static server listening to 88888
Expand All @@ -197,7 +182,7 @@ exports[`frameworks/framework-detection > should warn if using static server and
◈ Using simple static server because '--dir' flag was specified
◈ Ignoring 'targetPort' setting since using a simple static server.
◈ Use --staticServerPort or [dev.staticServerPort] to configure the static server port
◈ Running static server from \\"site-with-index-file/public\\"
◈ Running static server from \\"should-warn-if-using-static-server-and-target-port-is-configured/public\\"
◈ Setting up local development server

◈ Static server listening to 88888
Expand Down
Loading
Loading