Skip to content

Commit 8d450d0

Browse files
authored
refactor(docs): changed to non hashbased routing and ssr (#6711)
* refactor(docs): changed to non hashbased routing and ssr * refactor(docs): updated package-lock.json * fix(e2e): updated e2e * feat(docs): updated ci * feat(ssr-docs); merged development * feat(ssr-docs); merged development * feat(ssr-docs); merged development * feat(ssr-docs); merged development * feat(ssr-docs); merged development * feat(ssr-docs); merged development * feat(ssr-docs); merged development * feat(ssr-docs); merged development * feat(ssr-docs); merged development
1 parent eccb552 commit 8d450d0

35 files changed

+1699
-550
lines changed

.github/workflows/on-push-or-pull.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
# npx nx build --runner=cloud --configuration=production
6767
- run: |
6868
npx nx build ngx-bootstrap --configuration=production
69-
npx nx build --configuration=production
69+
npx nx prerender --configuration=production
7070
7171
7272
# run unit tests
@@ -151,7 +151,7 @@ jobs:
151151
152152
- name: smoke e2e on firebase
153153
if: ${{ needs.firebase_preview.outputs.output_url }}
154-
run: PLAYWRIGHT_TEST_BASE_URL="${{ needs.firebase_preview.outputs.output_url }}/ngx-bootstrap/" npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --skipServe --shard=${{ matrix.shard }}/${{ strategy.job-total }}
154+
run: PLAYWRIGHT_TEST_BASE_URL="${{ needs.firebase_preview.outputs.output_url }}/ngx-bootstrap/" npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --skipServe --shard=${{ matrix.shard }}/${{ strategy.job-total }}
155155

156156
- name: smoke e2e local
157157
if: ${{ !needs.firebase_preview.outputs.output_url }}

.github/workflows/on-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
key: dist-${{ github.run_id }}
5353
- run: |
5454
npx nx build ngx-bootstrap --runner=cloud --configuration=production
55-
npx ng build --runner=cloud --configuration=production
55+
npx nx prerender --runner=cloud --configuration=production
5656
5757
# update release notes in github
5858
# update_release_draft:

apps/ngx-bootstrap-docs-e2e/playwright.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export default defineConfig({
55
testMatch: '**/*.spec.ts',
66
fullyParallel: true,
77
workers: 3,
8+
89
reporter: [['html', { outputFolder: 'playwright-report', open: 'never' }]],
910
use: {
1011
baseURL: process.env['PLAYWRIGHT_TEST_BASE_URL'] || 'http://localhost:4200/ngx-bootstrap/',

apps/ngx-bootstrap-docs-e2e/project.json

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@
44
"sourceRoot": "apps/ngx-bootstrap-docs-e2e/src",
55
"projectType": "application",
66
"tags": [],
7-
"implicitDependencies": ["ngx-bootstrap-docs"],
7+
"implicitDependencies": [
8+
"ngx-bootstrap-docs"
9+
],
810
"targets": {
911
"e2e": {
1012
"executor": "@nxkit/playwright:test",
11-
"outputs": ["{options.outputPath}"],
13+
"outputs": [
14+
"{options.outputPath}"
15+
],
1216
"options": {
1317
"outputPath": "dist/apps/ngx-bootstrap-docs-e2e/test-results",
1418
"playwrightConfig": "apps/ngx-bootstrap-docs-e2e/playwright.config.ts",
@@ -24,8 +28,10 @@
2428
}
2529
},
2630
"debug": {
27-
"builder": "@nxkit/playwright:test",
28-
"outputs": ["{options.outputPath}"],
31+
"executor": "@nxkit/playwright:test",
32+
"outputs": [
33+
"{options.outputPath}"
34+
],
2935
"options": {
3036
"outputPath": "dist/apps/ngx-bootstrap-docs-e2e/test-results",
3137
"playwrightConfig": "apps/ngx-bootstrap-docs-e2e/playwright.config.ts",
@@ -39,14 +45,16 @@
3945
}
4046
},
4147
"show-report": {
42-
"builder": "@nxkit/playwright:show-report",
48+
"executor": "@nxkit/playwright:show-report",
4349
"options": {
4450
"reportPath": "dist/apps/ngx-bootstrap-docs-e2e/playwright-report"
4551
}
4652
},
4753
"lint": {
4854
"executor": "@nx/eslint:lint",
49-
"outputs": ["{options.outputPath}"]
55+
"outputs": [
56+
"{options.outputPath}"
57+
]
5058
}
5159
}
52-
}
60+
}

apps/ngx-bootstrap-docs-e2e/src/support/accordion.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { expect, ConsoleMessage } from '@playwright/test';
22
import { BasePo } from './base.po';
33

44
export class AccordionPo extends BasePo {
5-
override pageUrl = '#/components/accordion';
5+
override pageUrl = '/ngx-bootstrap/components/accordion';
66
pageTitle = 'Accordion';
77
ghLinkToComponent = 'https://github.com/valor-software/ngx-bootstrap/tree/development/src/accordion';
88
additionalHtml = '.badge';

apps/ngx-bootstrap-docs-e2e/src/support/alerts.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { expect } from '@playwright/test';
22
import { BasePo } from './base.po';
33

44
export class AlertsPo extends BasePo {
5-
override pageUrl = '#/components/alerts';
5+
override pageUrl = '/ngx-bootstrap/components/alerts';
66
pageTitle = 'Alerts';
77
ghLinkToComponent = 'https://github.com/valor-software/ngx-bootstrap/tree/development/src/alert';
88

apps/ngx-bootstrap-docs-e2e/src/support/buttons.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { expect } from '@playwright/test';
22
import { BasePo } from './base.po';
33

44
export class ButtonsPo extends BasePo {
5-
override pageUrl = '#/components/buttons';
5+
override pageUrl = '/ngx-bootstrap/components/buttons';
66
pageTitle = 'Buttons';
77
ghLinkToComponent = 'https://github.com/valor-software/ngx-bootstrap/tree/development/src/buttons';
88

apps/ngx-bootstrap-docs-e2e/src/support/carousel.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { BaseComponent } from './base.component';
22

33
export class CarouselPo extends BaseComponent {
4-
pageUrl = '#/components/carousel';
4+
pageUrl = '/ngx-bootstrap/components/carousel';
55
pageTitle = 'Carousel';
66
ghLinkToComponent = 'https://github.com/valor-software/ngx-bootstrap/tree/development/src/carousel';
77

apps/ngx-bootstrap-docs-e2e/src/support/collapse.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { BaseComponent } from './base.component';
22

33
export class CollapsePo extends BaseComponent {
4-
pageUrl = '#/components/collapse';
4+
pageUrl = '/ngx-bootstrap/components/collapse';
55
pageTitle = 'Collapse';
66
ghLinkToComponent = 'https://github.com/valor-software/ngx-bootstrap/tree/development/src/collapse';
77

apps/ngx-bootstrap-docs-e2e/src/support/datepicker.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as globalLocales from 'ngx-bootstrap/locale';
55
import * as moment from 'moment';
66

77
export class DatepickerPo extends BaseComponent {
8-
pageUrl = '#/components/datepicker';
8+
pageUrl = '/ngx-bootstrap/components/datepicker';
99
pageTitle = 'Datepicker';
1010
ghLinkToComponent = 'https://github.com/valor-software/ngx-bootstrap/tree/development/src/datepicker';
1111

0 commit comments

Comments
 (0)