diff --git a/e2e/cypress/src/cypress.test.ts b/e2e/cypress/src/cypress.test.ts index 8e80c004ace95c..e9552d2537032e 100644 --- a/e2e/cypress/src/cypress.test.ts +++ b/e2e/cypress/src/cypress.test.ts @@ -154,10 +154,10 @@ export default defineConfig({ async () => { const appName = uniq('next-cy-app'); runCLI( - `generate @nx/next:app ${appName} --e2eTestRunner=none --no-interactive` + `generate @nx/next:app ${appName} --directory=apps/${appName} --e2eTestRunner=none --no-interactive --projectNameAndRootFormat=as-provided` ); runCLI( - `generate @nx/next:component btn --project=${appName} --no-interactive` + `generate @nx/next:component btn --project=${appName} --directory=apps/${appName}/components --nameAndDirectoryFormat=as-provided --no-interactive` ); runCLI( `generate @nx/next:cypress-component-configuration --project=${appName} --generate-tests --no-interactive` diff --git a/e2e/next/src/next-component-tests.test.ts b/e2e/next/src/next-component-tests.test.ts index e25a328a8aa34d..3219f4dafc0470 100644 --- a/e2e/next/src/next-component-tests.test.ts +++ b/e2e/next/src/next-component-tests.test.ts @@ -118,10 +118,10 @@ function addBabelSupport(path: string) { function createAppWithCt(appName: string) { runCLI( - `generate @nx/next:app ${appName} --no-interactive --appDir=false --src=false` + `generate @nx/next:app ${appName} --directory=apps/${appName} --no-interactive --appDir=false --src=false --projectNameAndRootFormat=as-provided` ); runCLI( - `generate @nx/next:component button --project=${appName} --directory=components --flat --no-interactive` + `generate @nx/next:component button --project=${appName} --directory=apps/${appName}/components --nameAndDirectoryFormat=as-provided --no-interactive` ); createFile( `apps/${appName}/public/data.json`, diff --git a/e2e/web/src/web.test.ts b/e2e/web/src/web.test.ts index 67c13f0eb73140..6808dcf1bf7633 100644 --- a/e2e/web/src/web.test.ts +++ b/e2e/web/src/web.test.ts @@ -361,14 +361,14 @@ describe('index.html interpolation', () => {
-
Nx Variable: %NX_VARIABLE%
+
Nx Variable: %NX_PUBLIC_VARIABLE%
Some other variable: %SOME_OTHER_VARIABLE%
`; const envFilePath = `apps/${appName}/.env`; const envFileContents = ` - NX_VARIABLE=foo + NX_PUBLIC_VARIABLE=foo SOME_OTHER_VARIABLE=bar }`;