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: update to angular 18, standalone app and zoneless #502

Merged
merged 2 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,22 @@ jobs:

strategy:
matrix:
node-version: ['18.13.0', '20']
node-version: ['20', '18.13.0']

steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: npm ci
run: pnpm install
- name: Build
run: |
npx nx run-many --target=build --all
pnpx nx run-many --target=build --all
env:
CI: true
14 changes: 11 additions & 3 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,33 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 18.13.0
- run: npm ci
- run: pnpm install

publish-npm:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 18.13.0
registry-url: https://registry.npmjs.org/
scope: '@ngu'
- name: Build and Publish
run: |
npm ci
npx nx run-many --target=build --all
pnpm install
pnpx nx run-many --target=build --all
cd dist/libs/ngu/carousel
npm publish --access=public
shell: bash
Expand Down
5 changes: 4 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package.json
*.yml

/.nx/cache
.angular

/.nx/cache
/.nx/workspace-data

9 changes: 4 additions & 5 deletions apps/ngu-carousel-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/ngu-carousel-e2e/src",
"projectType": "application",
"tags": [],
"implicitDependencies": ["ngu-carousel-example"],
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/ngu-carousel-e2e/**/*.{js,ts}"]
"lintFilePatterns": ["{projectRoot}/**/*.{js,ts}"]
}
}
},
"tags": [],
"implicitDependencies": ["ngu-carousel-example"]
}
}
21 changes: 8 additions & 13 deletions apps/ngu-carousel-example/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"name": "ngu-carousel-example",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/ngu-carousel-example/src",
"prefix": "app",
"generators": {
"@schematics/angular:component": {
"style": "scss"
Expand All @@ -10,16 +12,14 @@
"strict": true
}
},
"sourceRoot": "apps/ngu-carousel-example/src",
"prefix": "app",
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser-esbuild",
"executor": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/apps/ngu-carousel-example/browser",
"index": "apps/ngu-carousel-example/src/index.html",
"main": "apps/ngu-carousel-example/src/main.ts",
"polyfills": ["zone.js"],
"browser": "apps/ngu-carousel-example/src/main.ts",
"polyfills": [],
"tsConfig": "apps/ngu-carousel-example/tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
Expand Down Expand Up @@ -51,9 +51,7 @@
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
Expand Down Expand Up @@ -82,8 +80,8 @@
"test": {
"executor": "@angular-devkit/build-angular:karma",
"options": {
"main": "apps/ngu-carousel-example/src/test.ts",
"polyfills": ["zone.js", "zone.js/testing"],
"browser": "apps/ngu-carousel-example/src/test.ts",
"polyfills": [],
"tsConfig": "apps/ngu-carousel-example/tsconfig.spec.json",
"karmaConfig": "apps/ngu-carousel-example/karma.conf.js",
"inlineStyleLanguage": "scss",
Expand All @@ -98,10 +96,7 @@
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"apps/ngu-carousel-example/**/*.ts",
"apps/ngu-carousel-example/**/*.html"
]
"lintFilePatterns": ["{projectRoot}/**/*.ts", "{projectRoot}/**/*.html"]
}
},
"generate-bundle": {
Expand Down
46 changes: 0 additions & 46 deletions apps/ngu-carousel-example/src/app/app-routing.module.ts

This file was deleted.

9 changes: 9 additions & 0 deletions apps/ngu-carousel-example/src/app/app-server.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { ApplicationConfig } from '@angular/core';
import { provideAnimations } from '@angular/platform-browser/animations';
import { provideRouter } from '@angular/router';
import { provideServerRendering } from '@angular/platform-server';
import { APP_ROUTES } from './app.routes';

export const appServerConfig: ApplicationConfig = {
providers: [provideRouter(APP_ROUTES), provideAnimations(), provideServerRendering()]
};
11 changes: 6 additions & 5 deletions apps/ngu-carousel-example/src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@ describe('AppComponent', () => {

beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [AppComponent, MainNavComponent],
imports: [
imports: [
NoopAnimationsModule,
LayoutModule,
MatButtonModule,
MatIconModule,
MatListModule,
MatSidenavModule,
MatToolbarModule,
RouterTestingModule
]
}).compileComponents();
RouterTestingModule,
MainNavComponent,
AppComponent
]
}).compileComponents();
}));

beforeEach(() => {
Expand Down
5 changes: 4 additions & 1 deletion apps/ngu-carousel-example/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ import { NguCarouselConfig } from '@ngu/carousel';
import { interval, Observable } from 'rxjs';
import { map, startWith, take } from 'rxjs/operators';
import { slider } from './slide-animation';
import { MainNavComponent } from './main-nav/main-nav.component';

@Component({
standalone: true,
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'],
animations: [slider],
changeDetection: ChangeDetectionStrategy.OnPush
changeDetection: ChangeDetectionStrategy.OnPush,
imports: [MainNavComponent]
})
export class AppComponent implements AfterViewInit {
images = ['assets/bg.jpg', 'assets/car.png', 'assets/canberra.jpg', 'assets/holi.jpg'];
Expand Down
12 changes: 12 additions & 0 deletions apps/ngu-carousel-example/src/app/app.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { ApplicationConfig, provideExperimentalZonelessChangeDetection } from '@angular/core';
import { provideAnimations } from '@angular/platform-browser/animations';
import { provideRouter } from '@angular/router';
import { APP_ROUTES } from './app.routes';

export const appConfig: ApplicationConfig = {
providers: [
provideRouter(APP_ROUTES),
provideAnimations(),
provideExperimentalZonelessChangeDetection()
]
};
34 changes: 0 additions & 34 deletions apps/ngu-carousel-example/src/app/app.module.ts

This file was deleted.

36 changes: 36 additions & 0 deletions apps/ngu-carousel-example/src/app/app.routes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { Routes } from '@angular/router';
import { GettingStartedComponent } from './getting-started/getting-started.component';

export const APP_ROUTES: Routes = [
{
path: 'banner',
loadComponent: () => import('./banner/banner.component').then(m => m.BannerComponent)
},
{
path: 'tile',
loadComponent: () => import('./tile/tile.component').then(m => m.TileComponent)
},
{
path: 'tile-2-images',
loadComponent: () =>
import('./tile-2-images/tile-2-images.component').then(m => m.Tile2ImagesComponent)
},
{
path: 'banner-vertical',
loadComponent: () =>
import('./banner-vertical/banner-vertical.component').then(m => m.BannerVerticalComponent)
},
{
path: 'wrapped',
loadComponent: () => import('./wrapped/wrapped.component').then(m => m.WrappedComponent)
},
{
path: 'getting-started',
component: GettingStartedComponent
},
{
path: '',
redirectTo: 'tile',
pathMatch: 'full'
}
];
14 changes: 0 additions & 14 deletions apps/ngu-carousel-example/src/app/app.server.module.ts

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ describe('BannerVerticalComponent', () => {

beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [BannerVerticalComponent],
imports: [NguCarousel]
}).compileComponents();
imports: [NguCarousel, BannerVerticalComponent]
}).compileComponents();
}));

beforeEach(() => {
Expand Down
Loading
Loading