usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix type errors from vite.json5.ts (#9936)

This commit is contained in:
Kagami Sascha Rosylight 2023-02-15 09:14:47 +01:00 committed by GitHub
parent e24b0ceb80
commit ef7ad05c0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/frontend/vite.json5.ts
View File

@ -5,6 +5,13 @@ import { Plugin } from 'rollup';
import { createFilter, dataToEsm } from '@rollup/pluginutils'; import { createFilter, dataToEsm } from '@rollup/pluginutils';
import { RollupJsonOptions } from '@rollup/plugin-json'; import { RollupJsonOptions } from '@rollup/plugin-json';
// json5 extends SyntaxError with additional fields (without subclassing)
// https://github.com/json5/json5/blob/de344f0619bda1465a6e25c76f1c0c3dda8108d9/lib/parse.js#L1111-L1112
interface Json5SyntaxError extends SyntaxError {
lineNumber: number;
columnNumber: number;
}
export default function json5(options: RollupJsonOptions = {}): Plugin { export default function json5(options: RollupJsonOptions = {}): Plugin {
const filter = createFilter(options.include, options.exclude); const filter = createFilter(options.include, options.exclude);
const indent = 'indent' in options ? options.indent : '\t'; const indent = 'indent' in options ? options.indent : '\t';
@ -28,9 +35,12 @@ export default function json5(options: RollupJsonOptions = {}): Plugin {
map: { mappings: '' }, map: { mappings: '' },
}; };
} catch (err) { } catch (err) {
const message = 'Could not parse JSON file'; if (!(err instanceof SyntaxError)) {
const position = parseInt(/[\d]/.exec(err.message)[0], 10); throw err;
this.warn({ message, id, position }); }
const message = 'Could not parse JSON5 file';
const { lineNumber, columnNumber } = err as Json5SyntaxError;
this.warn({ message, id, loc: { line: lineNumber, column: columnNumber } });
return null; return null;
} }
}, },