Skip to content

Commit 0d8aaac

Browse files
honzikechonzikec
authored
chore: update ng and nx to 16 (#173)
* chore: nx migrate + small manual updates * chore: remove migrations, update more packages * fix: e2e tests * fix: remove references to deleted files * fix: e2e config for vue-showcase
1 parent b84c27e commit 0d8aaac

12 files changed

Lines changed: 13824 additions & 19552 deletions

‎apps/showcase-e2e/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"executor": "@nrwl/cypress:cypress",
99
"options": {
1010
"cypressConfig": "apps/showcase-e2e/cypress.config.ts",
11-
"tsConfig": "apps/showcase-e2e/tsconfig.e2e.json",
11+
"tsConfig": "apps/showcase-e2e/tsconfig.json",
1212
"devServerTarget": "showcase:serve",
1313
"testingType": "e2e"
1414
},

‎apps/showcase-e2e/src/e2e/cypress-indexeddb.cy.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,11 @@ describe(`@this-dot/cypress-indexeddb`, () => {
118118
cy.get(`[data-test-id="row_2"]`).should('be.visible').should('contain', 'test2');
119119
cy.get(`[data-test-id="row_3"]`).should('be.visible').should('contain', '1337');
120120

121-
cy.get(`[data-test-id="add-to-queue-input"]`)
122-
.should('be.visible')
123-
.and('not.be.disabled')
124-
.type(`something{enter}`)
125-
.type(`anything{enter}`)
126-
.type(`whatever{enter}`)
127-
.type(`seriously{enter}`);
121+
cy.get(`[data-test-id="add-to-queue-input"]`).should('be.visible').and('not.be.disabled');
122+
cy.get(`[data-test-id="add-to-queue-input"]`).type(`something{enter}`);
123+
cy.get(`[data-test-id="add-to-queue-input"]`).type(`anything{enter}`);
124+
cy.get(`[data-test-id="add-to-queue-input"]`).type(`whatever{enter}`);
125+
cy.get(`[data-test-id="add-to-queue-input"]`).type(`seriously{enter}`);
128126

129127
cy.getStore('@test_add_item')
130128
.entries()

‎apps/showcase-e2e/src/e2e/route-config.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ describe(`@thisdot/route-config`, () => {
7474
cy.visit('/route-tags/second');
7575
cy.url().should('contain', 'route-tags/second');
7676

77+
cy.get('[data-test-id="custom prop selector"]').click();
7778
cy.get('[data-test-id="custom prop selector"]')
78-
.click()
7979
.get('mat-option')
8080
.contains('routeTags')
8181
.click();
@@ -90,8 +90,8 @@ describe(`@thisdot/route-config`, () => {
9090
cy.visit('/route-tags/first');
9191
cy.url().should('contain', 'route-tags/first');
9292

93+
cy.get('[data-test-id="custom prop selector"]').click();
9394
cy.get('[data-test-id="custom prop selector"]')
94-
.click()
9595
.get('mat-option')
9696
.contains('routeTags')
9797
.click();

‎apps/showcase-e2e/src/e2e/rxidb-auto-increment.cy.ts‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ describe(`@this-dot/rxidb`, () => {
44
cy.clearIndexedDb('AUTO_INCREMENT');
55
cy.visit('/rxidb/auto-increment');
66

7-
cy.get(`[data-test-id="add-to-queue-input"]`)
8-
.should('be.visible')
9-
.and('not.be.disabled')
10-
.type(`test{enter}`)
11-
.clear()
12-
.type(`test2{enter}`)
13-
.clear()
14-
.type(`1337{enter}`);
7+
cy.get(`[data-test-id="add-to-queue-input"]`).should('be.visible').and('not.be.disabled');
8+
9+
cy.get(`[data-test-id="add-to-queue-input"]`).type(`test{enter}`);
10+
cy.get(`[data-test-id="add-to-queue-input"]`).clear();
11+
cy.get(`[data-test-id="add-to-queue-input"]`).type(`test2{enter}`);
12+
cy.get(`[data-test-id="add-to-queue-input"]`).clear();
13+
cy.get(`[data-test-id="add-to-queue-input"]`).type(`1337{enter}`);
1514
});
1615

1716
it(`can add new values and persist them`, () => {
@@ -25,13 +24,12 @@ describe(`@this-dot/rxidb`, () => {
2524
cy.get(`[data-test-id="row_2"]`).should('be.visible').should('contain', 'test2');
2625
cy.get(`[data-test-id="row_3"]`).should('be.visible').should('contain', '1337');
2726

28-
cy.get(`[data-test-id="add-to-queue-input"]`)
29-
.should('be.visible')
30-
.and('not.be.disabled')
31-
.type(`something{enter}`)
32-
.type(`anything{enter}`)
33-
.type(`whatever{enter}`)
34-
.type(`seriously{enter}`);
27+
cy.get(`[data-test-id="add-to-queue-input"]`).should('be.visible').and('not.be.disabled');
28+
29+
cy.get(`[data-test-id="add-to-queue-input"]`).type(`something{enter}`);
30+
cy.get(`[data-test-id="add-to-queue-input"]`).type(`anything{enter}`);
31+
cy.get(`[data-test-id="add-to-queue-input"]`).type(`whatever{enter}`);
32+
cy.get(`[data-test-id="add-to-queue-input"]`).type(`seriously{enter}`);
3533

3634
cy.get(`[data-test-id="row_4"]`).should('be.visible').should('contain', 'something');
3735
cy.get(`[data-test-id="row_5"]`).should('be.visible').should('contain', 'anything');

‎apps/showcase-e2e/tsconfig.e2e.json‎

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

‎apps/showcase-e2e/tsconfig.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
"extends": "../../tsconfig.base.json",
33
"files": [],
44
"include": [],
5-
"references": [
6-
{
7-
"path": "./tsconfig.e2e.json"
8-
}
9-
]
5+
"compilerOptions": {
6+
"sourceMap": false
7+
}
108
}

‎apps/vue-showcase/components.d.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
// generated by unplugin-vue-components
2-
// We suggest you to commit this file into source control
1+
/* eslint-disable */
2+
/* prettier-ignore */
3+
// @ts-nocheck
4+
// Generated by unplugin-vue-components
35
// Read more: https://github.com/vuejs/core/pull/3399
4-
import '@vue/runtime-core'
6+
export {}
57

6-
declare module '@vue/runtime-core' {
8+
declare module 'vue' {
79
export interface GlobalComponents {
8-
AppLogo: typeof import('./src/app/components/widgets/AppLogo.vue')['default']
9-
RouterLink: typeof import('vue-router')['RouterLink']
10-
RouterView: typeof import('vue-router')['RouterView']
11-
SideBar: typeof import('./src/app/components/widgets/SideBar.vue')['default']
12-
TopBar: typeof import('./src/app/components/widgets/TopBar.vue')['default']
10+
AppLogo: typeof import('./src/app/components/widgets/AppLogo.vue')['default'];
11+
RouterLink: typeof import('vue-router')['RouterLink'];
12+
RouterView: typeof import('vue-router')['RouterView'];
13+
SideBar: typeof import('./src/app/components/widgets/SideBar.vue')['default'];
14+
TopBar: typeof import('./src/app/components/widgets/TopBar.vue')['default'];
1315
}
1416
}
15-
16-
export {}

‎apps/vue-showcase/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"executor": "nx-vue3-vite:cypress",
1818
"options": {
1919
"cypressConfig": "apps/vue-showcase/cypress.config.ts",
20-
"tsConfig": "apps/vue-showcase/tsconfig.e2e.json",
20+
"tsConfig": "apps/vue-showcase/tsconfig.json",
2121
"devServerTarget": "vue-showcase:serve",
2222
"testingType": "e2e"
2323
},

‎apps/vue-showcase/tsconfig.e2e.json‎

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

‎apps/vue-showcase/tsconfig.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"compilerOptions": {
66
"resolveJsonModule": true,
77
"allowSyntheticDefaultImports": true,
8-
"target": "es2020"
8+
"target": "es2020",
9+
"sourceMap": false
910
},
1011
"references": [
1112
{
@@ -16,9 +17,6 @@
1617
},
1718
{
1819
"path": "./tsconfig.editor.json"
19-
},
20-
{
21-
"path": "./tsconfig.e2e.json"
2220
}
2321
]
2422
}

0 commit comments

Comments
 (0)