Skip to content

Commit

Permalink
Merge pull request #5 from electrofLy/develop
Browse files Browse the repository at this point in the history
make release
  • Loading branch information
electrofLy authored May 25, 2023
2 parents 20eb70d + 40dcfad commit 5ae9c44
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 53 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
- name: Unit tests
run: npm run test
- name: Component tests
run: npm run cypress:run:component
run: npm run ct:ci
- name: Build
run: npm run build -- --configuration production
run: npm run build:prod
- name: Deploy to Netlify
uses: nwtgck/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ npm run test
End-to-end tests are written with Cypress and can be run with:

```bash
npm run cypress:run
npm run ct
```

## Contributing
Expand Down
20 changes: 14 additions & 6 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,20 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"proxyConfig": "src/proxy.conf.json"
"proxyConfig": "src/proxy.conf.json",
"open": true
},
"configurations": {
"production": {
"browserTarget": "guessy:build:production"
},
"development": {
"browserTarget": "guessy:build:development"
},
"remote": {
"browserTarget": "guessy:build:development",
"host": "0.0.0.0",
"disableHostCheck": true
}
},
"defaultConfiguration": "development"
Expand Down Expand Up @@ -126,16 +132,18 @@
"headless": false
}
},
"e2e": {
"ct": {
"builder": "@cypress/schematic:cypress",
"options": {
"devServerTarget": "guessy:serve",
"watch": true,
"headless": false
"headless": false,
"browser": "electron",
"component": true
},
"configurations": {
"production": {
"devServerTarget": "guessy:serve:production"
"ci": {
"watch": false,
"headless": true
}
}
}
Expand Down
13 changes: 1 addition & 12 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
import { defineConfig } from 'cypress';

export default defineConfig({
videosFolder: 'cypress/videos',
screenshotsFolder: 'cypress/screenshots',
fixturesFolder: 'cypress/fixtures',

e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
// eslint-disable-next-line @typescript-eslint/no-var-requires
return require('./cypress/plugins/index.ts')(on, config);
},
baseUrl: 'http://localhost:4200'
},

video: false,
component: {
devServer: {
framework: 'angular',
Expand Down
7 changes: 0 additions & 7 deletions cypress/e2e/spec.cy.ts

This file was deleted.

17 changes: 0 additions & 17 deletions cypress/support/e2e.ts

This file was deleted.

14 changes: 6 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
{
"name": "guessy",
"version": "0.0.0",
"version": "1.0.0",
"scripts": {
"ng": "ng",
"start": "ng serve -o",
"start:remote": "npm run start -- --host 0.0.0.0",
"start": "ng serve",
"start:remote": "ng run guessy:serve:remote",
"build": "ng build",
"build:prod": "ng build --configuration production",
"watch": "ng build --watch --configuration development",
"build:prod": "ng run guessy:build:production",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"cypress:open": "cypress open",
"cypress:run:component": "cypress run --component",
"ct": "ng run guessy:ct",
"ct:ci": "ng run guessy:ct:ci",
"prepare": "husky install"
},
"private": true,
Expand Down

1 comment on commit 5ae9c44

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.