diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1eaecf..94f048e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: node-version: '18' - name: Install Dependencies 🔧 - run: npm install --no-package-lock + run: npm install --no-package-lock --legacy-peer-deps - run: npx nx-cloud start-ci-run - run: npx nx affected --target=build --parallel --max-parallel=3 @@ -50,7 +50,7 @@ jobs: node-version: '18' - name: Install Dependencies - run: npm install --no-package-lock + run: npm install --no-package-lock --legacy-peer-deps - run: npx nx-cloud start-ci-run - run: npx nx affected --target=build --parallel --max-parallel=3 @@ -72,7 +72,7 @@ jobs: node-version: '18' - name: Install Dependencies - run: npm install --no-package-lock + run: npm install --no-package-lock --legacy-peer-deps - name: Start Nx Agent ${{ matrix.agent }} run: npx nx-cloud start-agent diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 38bfc5b..0b4ee89 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -22,7 +22,7 @@ jobs: fetch-depth: 0 - name: Install Dependencies 🔧 - run: npm install --no-package-lock + run: npm install --no-package-lock --legacy-peer-deps - run: npm run build -- --prod --baseHref=/ng-styled/ - name: Deploy to GitHub Pages 🚀 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 95c74d3..551129c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: uses: actions/checkout@v2 - name: Install Dependencies 🔧 - run: npm install --no-package-lock + run: npm install --no-package-lock --legacy-peer-deps - name: Lint Workspace & Code run: | diff --git a/apps/ng-styled-webpage-e2e/cypress.config.ts b/apps/ng-styled-webpage-e2e/cypress.config.ts new file mode 100644 index 0000000..3d1ea1f --- /dev/null +++ b/apps/ng-styled-webpage-e2e/cypress.config.ts @@ -0,0 +1,20 @@ +import { defineConfig } from 'cypress'; +import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset'; + +const cypressJsonConfig = { + fileServerFolder: '.', + fixturesFolder: './src/fixtures', + video: true, + videosFolder: '../../dist/cypress/apps/ng-styled-webpage-e2e/videos', + screenshotsFolder: + '../../dist/cypress/apps/ng-styled-webpage-e2e/screenshots', + chromeWebSecurity: false, + specPattern: 'src/e2e/**/*.cy.{js,jsx,ts,tsx}', + supportFile: 'src/support/e2e.ts', +}; +export default defineConfig({ + e2e: { + ...nxE2EPreset(__dirname), + ...cypressJsonConfig, + }, +}); diff --git a/apps/ng-styled-webpage-e2e/cypress.json b/apps/ng-styled-webpage-e2e/cypress.json deleted file mode 100644 index 876afb1..0000000 --- a/apps/ng-styled-webpage-e2e/cypress.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "fileServerFolder": ".", - "fixturesFolder": "./src/fixtures", - "integrationFolder": "./src/integration", - "modifyObstructiveCode": false, - "supportFile": "./src/support/index.ts", - "pluginsFile": false, - "video": true, - "videosFolder": "../../dist/cypress/apps/ng-styled-webpage-e2e/videos", - "screenshotsFolder": "../../dist/cypress/apps/ng-styled-webpage-e2e/screenshots", - "chromeWebSecurity": false -} diff --git a/apps/ng-styled-webpage-e2e/project.json b/apps/ng-styled-webpage-e2e/project.json index 29e5216..644954e 100644 --- a/apps/ng-styled-webpage-e2e/project.json +++ b/apps/ng-styled-webpage-e2e/project.json @@ -7,8 +7,9 @@ "e2e": { "executor": "@nrwl/cypress:cypress", "options": { - "cypressConfig": "apps/ng-styled-webpage-e2e/cypress.json", - "devServerTarget": "ng-styled-webpage:serve:development" + "cypressConfig": "apps/ng-styled-webpage-e2e/cypress.config.ts", + "devServerTarget": "ng-styled-webpage:serve:development", + "testingType": "e2e" }, "configurations": { "production": { diff --git a/apps/ng-styled-webpage-e2e/src/integration/app.spec.ts b/apps/ng-styled-webpage-e2e/src/e2e/app.cy.ts similarity index 100% rename from apps/ng-styled-webpage-e2e/src/integration/app.spec.ts rename to apps/ng-styled-webpage-e2e/src/e2e/app.cy.ts diff --git a/apps/ng-styled-webpage-e2e/src/support/index.ts b/apps/ng-styled-webpage-e2e/src/support/e2e.ts similarity index 100% rename from apps/ng-styled-webpage-e2e/src/support/index.ts rename to apps/ng-styled-webpage-e2e/src/support/e2e.ts diff --git a/apps/ng-styled-webpage-e2e/tsconfig.json b/apps/ng-styled-webpage-e2e/tsconfig.json index eed4779..ffdcf97 100644 --- a/apps/ng-styled-webpage-e2e/tsconfig.json +++ b/apps/ng-styled-webpage-e2e/tsconfig.json @@ -12,7 +12,7 @@ "noImplicitReturns": true, "noFallthroughCasesInSwitch": true }, - "include": ["src/**/*.ts", "src/**/*.js"], + "include": ["src/**/*.ts", "src/**/*.js", "cypress.config.ts"], "angularCompilerOptions": { "strictInjectionParameters": true, "strictInputAccessModifiers": true, diff --git a/package.json b/package.json index 366be81..04d0d32 100644 --- a/package.json +++ b/package.json @@ -68,17 +68,17 @@ }, "devDependencies": { "@angular-devkit/build-angular": "~15.0.0", - "@angular-eslint/eslint-plugin": "~14.0.4", - "@angular-eslint/eslint-plugin-template": "~14.0.4", - "@angular-eslint/template-parser": "~14.0.4", - "@angular/cli": "~15.0.0", - "@angular/compiler-cli": "~15.0.0", - "@angular/language-service": "~15.0.0", - "@commitlint/cli": "^16.2.1", + "@angular-eslint/eslint-plugin": "~15.1.0", + "@angular-eslint/eslint-plugin-template": "~15.1.0", + "@angular-eslint/template-parser": "~15.1.0", + "@angular/cli": "~15.0.1", + "@angular/compiler-cli": "~15.0.1", + "@angular/language-service": "~15.0.1", + "@commitlint/cli": "^17.3.0", "@commitlint/config-angular": "^17.3.0", - "@commitlint/config-conventional": "^16.2.1", - "@commitlint/prompt-cli": "^16.2.1", - "@nguniversal/builders": "15.0.0", + "@commitlint/config-conventional": "^17.3.0", + "@commitlint/prompt-cli": "^17.3.0", + "@nguniversal/builders": "~15.0.0", "@nrwl/cli": "15.2.1", "@nrwl/cypress": "15.2.1", "@nrwl/eslint-plugin-nx": "15.2.1", @@ -100,8 +100,8 @@ "eslint-config-prettier": "8.4.0", "eslint-plugin-cypress": "^2.10.3", "hasky": "^3.0.2", - "jest": "~28.1.3", - "jest-environment-jsdom": "~28.1.1", + "jest": "28.1.1", + "jest-environment-jsdom": "28.1.1", "jest-preset-angular": "~12.2.2", "lint-staged": "^12.3.4", "ng-packagr": "~15.0.0",