Skip to content

Commit 8d450d0

Browse files
lexasqlexasq
authoredJan 2, 2025
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

+2-2
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

+1-1
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

+1
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

+15-7
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

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

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

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { BaseComponent } from './base.component';
22

33
export class LandingPo extends BaseComponent {
4-
pageUrl = '#/';
5-
documentationUrl = '#/documentation/';
4+
pageUrl = '/ngx-bootstrap/';
5+
documentationUrl = '/ngx-bootstrap/documentation/';
66

77
mainClass = '.main';
88
logoAtHeader = '[data-cypress="logoAtHeader"]';

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { BaseComponent } from './base.component';
22
import PositionType = Cypress.PositionType;
33

44
export class ModalsPo extends BaseComponent {
5-
pageUrl = '#/components/modals';
5+
pageUrl = '/ngx-bootstrap/components/modals';
66
pageTitle = 'Modals';
77
ghLinkToComponent = 'https://github.com/valor-software/ngx-bootstrap/tree/development/src/modal';
88

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

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

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

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

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { BaseComponent } from './base.component';
22
import { AttrObj } from './interfaces';
33

44
export class ProgressbarPo extends BaseComponent {
5-
pageUrl = '#/components/progressbar';
5+
pageUrl = '/ngx-bootstrap/components/progressbar';
66
pageTitle = 'Progressbar';
77
ghLinkToComponent = 'https://github.com/valor-software/ngx-bootstrap/tree/development/src/progressbar';
88

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

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

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

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

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

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

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

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ObjectLike = Cypress.ObjectLike;
33
import TriggerOptions = Cypress.TriggerOptions;
44

55
export class TimepickerPo extends BaseComponent {
6-
pageUrl = '#/components/timepicker';
6+
pageUrl = '/ngx-bootstrap/components/timepicker';
77
pageTitle = 'Timepicker';
88
ghLinkToComponent = 'https://github.com/valor-software/ngx-bootstrap/tree/development/src/timepicker';
99

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

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

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

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

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

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

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

+81-4
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,32 @@
44
"projectType": "application",
55
"sourceRoot": "apps/ngx-bootstrap-docs/src",
66
"prefix": "ngx-bootstrap-base",
7-
"implicitDependencies": ["ngx-bootstrap"],
7+
"implicitDependencies": [
8+
"ngx-bootstrap"
9+
],
810
"targets": {
911
"build": {
1012
"executor": "@angular-devkit/build-angular:browser",
1113
"options": {
1214
"baseHref": "/ngx-bootstrap/",
13-
"outputPath": "dist/apps/ngx-bootstrap",
15+
"outputPath": "dist/ngx-bootstrap-docs/browser",
1416
"index": "apps/ngx-bootstrap-docs/src/index.html",
1517
"main": "apps/ngx-bootstrap-docs/src/main.ts",
1618
"polyfills": "apps/ngx-bootstrap-docs/src/polyfills.ts",
1719
"tsConfig": "apps/ngx-bootstrap-docs/tsconfig.app.json",
1820
"aot": true,
19-
"assets": ["apps/ngx-bootstrap-docs/src/assets", "apps/ngx-bootstrap-docs/src/404.html"],
21+
"assets": [
22+
"apps/ngx-bootstrap-docs/src/assets",
23+
"apps/ngx-bootstrap-docs/src/404.html"
24+
],
2025
"styles": [
2126
"apps/ngx-bootstrap-docs/src/assets/css/style.scss",
2227
"apps/ngx-bootstrap-docs/src/assets/css/prettify-angulario.css"
2328
],
2429
"stylePreprocessorOptions": {
25-
"includePaths": ["src/datepicker"]
30+
"includePaths": [
31+
"src/datepicker"
32+
]
2633
}
2734
},
2835
"configurations": {
@@ -89,6 +96,76 @@
8996
},
9097
"lint": {
9198
"executor": "@nx/eslint:lint"
99+
},
100+
"server": {
101+
"executor": "@angular-devkit/build-angular:server",
102+
"options": {
103+
"outputPath": "dist/ngx-bootstrap-docs/server",
104+
"main": "apps/ngx-bootstrap-docs/server.ts",
105+
"tsConfig": "apps/ngx-bootstrap-docs/tsconfig.server.json",
106+
"stylePreprocessorOptions": {
107+
"includePaths": [
108+
"src/datepicker"
109+
]
110+
}
111+
},
112+
"configurations": {
113+
"production": {
114+
"buildOptimizer": true,
115+
"outputHashing": "media",
116+
"fileReplacements": [
117+
{
118+
"replace": "apps/ngx-bootstrap-docs/src/environments/environment.ts",
119+
"with": "apps/ngx-bootstrap-docs/src/environments/environment.prod.ts"
120+
}
121+
],
122+
"optimization": true,
123+
"sourceMap": false,
124+
"extractLicenses": true,
125+
"vendorChunk": false
126+
},
127+
"development": {
128+
"buildOptimizer": false,
129+
"optimization": false,
130+
"sourceMap": true,
131+
"extractLicenses": false,
132+
"vendorChunk": true
133+
}
134+
},
135+
"defaultConfiguration": "production"
136+
},
137+
"serve-ssr": {
138+
"executor": "@angular-devkit/build-angular:ssr-dev-server",
139+
"configurations": {
140+
"development": {
141+
"browserTarget": "ngx-bootstrap-docs:build:development",
142+
"serverTarget": "ngx-bootstrap-docs:server:development"
143+
},
144+
"production": {
145+
"browserTarget": "ngx-bootstrap-docs:build:production",
146+
"serverTarget": "ngx-bootstrap-docs:server:production"
147+
}
148+
},
149+
"defaultConfiguration": "development"
150+
},
151+
"prerender": {
152+
"executor": "@angular-devkit/build-angular:prerender",
153+
"options": {
154+
"routes": [
155+
"/"
156+
]
157+
},
158+
"configurations": {
159+
"production": {
160+
"browserTarget": "ngx-bootstrap-docs:build:production",
161+
"serverTarget": "ngx-bootstrap-docs:server:production"
162+
},
163+
"development": {
164+
"browserTarget": "ngx-bootstrap-docs:build:development",
165+
"serverTarget": "ngx-bootstrap-docs:server:development"
166+
}
167+
},
168+
"defaultConfiguration": "production"
92169
}
93170
}
94171
}

0 commit comments

Comments
 (0)
Failed to load comments.