Skip to content

Commit e48ea3d

Browse files
author
Giuseppe Pennisi
committed
chore(deps): update workspace to angular 16
* removed sidebar because not supported by angualr 16
1 parent 56a7872 commit e48ea3d

30 files changed

Lines changed: 10873 additions & 9680 deletions

‎apps/winbox-example-app/src/app/app.component.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<rbtech-sidebar [menu]="menu"></rbtech-sidebar>
21
<button
32
style="position: fixed; right: 0; top: 0"
43
(click)="winboxService.closeAllWinBoxes()"

‎apps/winbox-example-app/src/app/app.component.spec.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
import { TestBed } from '@angular/core/testing';
22
import { AppComponent } from './app.component';
33
import { RouterTestingModule } from '@angular/router/testing';
4-
import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
5-
import { SidebarComponent } from '@rbtechdev/angular-sidebar';
64
import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
75

86
describe('AppComponent', () => {
97
beforeEach(async () => {
108
await TestBed.configureTestingModule({
11-
imports: [RouterTestingModule, PerfectScrollbarModule, NgbModalModule],
12-
declarations: [AppComponent, SidebarComponent],
9+
imports: [RouterTestingModule, NgbModalModule],
10+
declarations: [AppComponent],
1311
}).compileComponents();
1412
});
1513

‎apps/winbox-example-app/src/app/app.component.ts‎

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { Component, OnInit } from '@angular/core';
22
import { WinboxService } from '@rbtech/angular-winbox';
33
import { SimpleComponentComponent } from './simple-component/simple-component.component';
4-
import { SidebarMenuModel } from '@rbtechdev/angular-sidebar';
54
import { ModalYesNoComponent } from './modal-yes-no/modal-yes-no.component';
65
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
7-
import { faQuestion } from '@fortawesome/free-solid-svg-icons/faQuestion';
86

97
@Component({
108
selector: 'rbtech-root',
@@ -13,84 +11,6 @@ import { faQuestion } from '@fortawesome/free-solid-svg-icons/faQuestion';
1311
})
1412
export class AppComponent implements OnInit {
1513
title = 'winbox-example-app';
16-
faIcon = faQuestion;
17-
menu: SidebarMenuModel = {
18-
sidebarTitle: 'SIDEBAR',
19-
status: '',
20-
username: 'USER',
21-
subtitle: 'Admin',
22-
sidebarTitleHref: '/home',
23-
sidebarUsrPicSrc: 'assets/user.png',
24-
placeholderSearch: 'Cerca...',
25-
isSearchVisible: true,
26-
contentMenus: [
27-
{
28-
title: 'HEADER',
29-
type: 'header',
30-
visible: true,
31-
badge: {
32-
visible: true,
33-
class: 'badge bg-secondary',
34-
text: '4',
35-
},
36-
},
37-
{
38-
title: 'MENU 1',
39-
type: 'simple',
40-
visible: true,
41-
icon: this.faIcon,
42-
href: '/s',
43-
},
44-
{
45-
title: 'HEADER',
46-
type: 'header',
47-
visible: true,
48-
},
49-
{
50-
title: 'MENU 1',
51-
type: 'dropdown',
52-
visible: true,
53-
icon: this.faIcon,
54-
href: '#',
55-
badge: {
56-
visible: true,
57-
class: 'badge bg-secondary',
58-
text: '4',
59-
},
60-
subMenus: [
61-
{
62-
title: 'SUBMENU 1',
63-
visible: true,
64-
href: '/g',
65-
badge: {
66-
visible: true,
67-
class: 'badge bg-secondary',
68-
text: 'New',
69-
},
70-
},
71-
],
72-
},
73-
],
74-
footerMenus: [
75-
{
76-
type: 'simple',
77-
icon: this.faIcon,
78-
},
79-
{
80-
type: 'dropdown',
81-
icon: this.faIcon,
82-
dropdownHeaderTitle: 'Hello',
83-
href: '#',
84-
dropdownItems: [
85-
{
86-
text: 'HELLO',
87-
icon: this.faIcon,
88-
subtitle: 'HELLO S',
89-
},
90-
],
91-
},
92-
],
93-
};
9414

9515
constructor(
9616
protected winboxService: WinboxService,

‎apps/winbox-example-app/src/app/app.module.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { NgModule } from '@angular/core';
22
import { BrowserModule } from '@angular/platform-browser';
3-
43
import { AppComponent } from './app.component';
54
import { RouterModule } from '@angular/router';
65
import { SimpleComponentComponent } from './simple-component/simple-component.component';
7-
import { AngularSidebarModule } from '@rbtechdev/angular-sidebar';
86
import { ModalYesNoComponent } from './modal-yes-no/modal-yes-no.component';
97
import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
108

@@ -13,7 +11,6 @@ import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
1311
imports: [
1412
BrowserModule,
1513
RouterModule.forRoot([], { initialNavigation: 'enabledBlocking' }),
16-
AngularSidebarModule,
1714
NgbModalModule,
1815
],
1916
providers: [],

‎migrations.json‎

Lines changed: 12 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,18 @@
11
{
22
"migrations": [
33
{
4-
"version": "15.7.0-beta.0",
5-
"description": "Split global configuration files into individual project.json files. This migration has been added automatically to the beginning of your migration set to retroactively make them work with the new version of Nx.",
6-
"cli": "nx",
7-
"implementation": "./src/migrations/update-15-7-0/split-configuration-into-project-json-files",
8-
"package": "@nrwl/workspace",
9-
"name": "15-7-0-split-configuration-into-project-json-files"
10-
},
11-
{
12-
"cli": "nx",
13-
"version": "15.0.0-beta.1",
14-
"description": "Replace implicitDependencies with namedInputs + target inputs",
15-
"implementation": "./src/migrations/update-15-0-0/migrate-to-inputs",
16-
"package": "nx",
17-
"name": "15.0.0-migrate-to-inputs"
18-
},
19-
{
20-
"cli": "nx",
21-
"version": "15.0.0-beta.1",
22-
"description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed",
23-
"implementation": "./src/migrations/update-15-0-0/prefix-outputs",
24-
"package": "nx",
25-
"name": "15.0.0-prefix-outputs"
26-
},
27-
{
28-
"cli": "nx",
29-
"version": "15.0.12-beta.1",
30-
"description": "Set project names in project.json files",
31-
"implementation": "./src/migrations/update-15-1-0/set-project-names",
32-
"package": "nx",
33-
"name": "15.1.0-set-project-names"
34-
},
35-
{
36-
"cli": "nx",
37-
"version": "15.0.0-beta.0",
38-
"description": "Stop hashing eslint config files for build targets and dependent tasks",
39-
"factory": "./src/migrations/update-15-0-0/add-eslint-inputs",
40-
"package": "@nrwl/linter",
41-
"name": "add-eslint-inputs"
42-
},
43-
{
44-
"cli": "nx",
45-
"version": "15.7.1-beta.0",
46-
"description": "Add node_modules to root eslint ignore",
47-
"factory": "./src/migrations/update-15-7-1/add-eslint-ignore",
48-
"package": "@nrwl/linter",
49-
"name": "add-eslint-ignore"
50-
},
51-
{
52-
"version": "15.0.0-beta.0",
53-
"cli": "nx",
54-
"description": "Stop hashing jest spec files and config files for build targets and dependent tasks",
55-
"factory": "./src/migrations/update-15-0-0/add-jest-inputs",
56-
"package": "@nrwl/jest",
57-
"name": "add-jest-inputs"
58-
},
59-
{
60-
"version": "14.8.0-beta.0",
61-
"description": "Migrates from @nrwl/workspace:run-commands to nx:run-commands",
62-
"cli": "nx",
63-
"implementation": "./src/migrations/update-14-8-0/change-run-commands-executor",
64-
"package": "@nrwl/workspace",
65-
"name": "14-8-0-change-run-commands-executor"
66-
},
67-
{
68-
"version": "15.7.0-beta.0",
69-
"description": "Split global configuration files (e.g., workspace.json) into individual project.json files.",
70-
"cli": "nx",
71-
"implementation": "./src/migrations/update-15-7-0/split-configuration-into-project-json-files",
72-
"package": "@nrwl/workspace",
73-
"name": "15-7-0-split-configuration-into-project-json-files"
74-
},
75-
{
76-
"cli": "nx",
77-
"version": "15.0.0-beta.0",
78-
"description": "Stop hashing cypress spec files and config files for build targets and dependent tasks",
79-
"factory": "./src/migrations/update-15-0-0/add-cypress-inputs",
80-
"package": "@nrwl/cypress",
81-
"name": "add-cypress-inputs"
82-
},
83-
{
84-
"cli": "nx",
85-
"version": "15.0.0-beta.4",
86-
"description": "Update to using cy.mount in the commands.ts file instead of importing mount for each component test file",
87-
"factory": "./src/migrations/update-15-0-0/update-cy-mount-usage",
88-
"package": "@nrwl/cypress",
89-
"name": "update-cy-mount-usage"
90-
},
91-
{
92-
"cli": "nx",
93-
"version": "15.1.0-beta.0",
94-
"description": "Update to Cypress v11. This migration will only update if the workspace is already on v10. https://www.cypress.io/blog/2022/11/04/upcoming-changes-to-component-testing/",
95-
"factory": "./src/migrations/update-15-1-0/cypress-11",
96-
"package": "@nrwl/cypress",
97-
"name": "update-to-cypress-11"
98-
},
99-
{
100-
"cli": "nx",
101-
"version": "15.5.0-beta.0",
102-
"description": "Update to Cypress v12. Cypress 12 contains a handful of breaking changes that might causes tests to start failing that nx cannot directly fix. Read more Cypress 12 changes: https://docs.cypress.io/guides/references/migration-guide#Migrating-to-Cypress-12-0.This migration will only run if you are already using Cypress v11.",
103-
"factory": "./src/migrations/update-15-5-0/update-to-cypress-12",
104-
"package": "@nrwl/cypress",
105-
"name": "update-to-cypress-12"
106-
},
107-
{
108-
"cli": "nx",
109-
"version": "15.0.0-beta.0",
110-
"description": "Rename @nrwl/angular:webpack-server executor to @nrwl/angular:webpack-dev-server",
111-
"factory": "./src/migrations/update-14-8-0/rename-webpack-server",
112-
"package": "@nrwl/angular",
113-
"name": "rename-webpack-server-executor"
114-
},
115-
{
116-
"cli": "nx",
117-
"version": "15.0.0-beta.0",
118-
"description": "Update the usages of @nrwl/angular/testing to import jasmine-marbles symbols from jasmine-marbles itself.",
119-
"factory": "./src/migrations/update-15-0-0/switch-to-jasmine-marbles",
120-
"package": "@nrwl/angular",
121-
"name": "switch-to-jasmine-marbles"
122-
},
123-
{
124-
"cli": "nx",
125-
"version": "15.0.0-beta.1",
126-
"description": "Stop hashing karma spec files and config files for build targets and dependent tasks",
127-
"factory": "./src/migrations/update-15-0-0/add-karma-inputs",
128-
"package": "@nrwl/angular",
129-
"name": "add-karma-inputs"
130-
},
131-
{
132-
"cli": "nx",
133-
"version": "15.7.0-beta.1",
134-
"description": "Install the required angular-devkit packages as we do not directly depend on them anymore",
135-
"factory": "./src/migrations/update-15-7-0/install-required-packages",
136-
"package": "@nrwl/angular",
137-
"name": "install-required-packages"
4+
"version": "16.0.0",
5+
"description": "As of Angular v16, the `moduleId` property of `@Component` is deprecated as it no longer has any effect.",
6+
"factory": "./migrations/remove-module-id/bundle",
7+
"package": "@angular/core",
8+
"name": "migration-v16-remove-module-id"
9+
},
10+
{
11+
"version": "16.0.0",
12+
"description": "In Angular version 15.2, the guard and resolver interfaces (CanActivate, Resolve, etc) were deprecated. This migration removes imports and 'implements' clauses that contain them.",
13+
"factory": "./migrations/guard-and-resolve-interfaces/bundle",
14+
"package": "@angular/core",
15+
"name": "migration-v16-guard-and-resolve-interfaces"
13816
}
13917
]
14018
}

‎nx.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
"!{projectRoot}/.eslintrc.json",
6060
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
6161
"!{projectRoot}/tsconfig.spec.json",
62-
"!{projectRoot}/jest.config.[jt]s"
62+
"!{projectRoot}/jest.config.[jt]s",
63+
"!{projectRoot}/src/test-setup.[jt]s"
6364
]
6465
}
6566
}

0 commit comments

Comments
 (0)