Skip to content

Commit

Permalink
refactor: migrate compiler-cli to prettier formatting (#55485)
Browse files Browse the repository at this point in the history
Migrate formatting to prettier for compiler-cli from clang-format

PR Close #55485
  • Loading branch information
josephperrott authored and AndrewKushnir committed Apr 29, 2024
1 parent f307e95 commit 0d78a92
Show file tree
Hide file tree
Showing 439 changed files with 34,526 additions and 20,601 deletions.
4 changes: 4 additions & 0 deletions .ng-dev/format.mts
Expand Up @@ -18,6 +18,7 @@ export const format: FormatConfig = {
'packages/benchpress/**/*.{js,ts}',
'packages/common/**/*.{js,ts}',
'packages/compiler/**/*.{js,ts}',
'packages/compiler-cli/**/*.{js,ts}',
'packages/core/**/*.{js,ts}',
'packages/docs/**/*.{js,ts}',
'packages/elements/**/*.{js,ts}',
Expand All @@ -35,6 +36,8 @@ export const format: FormatConfig = {
'packages/upgrade/**/*.{js,ts}',
'packages/zone.js/**/*.{js,ts}',

// Test cases contain non valid code.
'!packages/compiler-cli/test/compliance/test_cases/**/*.{js,ts}',
// Do not format d.ts files as they are generated
'!**/*.d.ts',
// Both third_party and .yarn are directories containing copied code which should
Expand Down Expand Up @@ -83,6 +86,7 @@ export const format: FormatConfig = {
'!packages/benchpress/**/*.{js,ts}',
'!packages/common/**/*.{js,ts}',
'!packages/compiler/**/*.{js,ts}',
'!packages/compiler-cli/**/*.{js,ts}',
'!packages/core/**/*.{js,ts}',
'!packages/docs/**/*.{js,ts}',
'!packages/elements/**/*.{js,ts}',
Expand Down
8 changes: 4 additions & 4 deletions packages/compiler-cli/esbuild.config.js
Expand Up @@ -7,12 +7,12 @@
*/

module.exports = {
resolveExtensions : ['.mjs', '.js'],
resolveExtensions: ['.mjs', '.js'],
// Note: `@bazel/esbuild` has a bug and does not pass-through the format from Starlark.
format : 'esm',
banner : {
format: 'esm',
banner: {
// Workaround for: https://github.com/evanw/esbuild/issues/946
js : `
js: `
import {createRequire as __cjsCompatRequire} from 'module';
const require = __cjsCompatRequire(import.meta.url);
`,
Expand Down
Expand Up @@ -15,17 +15,11 @@ import {Lib2Module} from 'lib2_built/module';
selector: 'id-app',
template: '<lib2-cmp></lib2-cmp>',
})
export class AppComponent {
}
export class AppComponent {}

@NgModule({
imports: [
Lib2Module,
BrowserModule,
ServerModule,
],
imports: [Lib2Module, BrowserModule, ServerModule],
declarations: [AppComponent],
bootstrap: [AppComponent],
})
export class BasicAppModule {
}
export class BasicAppModule {}
Expand Up @@ -11,8 +11,7 @@ import {BrowserModule} from '@angular/platform-browser';
import {ServerModule} from '@angular/platform-server';

@Injectable()
export class NormalService {
}
export class NormalService {}

@Component({
selector: 'dep-app',
Expand All @@ -26,16 +25,12 @@ export class AppComponent {
}

@NgModule({
imports: [
BrowserModule,
ServerModule,
],
imports: [BrowserModule, ServerModule],
declarations: [AppComponent],
bootstrap: [AppComponent],
providers: [NormalService],
})
export class DepAppModule {
}
export class DepAppModule {}

@Injectable({providedIn: DepAppModule})
export class ShakeableService {
Expand Down
Expand Up @@ -11,16 +11,14 @@ import {BrowserModule} from '@angular/platform-browser';
import {ServerModule} from '@angular/platform-server';

@Injectable()
export class Service {
}
export class Service {}

@Component({
selector: 'hierarchy-app',
template: '<child-cmp></child-cmp>',
providers: [Service],
})
export class AppComponent {
}
export class AppComponent {}

@Component({
selector: 'child-cmp',
Expand All @@ -29,18 +27,14 @@ export class AppComponent {
export class ChildComponent {
found: boolean;

constructor(@Optional() @Self() service: Service|null) {
constructor(@Optional() @Self() service: Service | null) {
this.found = !!service;
}
}

@NgModule({
imports: [
BrowserModule,
ServerModule,
],
imports: [BrowserModule, ServerModule],
declarations: [AppComponent, ChildComponent],
bootstrap: [AppComponent],
})
export class HierarchyAppModule {
}
export class HierarchyAppModule {}
Expand Up @@ -17,27 +17,22 @@ import {LazyModule} from './root_lazy';
selector: 'root-app',
template: '<router-outlet></router-outlet>',
})
export class AppComponent {
}
export class AppComponent {}

export function children(): any {
console.error('children', LazyModule);
return LazyModule;
}


@NgModule({
imports: [
BrowserModule,
ServerModule,
RouterModule.forRoot(
[
{path: '', pathMatch: 'prefix', loadChildren: children},
],
{initialNavigation: 'enabledBlocking'}),
RouterModule.forRoot([{path: '', pathMatch: 'prefix', loadChildren: children}], {
initialNavigation: 'enabledBlocking',
}),
],
declarations: [AppComponent],
bootstrap: [AppComponent],
})
export class RootAppModule {
}
export class RootAppModule {}
Expand Up @@ -25,11 +25,6 @@ export class RouteComponent {

@NgModule({
declarations: [RouteComponent],
imports: [
RouterModule.forChild([
{path: '', pathMatch: 'prefix', component: RouteComponent},
]),
],
imports: [RouterModule.forChild([{path: '', pathMatch: 'prefix', component: RouteComponent}])],
})
export class LazyModule {
}
export class LazyModule {}
Expand Up @@ -11,5 +11,4 @@ import {Injectable} from '@angular/core';
@Injectable({
providedIn: 'root',
})
export class Service {
}
export class Service {}
Expand Up @@ -12,7 +12,7 @@ import {ServerModule} from '@angular/platform-server';

@Injectable()
export class NormalService {
constructor(@Optional() @Self() readonly shakeable: ShakeableService|null) {}
constructor(@Optional() @Self() readonly shakeable: ShakeableService | null) {}
}

@Component({
Expand All @@ -27,17 +27,12 @@ export class AppComponent {
}

@NgModule({
imports: [
BrowserModule,
ServerModule,
],
imports: [BrowserModule, ServerModule],
declarations: [AppComponent],
bootstrap: [AppComponent],
providers: [NormalService],
})
export class SelfAppModule {
}
export class SelfAppModule {}

@Injectable({providedIn: SelfAppModule})
export class ShakeableService {
}
export class ShakeableService {}
Expand Up @@ -10,7 +10,6 @@ import {Component, Inject, Injectable, NgModule} from '@angular/core';
import {BrowserModule} from '@angular/platform-browser';
import {ServerModule} from '@angular/platform-server';


@Component({
selector: 'string-app',
template: '{{data}}',
Expand All @@ -23,16 +22,12 @@ export class AppComponent {
}

@NgModule({
imports: [
BrowserModule,
ServerModule,
],
imports: [BrowserModule, ServerModule],
declarations: [AppComponent],
bootstrap: [AppComponent],
providers: [{provide: 'someStringToken', useValue: 'works'}],
})
export class StringAppModule {
}
export class StringAppModule {}

@Injectable({providedIn: StringAppModule})
export class Service {
Expand Down
Expand Up @@ -6,24 +6,30 @@
* found in the LICENSE file at https://angular.io/license
*/

import {Component, forwardRef, Inject, inject, Injectable, InjectionToken, NgModule} from '@angular/core';
import {
Component,
forwardRef,
Inject,
inject,
Injectable,
InjectionToken,
NgModule,
} from '@angular/core';
import {BrowserModule} from '@angular/platform-browser';
import {ServerModule} from '@angular/platform-server';

export interface IService {
readonly dep: {readonly data: string;};
readonly dep: {readonly data: string};
}

@NgModule({})
export class TokenModule {
}
export class TokenModule {}

export const TOKEN = new InjectionToken('test', {
providedIn: TokenModule,
factory: () => new Service(inject(Dep)),
});


@Component({
selector: 'token-app',
template: '{{data}}',
Expand All @@ -36,17 +42,12 @@ export class AppComponent {
}

@NgModule({
imports: [
BrowserModule,
ServerModule,
TokenModule,
],
imports: [BrowserModule, ServerModule, TokenModule],
providers: [forwardRef(() => Dep)],
declarations: [AppComponent],
bootstrap: [AppComponent],
})
export class TokenAppModule {
}
export class TokenAppModule {}

@Injectable()
export class Dep {
Expand Down

0 comments on commit 0d78a92

Please sign in to comment.