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

Co-authored-by: Tan Li Hau <tanhauhau@users.noreply.github.com>
babel · Dec 10, 2020 · e8176de · e8176de
1 parent 4f3fcf1
commit e8176de
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/packages/babel-generator/src/generators/types.js b/packages/babel-generator/src/generators/types.js
@@ -204,11 +204,16 @@ export function StringLiteral(node: Object) {
   }
 
   // ensure the output is ASCII-safe
-  const opts = this.format.jsescOption;
-  if (this.format.jsonCompatibleStrings) {
-    opts.json = true;
-  }
-  const val = jsesc(node.value, opts);
+
+  const val = jsesc(
+    node.value,
+    process.env.BABEL_8_BREAKING
+      ? this.format.jsescOption
+      : Object.assign(
+          this.format.jsescOption,
+          this.format.jsonCompatibleStrings && { json: true },
+        ),
+  );
 
   return this.token(val);
 }

diff --git a/packages/babel-generator/src/index.js b/packages/babel-generator/src/index.js
@@ -46,7 +46,6 @@ function normalizeOptions(code, opts): Format {
     compact: opts.compact,
     minified: opts.minified,
     concise: opts.concise,
-    jsonCompatibleStrings: opts.jsonCompatibleStrings,
     indent: {
       adjustMultilineComment: true,
       style: "  ",
@@ -61,6 +60,10 @@ function normalizeOptions(code, opts): Format {
     recordAndTupleSyntaxType: opts.recordAndTupleSyntaxType,
   };
 
+  if (!process.env.BABEL_8_BREAKING) {
+    format.jsonCompatibleStrings = opts.jsonCompatibleStrings;
+  }
+
   if (format.minified) {
     format.compact = true;
 

diff --git a/packages/babel-generator/test/fixtures/escapes/jsonEscape-babel-7/input.js b/packages/babel-generator/test/fixtures/escapes/jsonEscape-babel-7/input.js
@@ -0,0 +1,2 @@
+0; // Not a directive
+"©";
diff --git a/packages/babel-generator/test/fixtures/escapes/jsonEscape-babel-7/options.json b/packages/babel-generator/test/fixtures/escapes/jsonEscape-babel-7/options.json
@@ -0,0 +1,5 @@
+{
+  "BABEL_8_BREAKING": false,
+  "minified": true,
+  "jsonCompatibleStrings": true
+}
diff --git a/packages/babel-generator/test/fixtures/escapes/jsonEscape-babel-7/output.js b/packages/babel-generator/test/fixtures/escapes/jsonEscape-babel-7/output.js
@@ -0,0 +1,2 @@
+0;// Not a directive
+"\u00A9";
diff --git a/packages/babel-generator/test/fixtures/escapes/jsonEscape/options.json b/packages/babel-generator/test/fixtures/escapes/jsonEscape/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": true,
   "minified": true,
-  "jsonCompatibleStrings": true
+  "jsescOption": { "json": true }
 }