Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 🚀
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
20 changes: 20 additions & 0 deletions apps/ng-styled-webpage-e2e/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -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,
},
});
12 changes: 0 additions & 12 deletions apps/ng-styled-webpage-e2e/cypress.json

This file was deleted.

5 changes: 3 additions & 2 deletions apps/ng-styled-webpage-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion apps/ng-styled-webpage-e2e/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down