Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/angular 18 upgrade #2283

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6587aba
feat(covalent): upgrade to Angular 18
bsahitya Nov 18, 2024
55aa09f
build(nx): remove nx cloud id
bsahitya Nov 18, 2024
4b4f30b
ci(release): 9.0.0-beta.1 [skip ci]
semantic-release-bot Nov 18, 2024
ea6330c
fix(package): fix angular versioning issues
bsahitya Nov 18, 2024
9721884
ci(release): 9.0.0-beta.2 [skip ci]
semantic-release-bot Nov 18, 2024
8b1c802
Merge branch 'beta' into feat/angular-18-upgrade
bsahitya Nov 19, 2024
666e10a
revert(version): remove beta version number
bsahitya Nov 19, 2024
ef015ff
build(chromatic): use node 18
bsahitya Nov 19, 2024
1958888
build(ci): fix failing component tests
bsahitya Nov 19, 2024
0cd2411
docs(covalent): update docs for angular 18
bsahitya Nov 21, 2024
99b2c6a
feat(react-components): create react web components
bsahitya Nov 26, 2024
2d156c3
ci(release): 9.0.0-beta.3 [skip ci]
semantic-release-bot Nov 26, 2024
010e2a2
fix(styles): fix badge and card styling issues
bsahitya Nov 26, 2024
1006acc
ci(release): 9.0.0-beta.4 [skip ci]
semantic-release-bot Nov 27, 2024
4389b4f
docs(components): update new component docs
bsahitya Nov 27, 2024
971b0fa
build(components): upgrade monaco editor version
bsahitya Nov 27, 2024
8bc5068
build(email-generator): fix build issues in libs
bsahitya Nov 27, 2024
10bcd4d
feat(icon-lockup): add icon lockup component (#2277)
bsahitya Dec 3, 2024
1c396d8
ci(release): 8.24.0 [skip ci]
semantic-release-bot Dec 3, 2024
50eecfb
feat(components-react): add icon lockup component
bsahitya Dec 3, 2024
7750ad0
feat(icon-lockup): add icon lockup component (#2277)
bsahitya Dec 3, 2024
6441293
Merge branch 'main' into feat/angular-18-upgrade
bsahitya Dec 3, 2024
4ae2ac4
fix(package): remove duplicate icon lockup entry
bsahitya Dec 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,18 @@
},
"rules": {
"rxjs/no-unsafe-takeuntil": "error",
"rxjs-angular/prefer-takeuntil": "warn"
"rxjs-angular/prefer-takeuntil": "warn",
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
}
]
}
4 changes: 2 additions & 2 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0 # 👈 Required to retrieve git history
- name: Use Node.js 16
- name: Use Node.js 18
uses: actions/setup-node@v2
with:
node-version: 16
node-version: 18
cache: npm
- run: npm ci
# 👇 Adds Chromatic as a step in the workflow
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@

/.nx/cache
.angular

