Skip to content

Move to prettier v3 #2184

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.

Sign up for GitHub

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

Merged
jeremymeng merged 9 commits into from
Jan 9, 2024
Merged

Move to prettier v3 #2184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d289e66
Use dev-tool vendored prettier in generated package for Azure SDK
jeremymeng Dec 29, 2023
47e0906
Update codegen to use prettier v3 in generated package
jeremymeng Jan 2, 2024
3419dc7
Update prettier in this repo to v3 too
jeremymeng Jan 2, 2024
1da5730
re-generate baselines
jeremymeng Jan 2, 2024
ae1c8b6
npm run format
jeremymeng Jan 3, 2024
f60efaf
fix linting
jeremymeng Jan 3, 2024
03f5505
fix test
jeremymeng Jan 3, 2024
5df5d87
re-generate baseline
jeremymeng Jan 4, 2024
5193a24
re-generate baselines
jeremymeng Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
44 changes: 13 additions & 31 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions packages/autorest.typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"fs-extra": "^11.1.0",
"handlebars": "^4.7.7",
"lodash": "^4.17.21",
"prettier": "^1.19.1",
"prettier": "^3.1.0",
"source-map-support": "^0.5.16",
"ts-morph": "^15.1.0",
"@azure/core-auth": "^1.3.2",
Expand All @@ -88,7 +88,6 @@
"@types/js-yaml": "3.12.1",
"@types/mocha": "^5.2.7",
"@types/node": "^18.0.0",
"@types/prettier": "^1.18.4",
"@types/sinon": "^10.0.0",
"@types/xmlbuilder": "0.0.34",
"@types/yargs": "^17.0.10",
Expand Down
2 changes: 1 addition & 1 deletion packages/autorest.typescript/src/restLevelClient/generateRestLevel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export async function generateRestLevelClient() {

// Format the contents if necessary
if (isJson || isSourceCode) {
fileContents = format(
fileContents = await format(
fileContents,
isJson ? prettierJSONOptions : prettierTypeScriptOptions
);
Expand Down
2 changes: 1 addition & 1 deletion packages/autorest.typescript/src/typescriptGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export async function generateTypeScriptLibrary(

// Format the contents if necessary
if (isJson || isSourceCode) {
fileContents = prettier.format(
fileContents = await prettier.format(
Copy link
Copy Markdown
Member

@MaryGao MaryGao Jan 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this introduced by upgrade?

Copy link
Copy Markdown
Member Author

@jeremymeng jeremymeng Jan 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, v3 makes the method async.

fileContents,
isJson ? prettierJSONOptions : prettierTypeScriptOptions
);
Expand Down
25 changes: 13 additions & 12 deletions ...ages/autorest.typescript/test/integration/generated/additionalProperties/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@ function ignoreNiseSinonEval(warning) {
return (
warning.code === "EVAL" &&
warning.id &&
(warning.id.includes("node_modules/nise") ||
warning.id.includes("node_modules/sinon")) === true
(warning.id.includes("node_modules/nise") ||
warning.id.includes("node_modules/sinon")) === true
);
}

function ignoreChaiCircularDependency(warning) {
return (
warning.code === "CIRCULAR_DEPENDENCY" &&
warning.importer && warning.importer.includes("node_modules/chai") === true
warning.importer &&
warning.importer.includes("node_modules/chai") === true
);
}

Expand All @@ -58,43 +59,43 @@ function makeBrowserTestConfig() {
const config = {
input: {
include: ["dist-esm/test/**/*.spec.js"],
exclude: ["dist-esm/test/**/node/**"]
exclude: ["dist-esm/test/**/node/**"],
},
output: {
file: `dist-test/index.browser.js`,
format: "umd",
sourcemap: true
sourcemap: true,
},
preserveSymlinks: false,
plugins: [
multiEntry({ exports: false }),
nodeResolve({
mainFields: ["module", "browser"]
mainFields: ["module", "browser"],
}),
cjs(),
json(),
sourcemaps()
sourcemaps(),
//viz({ filename: "dist-test/browser-stats.html", sourcemap: true })
],
onwarn: makeOnWarnForTesting(),
// Disable tree-shaking of test code. In rollup-plugin-node-resolve@5.0.0,
// rollup started respecting the "sideEffects" field in package.json. Since
// our package.json sets "sideEffects=false", this also applies to test
// code, which causes all tests to be removed by tree-shaking.
treeshake: false
treeshake: false,
};

return config;
}

const defaultConfigurationOptions = {
disableBrowserBundle: false
disableBrowserBundle: false,
};

export function makeConfig(pkg, options) {
options = {
...defaultConfigurationOptions,
...(options || {})
...(options || {}),
};

const baseConfig = {
Expand All @@ -103,11 +104,11 @@ export function makeConfig(pkg, options) {
external: [
...nodeBuiltins,
...Object.keys(pkg.dependencies),
...Object.keys(pkg.devDependencies)
...Object.keys(pkg.devDependencies),
],
output: { file: "dist/index.js", format: "cjs", sourcemap: true },
preserveSymlinks: false,
plugins: [sourcemaps(), nodeResolve()]
plugins: [sourcemaps(), nodeResolve()],
};

const config = [baseConfig];
Expand Down
6 changes: 3 additions & 3 deletions ...escript/test/integration/generated/additionalProperties/src/additionalPropertiesClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class AdditionalPropertiesClient extends coreClient.ServiceClient {
options = {};
}
const defaults: AdditionalPropertiesClientOptionalParams = {
requestContentType: "application/json; charset=utf-8"
requestContentType: "application/json; charset=utf-8",
};

const packageDetails = `azsdk-js-additional-properties/1.0.0-preview1`;
Expand All @@ -37,9 +37,9 @@ export class AdditionalPropertiesClient extends coreClient.ServiceClient {
...defaults,
...options,
userAgentOptions: {
userAgentPrefix
userAgentPrefix,
},
endpoint: options.endpoint ?? options.baseUri ?? "http://localhost:3000"
endpoint: options.endpoint ?? options.baseUri ?? "http://localhost:3000",
};
super(optionsWithDefaults);

Expand Down
3 changes: 2 additions & 1 deletion ...s/autorest.typescript/test/integration/generated/additionalProperties/src/models/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ export interface PetsCreateAPInPropertiesWithAPStringOptionalParams
extends coreClient.OperationOptions {}

/** Contains response data for the createAPInPropertiesWithAPString operation. */
export type PetsCreateAPInPropertiesWithAPStringResponse = PetAPInPropertiesWithAPString;
export type PetsCreateAPInPropertiesWithAPStringResponse =
PetAPInPropertiesWithAPString;

/** Optional parameters. */
export interface AdditionalPropertiesClientOptionalParams
Expand Down
Loading
⚡