Skip to content

Commit 3d774d2

Browse files
committed
chore: prettier
Updating prettier to latest version Updating prettierrc.js rules making generateCodeWithEjs function an async function, to meet the new requirement from prettier.format which returns a Promise<string> in prettier v3
1 parent 245e461 commit 3d774d2

File tree

5 files changed

+27
-18
lines changed

5 files changed

+27
-18
lines changed

.prettierrc.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
/** @type {import('prettier').Config} */
12
module.exports = {
2-
singleQuote: true,
3-
trailingComma: 'all',
4-
};
3+
arrowParens: 'avoid', // (x) => x ⟶ x => x
4+
singleQuote: true, // prefer 'test' over "test"
5+
trailingComma: 'all', // multi-line trailing commas
6+
semi: true, // for compatibility and clarity with ESLint default
7+
tabWidth: 2,
8+
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"lint-staged": "^12.1.2",
121121
"mapbox-gl": "^3.12.0",
122122
"node-dir": "0.1.17",
123-
"prettier": "2.8.8",
123+
"prettier": "3.6.2",
124124
"react": "19.1.0",
125125
"react-docgen": "rnmapbox/react-docgen#rnmapbox-dist-react-docgen-v6",
126126
"react-native": "0.81.0",

scripts/autogenHelpers/generateCodeWithEjs.mjs

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ export function getLayers() {
453453
return layers;
454454
}
455455

456-
export default function generateCodeWithEjs(layers) {
456+
export default async function generateCodeWithEjs(layers) {
457457
const templateMappings = [
458458
/*{
459459
input: path.join(TMPL_PATH, 'index.d.ts.ejs'),
@@ -483,7 +483,7 @@ export default function generateCodeWithEjs(layers) {
483483
const outputPaths = templateMappings.map((m) => m.output);
484484

485485
// autogenerate code
486-
templateMappings.forEach(({ input, output, only }) => {
486+
for (const { input, output, only } of templateMappings) {
487487
const filename = output.split('/').pop();
488488
console.log(`Generating ${filename}`);
489489
const tmpl = ejs.compile(fs.readFileSync(input, 'utf8'), { strict: true });
@@ -517,13 +517,18 @@ export default function generateCodeWithEjs(layers) {
517517

518518
let results = tmpl({ layers: filterOnly(layers, only) });
519519
if (filename.endsWith('ts')) {
520-
prettier.format(results, {
521-
...prettierrc,
522-
filepath: filename,
523-
})
524-
.then(res => fs.writeFileSync(output, res))
525-
.catch(error => console.error(`An error occurred when formatting with prettier file ${results}`, error));
520+
try {
521+
const formatted = await prettier.format(results, {
522+
...prettierrc,
523+
filepath: filename,
524+
});
525+
fs.writeFileSync(output, formatted);
526+
} catch (error) {
527+
console.error(`An error occurred when formatting with prettier file ${filename}`, error);
528+
// Fallback: write unformatted results to avoid missing files
529+
fs.writeFileSync(output, results);
530+
}
526531
}
527-
});
532+
}
528533
return outputPaths;
529534
}

scripts/autogenerate.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
1919

2020
async function generate() {
2121
let layers = getLayers();
22-
let outputPaths = generateCodeWithEjs(layers);
22+
let outputPaths = await generateCodeWithEjs(layers);
2323

2424
// autogenerate expo plugin
2525
execSync('yarn build:plugin', { stdio: 'inherit' });

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9235,10 +9235,10 @@ prettier-linter-helpers@^1.0.0:
92359235
dependencies:
92369236
fast-diff "^1.1.2"
92379237

9238-
prettier@2.8.8:
9239-
version "2.8.8"
9240-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
9241-
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
9238+
prettier@3.6.2:
9239+
version "3.6.2"
9240+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393"
9241+
integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==
92429242

92439243
pretty-bytes@^5.6.0:
92449244
version "5.6.0"

0 commit comments

Comments
 (0)