mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-04-24 07:59:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: change symlinks to avoid conflict (#18507)

Browse Source
This commit is contained in:
Lachlan Miller
2021-10-16 00:59:30 +10:00
committed by GitHub
parent bdfc4a7b80
commit d52a1137f1
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/frontend-shared/cypress/e2e/support/e2eSupport.ts
+2 -2
View File
@@ -103,7 +103,7 @@ function visitApp () {
throw new Error(`Missing serverPort - did you forget to call cy.initializeApp(...) ?`)
}
return cy.visit(`dist-app/index.html?gqlPort=${e2e_gqlPort}&serverPort=${e2e_serverPort}`)
return cy.visit(`dist-app-e2e/index.html?gqlPort=${e2e_gqlPort}&serverPort=${e2e_serverPort}`)
}
function visitLaunchpad (hash?: string) {
@@ -113,7 +113,7 @@ function visitLaunchpad (hash?: string) {
throw new Error(`Missing gqlPort - did you forget to call cy.setupE2E(...) ?`)
}
cy.visit(`dist-launchpad/index.html?gqlPort=${e2e_gqlPort}`)
cy.visit(`dist-launchpad-e2e/index.html?gqlPort=${e2e_gqlPort}`)
}
const pageLoadId = `uid${Math.random()}`
scripts/gulp/tasks/gulpVite.ts
+6 -6
View File
@@ -74,19 +74,19 @@ function spawnViteDevServer (
export async function symlinkViteProjects () {
await Promise.all([
spawned('cmd-symlink', 'ln -s ../app/dist dist-app', {
spawned('cmd-symlink', 'ln -s ../app/dist-app-e2e dist-app', {
cwd: monorepoPaths.pkgLaunchpad,
waitForExit: true,
}).catch((e) => {}),
spawned('cmd-symlink', 'ln -s dist dist-app', {
spawned('cmd-symlink', 'ln -s dist-launchpad-e2e dist-app', {
cwd: monorepoPaths.pkgApp,
waitForExit: true,
}).catch((e) => {}),
spawned('cmd-symlink', 'ln -s dist dist-launchpad', {
spawned('cmd-symlink', 'ln -s dist-app-e2e dist-launchpad', {
cwd: monorepoPaths.pkgLaunchpad,
waitForExit: true,
}).catch((e) => {}),
spawned('cmd-symlink', 'ln -s ../launchpad/dist dist-launchpad', {
spawned('cmd-symlink', 'ln -s ../launchpad/dist-launchpad-e2e dist-launchpad', {
cwd: monorepoPaths.pkgApp,
waitForExit: true,
}).catch((e) => {}),
@@ -94,7 +94,7 @@ export async function symlinkViteProjects () {
}
export function viteBuildApp () {
return spawned('vite:build-app', `yarn vite build`, {
return spawned('vite:build-app', `yarn vite build --outDir dist-app-e2e`, {
cwd: monorepoPaths.pkgApp,
waitForExit: true,
env: {
@@ -115,7 +115,7 @@ export function viteBuildAndWatchApp () {
}
export function viteBuildLaunchpad () {
return spawned('vite:build-launchpad', `yarn vite build`, {
return spawned('vite:build-launchpad', `yarn vite build --outDir dist-launchpad-e2e`, {
cwd: monorepoPaths.pkgLaunchpad,
waitForExit: true,
})