Skip to content

Commit 3988c5d

Browse files
rafalwolakrafalwolak
authored
Merge pull request #284 from design4pro/develop
feat(package): cypress update
2 parents ee5cca4 + 8f015f3 commit 3988c5d

10 files changed

Lines changed: 41 additions & 32 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
node-version: '18'
2727

2828
- name: Install Dependencies 🔧
29-
run: npm install --no-package-lock
29+
run: npm install --no-package-lock --legacy-peer-deps
3030

3131
- run: npx nx-cloud start-ci-run
3232
- run: npx nx affected --target=build --parallel --max-parallel=3
@@ -50,7 +50,7 @@ jobs:
5050
node-version: '18'
5151

5252
- name: Install Dependencies
53-
run: npm install --no-package-lock
53+
run: npm install --no-package-lock --legacy-peer-deps
5454

5555
- run: npx nx-cloud start-ci-run
5656
- run: npx nx affected --target=build --parallel --max-parallel=3
@@ -72,7 +72,7 @@ jobs:
7272
node-version: '18'
7373

7474
- name: Install Dependencies
75-
run: npm install --no-package-lock
75+
run: npm install --no-package-lock --legacy-peer-deps
7676

7777
- name: Start Nx Agent ${{ matrix.agent }}
7878
run: npx nx-cloud start-agent

‎.github/workflows/gh-pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fetch-depth: 0
2323

2424
- name: Install Dependencies 🔧
25-
run: npm install --no-package-lock
25+
run: npm install --no-package-lock --legacy-peer-deps
2626
- run: npm run build -- --prod --baseHref=/ng-styled/
2727

2828
- name: Deploy to GitHub Pages 🚀

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v2
2222

2323
- name: Install Dependencies 🔧
24-
run: npm install --no-package-lock
24+
run: npm install --no-package-lock --legacy-peer-deps
2525

2626
- name: Lint Workspace & Code
2727
run: |

‎apps/ng-styled-webpage-e2e/cypress.config.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { defineConfig } from 'cypress';
2+
import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
3+
4+
const cypressJsonConfig = {
5+
fileServerFolder: '.',
6+
fixturesFolder: './src/fixtures',
7+
video: true,
8+
videosFolder: '../../dist/cypress/apps/ng-styled-webpage-e2e/videos',
9+
screenshotsFolder:
10+
'../../dist/cypress/apps/ng-styled-webpage-e2e/screenshots',
11+
chromeWebSecurity: false,
12+
specPattern: 'src/e2e/**/*.cy.{js,jsx,ts,tsx}',
13+
supportFile: 'src/support/e2e.ts',
14+
};
15+
export default defineConfig({
16+
e2e: {
17+
...nxE2EPreset(__dirname),
18+
...cypressJsonConfig,
19+
},
20+
});

‎apps/ng-styled-webpage-e2e/cypress.json‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎apps/ng-styled-webpage-e2e/project.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
"e2e": {
88
"executor": "@nrwl/cypress:cypress",
99
"options": {
10-
"cypressConfig": "apps/ng-styled-webpage-e2e/cypress.json",
11-
"devServerTarget": "ng-styled-webpage:serve:development"
10+
"cypressConfig": "apps/ng-styled-webpage-e2e/cypress.config.ts",
11+
"devServerTarget": "ng-styled-webpage:serve:development",
12+
"testingType": "e2e"
1213
},
1314
"configurations": {
1415
"production": {

apps/ng-styled-webpage-e2e/src/integration/app.spec.ts renamed to apps/ng-styled-webpage-e2e/src/e2e/app.cy.ts

File renamed without changes.

apps/ng-styled-webpage-e2e/src/support/index.ts renamed to apps/ng-styled-webpage-e2e/src/support/e2e.ts

File renamed without changes.

‎apps/ng-styled-webpage-e2e/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"noImplicitReturns": true,
1313
"noFallthroughCasesInSwitch": true
1414
},
15-
"include": ["src/**/*.ts", "src/**/*.js"],
15+
"include": ["src/**/*.ts", "src/**/*.js", "cypress.config.ts"],
1616
"angularCompilerOptions": {
1717
"strictInjectionParameters": true,
1818
"strictInputAccessModifiers": true,

‎package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,17 @@
6868
},
6969
"devDependencies": {
7070
"@angular-devkit/build-angular": "~15.0.0",
71-
"@angular-eslint/eslint-plugin": "~14.0.4",
72-
"@angular-eslint/eslint-plugin-template": "~14.0.4",
73-
"@angular-eslint/template-parser": "~14.0.4",
74-
"@angular/cli": "~15.0.0",
75-
"@angular/compiler-cli": "~15.0.0",
76-
"@angular/language-service": "~15.0.0",
77-
"@commitlint/cli": "^16.2.1",
71+
"@angular-eslint/eslint-plugin": "~15.1.0",
72+
"@angular-eslint/eslint-plugin-template": "~15.1.0",
73+
"@angular-eslint/template-parser": "~15.1.0",
74+
"@angular/cli": "~15.0.1",
75+
"@angular/compiler-cli": "~15.0.1",
76+
"@angular/language-service": "~15.0.1",
77+
"@commitlint/cli": "^17.3.0",
7878
"@commitlint/config-angular": "^17.3.0",
79-
"@commitlint/config-conventional": "^16.2.1",
80-
"@commitlint/prompt-cli": "^16.2.1",
81-
"@nguniversal/builders": "15.0.0",
79+
"@commitlint/config-conventional": "^17.3.0",
80+
"@commitlint/prompt-cli": "^17.3.0",
81+
"@nguniversal/builders": "~15.0.0",
8282
"@nrwl/cli": "15.2.1",
8383
"@nrwl/cypress": "15.2.1",
8484
"@nrwl/eslint-plugin-nx": "15.2.1",
@@ -100,8 +100,8 @@
100100
"eslint-config-prettier": "8.4.0",
101101
"eslint-plugin-cypress": "^2.10.3",
102102
"hasky": "^3.0.2",
103-
"jest": "~28.1.3",
104-
"jest-environment-jsdom": "~28.1.1",
103+
"jest": "28.1.1",
104+
"jest-environment-jsdom": "28.1.1",
105105
"jest-preset-angular": "~12.2.2",
106106
"lint-staged": "^12.3.4",
107107
"ng-packagr": "~15.0.0",

0 commit comments

Comments
 (0)