/.nx/workspace-data
16 changes: 10 additions & 6 deletions apps/docs-app/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { NgModule, LOCALE_ID } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { HttpClientModule, HttpClient } from '@angular/common/http';
import {
HttpClient,
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import {
Expand Down Expand Up @@ -53,13 +57,13 @@ import { HomeComponent } from './components/home/home.component';
import { ToolbarModule } from './components/toolbar/toolbar.module';

@NgModule({
declarations: [DocsAppComponent, HomeComponent], // directives, components, and pipes owned by this NgModule
declarations: [DocsAppComponent, HomeComponent], // additional providers needed for this module
bootstrap: [DocsAppComponent],
imports: [
BrowserAnimationsModule,
CommonModule,
FormsModule,
BrowserModule,
HttpClientModule,
/** Material Modules */
MatButtonModule,
MatListModule,
Expand Down Expand Up @@ -89,7 +93,7 @@ import { ToolbarModule } from './components/toolbar/toolbar.module';
ContentContainerModule,
appRoutes,
CovalentFileModule,
], // modules needed to run this module
],
providers: [
appRoutingProviders,
GitHubService,
Expand All @@ -101,7 +105,7 @@ import { ToolbarModule } from './components/toolbar/toolbar.module';
deps: [TranslateService],
},
SelectivePreloadingStrategyService,
], // additional providers needed for this module
bootstrap: [DocsAppComponent],
provideHttpClient(withInterceptorsFromDi()),
],
})
export class AppModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import { MatCardModule } from '@angular/material/card';
import { MatIconModule } from '@angular/material/icon';
import { MatButtonModule } from '@angular/material/button';
import { CovalentHighlightModule } from '@covalent/highlight';
import { HttpClientModule } from '@angular/common/http';
import {
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';
import { MatToolbarModule } from '@angular/material/toolbar';
import { MatDividerModule } from '@angular/material/divider';

Expand All @@ -23,8 +26,8 @@ import { MatDividerModule } from '@angular/material/divider';
MatCardModule,
MatIconModule,
MatButtonModule,
HttpClientModule,
MatDividerModule,
],
providers: [provideHttpClient(withInterceptorsFromDi())],
})
export class DemoModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,16 @@ export class FlavoredMarkdownDemoBasicComponent {
## List

+ One
+ subline
+ subline
+ Two
+ Three
+ subline
+ second subline


| Tables | Are | Cool |
| ------------- |:-------------:| -----:|
| **col 3 is** | right-aligned | $1600 |
| col 2 is | *centered* | $12 |
| zebra stripes | are neat | $1 |
+ subline
+ second subline
+ Table in a list:
| Tables | Are | Cool |
| ------------- |:-------------:| -----:|
| **col 3 is** | right-aligned | $1600 |
| col 2 is | *centered* | $12 |
| zebra stripes | are neat | $1 |
`;
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ <h3>New &amp; Custom Components</h3>
mat-button
color="accent"
target="_blank"
href="https://v17.material.angular.io/components/categories"
href="https://v18.material.angular.io/components/categories"
>
Components
</a>
<a
mat-button
target="_blank"
href="https://github.com/angular/components/releases/tag/17.3.6"
href="https://github.com/angular/components/releases/tag/18.2.14"
>Github repo</a
>
</section>
Expand All @@ -55,7 +55,7 @@ <h3>New &amp; Custom Components</h3>
<span matListItemLine>Why Angular Material?</span>
</a>
<mat-divider></mat-divider>
<a mat-list-item href="https://v17.material.angular.io/" target="_blank">
<a mat-list-item href="https://v18.material.angular.io/" target="_blank">
<mat-icon matListItemIcon>launch</mat-icon>
<span matListItemLine>Angular Material Docs Site</span>
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h3 class="push-bottom-sm mat-title">SCSS Variables</h3>
mat-button
color="accent"
target="_blank"
href="https://v17.material.angular.io/guide/theming"
href="https://v18.material.angular.io/guide/theming"
>
Theming docs
</a>
Expand Down
26 changes: 14 additions & 12 deletions apps/docs-app/src/app/content/docs/theme/theme.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,36 @@ export class ThemeComponent {
@use '@angular/material' as mat;

// (optional) Additional themes
@use '@covalent/markdown/markdown-theme' as markdown;
@use '@covalent/highlight/highlight-theme' as highlight;
@import '@covalent/flavored-markdown/flavored-markdown-theme';
@use "@covalent/markdown/markdown-theme" as markdown;
@use "@covalent/highlight/highlight-theme" as highlight;
@import "@covalent/flavored-markdown/flavored-markdown-theme";

// Covalent core themes
@import '@covalent/core/theming/all-theme';
@import '@covalent/core/theming/teradata-theme';
@import "@covalent/core/theming/all-theme";
@import "@covalent/core/theming/teradata-theme";

// Plus imports for other components in your app.

@include mat.core();

// Define a custom typography config that overrides the font-family
// or any typography level.
$typography: mat.define-typography-config(
$font-family: 'Inter, monospace',
$headline-1: mat.define-typography-level(32px, 48px, 700),
$typography: mat.m2-define-typography-config(
$font-family: "Inter, monospace",
$headline-1: mat.m2-define-typography-level(32px, 48px, 700),
);

// Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue.
$primary: mat.define-palette($mat-blue, 700);
$accent: mat.define-palette($mat-orange, 800, A100, A400);
$primary: mat.m2-define-palette($mat-blue, 700);
$accent: mat.m2-define-palette($mat-orange, 800, A100, A400);

// The warn palette is optional (defaults to red).
$warn: mat.define-palette($mat-red, 600);
$warn: mat.m2-define-palette($mat-red, 600);

// Create the theme object (a Sass map containing all of the palettes).
$theme: mat.define-light-theme(
$theme: mat.m2-define-light-theme(
(
color: (
primary: $primary,
Expand All @@ -55,6 +55,8 @@ export class ThemeComponent {
)
);

@include mat.typography-hierarchy($theme, $back-compat: true);

// Include the Angular Material styles using the custom theme
@include mat.all-component-themes($theme);

Expand Down
7 changes: 5 additions & 2 deletions apps/docs-app/src/app/content/echarts/echarts.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { HttpClientModule } from '@angular/common/http';
import {
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';

import { MatIconModule } from '@angular/material/icon';
import { MatDividerModule } from '@angular/material/divider';
Expand Down Expand Up @@ -39,7 +42,6 @@ import { moduleRoutes } from './echarts.routes';
MatTabsModule,
MatRippleModule,
MatMenuModule,
HttpClientModule,
MatTooltipModule,
// Covalent Core
CovalentLayoutModule,
Expand All @@ -49,5 +51,6 @@ import { moduleRoutes } from './echarts.routes';
SidenavContentModule,
ComponentOverviewModule,
],
providers: [provideHttpClient(withInterceptorsFromDi())],
})
export class EchartsModule {}
2 changes: 1 addition & 1 deletion apps/email-generator/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{
"type": "initial",
"maximumWarning": "5mb",
"maximumError": "6mb"
"maximumError": "6.5mb"
},
{
"type": "anyComponentStyle",
Expand Down
2 changes: 1 addition & 1 deletion apps/email-generator/src/app/editor/editor.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
import { CommonModule } from '@angular/common';
import { CovalentCodeEditorModule } from '@covalent/code-editor';
import { PreviewComponent } from '../preview/preview.component';
import { editor } from 'monaco-editor';
import { editor } from 'monaco-editor/esm/vs/editor/editor.api';
import { getHtmlTemplate } from '@covalent/email-templates';
import * as prettier from 'prettier';
import parserHtml from 'prettier/parser-html'; // Use 'html' parser while working with MJML
Expand Down
28 changes: 28 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
# [9.0.0-beta.4](https://github.com/Teradata/covalent/compare/v9.0.0-beta.3...v9.0.0-beta.4) (2024-11-26)

### Bug Fixes

- **styles:** fix badge and card styling issues ([af3dc7b](https://github.com/Teradata/covalent/commit/af3dc7b10ae91bc8af9905be26c0555dc3371f25))

# [9.0.0-beta.3](https://github.com/Teradata/covalent/compare/v9.0.0-beta.2...v9.0.0-beta.3) (2024-11-26)

### Features

- **react-components:** create react web components ([34ae0ef](https://github.com/Teradata/covalent/commit/34ae0efdb73daf84935d8713b51cd7bd0ac86f36))

# [9.0.0-beta.2](https://github.com/Teradata/covalent/compare/v9.0.0-beta.1...v9.0.0-beta.2) (2024-11-18)

### Bug Fixes

- **package:** fix angular versioning issues ([ea6330c](https://github.com/Teradata/covalent/commit/ea6330c7cddabbe7841cdfe88ff09fb9091cdbb8))

# [9.0.0-beta.1](https://github.com/Teradata/covalent/compare/v8.23.2...v9.0.0-beta.1) (2024-11-18)

### Features

- **covalent:** upgrade to Angular 18 ([6587aba](https://github.com/Teradata/covalent/commit/6587abaea7892108be4b18ef81042b50d193df03))

### BREAKING CHANGES

- **covalent:** Upgrade covalent to Angular 18

# [8.24.0](https://github.com/Teradata/covalent/compare/v8.23.2...v8.24.0) (2024-12-03)

### Features
Expand Down
Loading
Loading