cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[babel 8] Remove the jsonCompatibleStrings option (#12477)

Browse Source 
Co-authored-by: Tan Li Hau <tanhauhau@users.noreply.github.com>
This commit is contained in:
Nicolò Ribaudo 2020-12-10 18:14:13 +01:00 committed by GitHub
parent 4f3fcf1110
commit e8176de528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/babel-generator/src/generators/types.js
View File

@ -204,11 +204,16 @@ export function StringLiteral(node: Object) {
} }
// ensure the output is ASCII-safe // ensure the output is ASCII-safe
const opts = this.format.jsescOption;
if (this.format.jsonCompatibleStrings) { const val = jsesc(
opts.json = true; node.value,
} process.env.BABEL_8_BREAKING
const val = jsesc(node.value, opts); ? this.format.jsescOption
: Object.assign(
this.format.jsescOption,
this.format.jsonCompatibleStrings && { json: true },
),
);
return this.token(val); return this.token(val);
} }

5
packages/babel-generator/src/index.js
View File

@ -46,7 +46,6 @@ function normalizeOptions(code, opts): Format {
compact: opts.compact, compact: opts.compact,
minified: opts.minified, minified: opts.minified,
concise: opts.concise, concise: opts.concise,
jsonCompatibleStrings: opts.jsonCompatibleStrings,
indent: { indent: {
adjustMultilineComment: true, adjustMultilineComment: true,
style: " ", style: " ",
@ -61,6 +60,10 @@ function normalizeOptions(code, opts): Format {
recordAndTupleSyntaxType: opts.recordAndTupleSyntaxType, recordAndTupleSyntaxType: opts.recordAndTupleSyntaxType,
}; };
if (!process.env.BABEL_8_BREAKING) {
format.jsonCompatibleStrings = opts.jsonCompatibleStrings;
}
if (format.minified) { if (format.minified) {
format.compact = true; format.compact = true;

2
packages/babel-generator/test/fixtures/escapes/jsonEscape-babel-7/input.js vendored Normal file
View File

@ -0,0 +1,2 @@
0; // Not a directive
"©";

5
packages/babel-generator/test/fixtures/escapes/jsonEscape-babel-7/options.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"BABEL_8_BREAKING": false,
"minified": true,
"jsonCompatibleStrings": true
}

2
packages/babel-generator/test/fixtures/escapes/jsonEscape-babel-7/output.js vendored Normal file
View File

@ -0,0 +1,2 @@
0;// Not a directive
"\u00A9";

3
packages/babel-generator/test/fixtures/escapes/jsonEscape/options.json vendored
View File

@ -1,4 +1,5 @@
{ {
"BABEL_8_BREAKING": true,
"minified": true, "minified": true,
"jsonCompatibleStrings": true "jsescOption": { "json": true }
} }