From d0c02045c2d148ef7f4d1275bb8085c6a69992b5 Mon Sep 17 00:00:00 2001 From: Jack Hsu Date: Wed, 1 May 2024 14:50:59 -0400 Subject: [PATCH] chore(misc): fix e2e tests --- e2e/cypress/src/cypress.test.ts | 4 +-- e2e/next/src/next-component-tests.test.ts | 4 +-- e2e/web/src/web-legacy.test.ts | 4 +-- e2e/web/src/web.test.ts | 40 +++++++++++------------ 4 files changed, 26 insertions(+), 26 deletions(-) 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-legacy.test.ts b/e2e/web/src/web-legacy.test.ts index 05dd0839055917..c44633e7bd3ec4 100644 --- a/e2e/web/src/web-legacy.test.ts +++ b/e2e/web/src/web-legacy.test.ts @@ -244,7 +244,7 @@ describe('index.html interpolation (legacy)', () => {
-
Nx Variable: %NX_VARIABLE%
+
Nx Variable: %NX_PUBLIC_VARIABLE%
Some other variable: %SOME_OTHER_VARIABLE%
Deploy Url: %DEPLOY_URL%
@@ -252,7 +252,7 @@ describe('index.html interpolation (legacy)', () => { `; const envFilePath = `apps/${appName}/.env`; const envFileContents = ` - NX_VARIABLE=foo + NX_PUBLIC_VARIABLE=foo SOME_OTHER_VARIABLE=bar }`; diff --git a/e2e/web/src/web.test.ts b/e2e/web/src/web.test.ts index 67c13f0eb73140..46f1910b24e946 100644 --- a/e2e/web/src/web.test.ts +++ b/e2e/web/src/web.test.ts @@ -243,39 +243,39 @@ describe('CLI - Environment Variables', () => { //test if the Nx CLI loads root .env vars updateFile( `.env`, - 'NX_WS_BASE=ws-base\nNX_SHARED_ENV=shared-in-workspace-base' + 'NX_PUBLIC_WS_BASE=ws-base\nNX_PUBLIC_SHARED_ENV=shared-in-workspace-base' ); updateFile( `.env.local`, - 'NX_WS_ENV_LOCAL=ws-env-local\nNX_SHARED_ENV=shared-in-workspace-env-local' + 'NX_PUBLIC_WS_ENV_LOCAL=ws-env-local\nNX_PUBLIC_SHARED_ENV=shared-in-workspace-env-local' ); updateFile( `.local.env`, - 'NX_WS_LOCAL_ENV=ws-local-env\nNX_SHARED_ENV=shared-in-workspace-local-env' + 'NX_PUBLIC_WS_LOCAL_ENV=ws-local-env\nNX_PUBLIC_SHARED_ENV=shared-in-workspace-local-env' ); updateFile( `apps/${appName}/.env`, - 'NX_APP_BASE=app-base\nNX_SHARED_ENV=shared-in-app-base' + 'NX_PUBLIC_APP_BASE=app-base\nNX_PUBLIC_SHARED_ENV=shared-in-app-base' ); updateFile( `apps/${appName}/.env.local`, - 'NX_APP_ENV_LOCAL=app-env-local\nNX_SHARED_ENV=shared-in-app-env-local' + 'NX_PUBLIC_APP_ENV_LOCAL=app-env-local\nNX_PUBLIC_SHARED_ENV=shared-in-app-env-local' ); updateFile( `apps/${appName}/.local.env`, - 'NX_APP_LOCAL_ENV=app-local-env\nNX_SHARED_ENV=shared-in-app-local-env' + 'NX_PUBLIC_APP_LOCAL_ENV=app-local-env\nNX_PUBLIC_SHARED_ENV=shared-in-app-local-env' ); const main = `apps/${appName}/src/main.ts`; const newCode = ` - const envVars = [process.env.NODE_ENV, process.env.NX_WS_BASE, process.env.NX_WS_ENV_LOCAL, process.env.NX_WS_LOCAL_ENV, process.env.NX_APP_BASE, process.env.NX_APP_ENV_LOCAL, process.env.NX_APP_LOCAL_ENV, process.env.NX_SHARED_ENV]; + const envVars = [process.env.NODE_ENV, process.env.NX_PUBLIC_WS_BASE, process.env.NX_PUBLIC_WS_ENV_LOCAL, process.env.NX_PUBLIC_WS_LOCAL_ENV, process.env.NX_PUBLIC_APP_BASE, process.env.NX_PUBLIC_APP_ENV_LOCAL, process.env.NX_PUBLIC_APP_LOCAL_ENV, process.env.NX_PUBLIC_SHARED_ENV]; const nodeEnv = process.env.NODE_ENV; - const nxWsBase = process.env.NX_WS_BASE; - const nxWsEnvLocal = process.env.NX_WS_ENV_LOCAL; - const nxWsLocalEnv = process.env.NX_WS_LOCAL_ENV; - const nxAppBase = process.env.NX_APP_BASE; - const nxAppEnvLocal = process.env.NX_APP_ENV_LOCAL; - const nxAppLocalEnv = process.env.NX_APP_LOCAL_ENV; - const nxSharedEnv = process.env.NX_SHARED_ENV; + const nxWsBase = process.env.NX_PUBLIC_WS_BASE; + const nxWsEnvLocal = process.env.NX_PUBLIC_WS_ENV_LOCAL; + const nxWsLocalEnv = process.env.NX_PUBLIC_WS_LOCAL_ENV; + const nxAppBase = process.env.NX_PUBLIC_APP_BASE; + const nxAppEnvLocal = process.env.NX_PUBLIC_APP_ENV_LOCAL; + const nxAppLocalEnv = process.env.NX_PUBLIC_APP_LOCAL_ENV; + const nxSharedEnv = process.env.NX_PUBLIC_SHARED_ENV; `; runCLI( @@ -290,18 +290,18 @@ describe('CLI - Environment Variables', () => { updateFile( `apps/${appName2}/.env`, - 'NX_APP_BASE=app2-base\nNX_SHARED_ENV=shared2-in-app-base' + 'NX_PUBLIC_APP_BASE=app2-base\nNX_PUBLIC_SHARED_ENV=shared2-in-app-base' ); updateFile( `apps/${appName2}/.env.local`, - 'NX_APP_ENV_LOCAL=app2-env-local\nNX_SHARED_ENV=shared2-in-app-env-local' + 'NX_PUBLIC_APP_ENV_LOCAL=app2-env-local\nNX_PUBLIC_SHARED_ENV=shared2-in-app-env-local' ); updateFile( `apps/${appName2}/.local.env`, - 'NX_APP_LOCAL_ENV=app2-local-env\nNX_SHARED_ENV=shared2-in-app-local-env' + 'NX_PUBLIC_APP_LOCAL_ENV=app2-local-env\nNX_PUBLIC_SHARED_ENV=shared2-in-app-local-env' ); const main2 = `apps/${appName2}/src/main.ts`; - const newCode2 = `const envVars = [process.env.NODE_ENV, process.env.NX_WS_BASE, process.env.NX_WS_ENV_LOCAL, process.env.NX_WS_LOCAL_ENV, process.env.NX_APP_BASE, process.env.NX_APP_ENV_LOCAL, process.env.NX_APP_LOCAL_ENV, process.env.NX_SHARED_ENV];`; + const newCode2 = `const envVars = [process.env.NODE_ENV, process.env.NX_PUBLIC_WS_BASE, process.env.NX_PUBLIC_WS_ENV_LOCAL, process.env.NX_PUBLIC_WS_LOCAL_ENV, process.env.NX_PUBLIC_APP_BASE, process.env.NX_PUBLIC_APP_ENV_LOCAL, process.env.NX_PUBLIC_APP_LOCAL_ENV, process.env.NX_PUBLIC_SHARED_ENV];`; runCLI( `generate @nx/web:app ${appName2} --bundler=webpack --no-interactive --compiler=babel` @@ -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 }`;