Skip to content

Commit 051d07d

Browse files
authored
Merge pull request #2893 from Azure/dpwatrous/prettier-upgrade
Update prettier to 3.x
2 parents d248fff + 9242c9c commit 051d07d

51 files changed

Lines changed: 131 additions & 128 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.prettierrc.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
{
2-
"endOfLine": "auto"
2+
"endOfLine": "auto",
3+
"trailingComma": "es5",
4+
"overrides": [
5+
{
6+
"files": ["*.jsonc", "tsconfig.json"],
7+
"options": {
8+
"trailingComma": "none"
9+
}
10+
}
11+
]
312
}

desktop/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"markdownlint": "^0.25.1",
4646
"markdownlint-cli2": "^0.4.0",
4747
"npm-run-all": "^4.1.5",
48-
"prettier": "^2.5.1",
48+
"prettier": "^3.0.0",
4949
"typescript": "^4.9.0",
5050
"which": "^2.0.2"
5151
},

packages/bonito-core/src/environment/abstract-environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { Notifier } from "../notification";
1818
*/
1919
export abstract class AbstractEnvironment<
2020
C extends EnvironmentConfig = EnvironmentConfig,
21-
D extends DependencyFactories = DependencyFactories
21+
D extends DependencyFactories = DependencyFactories,
2222
> implements Environment<C>
2323
{
2424
abstract readonly name: EnvironmentName;

packages/bonito-core/src/environment/environment-util.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ let _currentEnvironment: Environment<EnvironmentConfig> | null = null;
1515
* @returns The current environment
1616
*/
1717
export function getEnvironment<
18-
C extends EnvironmentConfig = EnvironmentConfig
18+
C extends EnvironmentConfig = EnvironmentConfig,
1919
>(): Environment<C> {
2020
if (!_currentEnvironment) {
2121
throw new Error(
@@ -60,7 +60,7 @@ export function inject<T>(id: string): T {
6060
* environment is not a mock.
6161
*/
6262
export function getMockEnvironment<
63-
C extends EnvironmentConfig = EnvironmentConfig
63+
C extends EnvironmentConfig = EnvironmentConfig,
6464
>(): MockEnvironment<C> {
6565
if (!_currentEnvironment) {
6666
throw new Error(
@@ -103,7 +103,7 @@ export function initEnvironment<T extends Environment<EnvironmentConfig>>(
103103
*/
104104
export function initMockEnvironment<
105105
C extends EnvironmentConfig = EnvironmentConfig,
106-
D extends DependencyFactories = DependencyFactories
106+
D extends DependencyFactories = DependencyFactories,
107107
>(
108108
configOverrides: Partial<C> = {},
109109
depFactoryOverrides: Partial<D> = {}

packages/bonito-core/src/environment/mock-environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const mockDependencyFactories: DependencyFactories = {
3434
};
3535

3636
export class MockEnvironment<
37-
C extends EnvironmentConfig
37+
C extends EnvironmentConfig,
3838
> extends AbstractEnvironment<C, DependencyFactories> {
3939
name = EnvironmentName.Mock;
4040

packages/bonito-core/src/form/__tests__/form.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ const allowedStates = ["NY", "New York", "CA", "California"];
800800
class ParkParameter<
801801
V extends FormValues,
802802
K extends ParameterName<V>,
803-
D extends ParameterDependencies<V, "state">
803+
D extends ParameterDependencies<V, "state">,
804804
> extends AbstractParameter<V, K, D> {
805805
async validateAsync(): Promise<ValidationStatus> {
806806
let status = await super.validateAsync();

packages/bonito-core/src/form/boolean-parameter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { ValidationStatus } from "./validation-status";
88
*/
99
export class BooleanParameter<
1010
V extends FormValues,
11-
K extends ParameterName<V>
11+
K extends ParameterName<V>,
1212
> extends AbstractParameter<V, K> {
1313
validateSync(): ValidationStatus {
1414
let status = super.validateSync();

packages/bonito-core/src/form/entry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export interface EntryInit<V extends FormValues> {
6161

6262
export interface ValuedEntryInit<
6363
V extends FormValues,
64-
K extends ParameterName<V>
64+
K extends ParameterName<V>,
6565
> extends EntryInit<V> {
6666
value?: V[K];
6767
}

0 commit comments

Comments
 (0)