Also remove from @babel/generator

packages/babel-generator/src/generators/classes.ts

@@ -7,11 +7,14 @@ export function ClassDeclaration(
   parent: any,
 ) {
   if (
-    !this.format.decoratorsBeforeExport ||
-    (!t.isExportDefaultDeclaration(parent) &&
-      !t.isExportNamedDeclaration(parent))
+    !t.isExportDefaultDeclaration(parent) &&
+    !t.isExportNamedDeclaration(parent)
   ) {
     this.printJoin(node.decorators, node);
+  } else if (!process.env.BABEL_8_BREAKING) {
+    if (!(this.format as any).decoratorsBeforeExport) {
+      this.printJoin(node.decorators, node);
+    }
   }
 
   if (node.declare) {

packages/babel-generator/src/generators/modules.ts

@@ -76,11 +76,12 @@ export function ExportNamedDeclaration(
   this: Printer,
   node: t.ExportNamedDeclaration,
 ) {
-  if (
-    this.format.decoratorsBeforeExport &&
-    t.isClassDeclaration(node.declaration)
-  ) {
-    this.printJoin(node.declaration.decorators, node);
+  if (t.isClassDeclaration(node.declaration)) {
+    if (process.env.BABEL_8_BREAKING) {
+      this.printJoin(node.declaration.decorators, node);
+    } else if ((this.format as any).decoratorsBeforeExport) {
+      this.printJoin(node.declaration.decorators, node);
+    }
   }
 
   this.word("export");
@@ -92,11 +93,12 @@ export function ExportDefaultDeclaration(
   this: Printer,
   node: t.ExportDefaultDeclaration,
 ) {
-  if (
-    this.format.decoratorsBeforeExport &&
-    t.isClassDeclaration(node.declaration)
-  ) {
-    this.printJoin(node.declaration.decorators, node);
+  if (t.isClassDeclaration(node.declaration)) {
+    if (process.env.BABEL_8_BREAKING) {
+      this.printJoin(node.declaration.decorators, node);
+    } else if ((this.format as any).decoratorsBeforeExport) {
+      this.printJoin(node.declaration.decorators, node);
+    }
   }
 
   this.word("export");

packages/babel-generator/src/index.ts

@@ -54,7 +54,6 @@ function normalizeOptions(code, opts): Format {
       style: "  ",
       base: 0,
     },
-    decoratorsBeforeExport: !!opts.decoratorsBeforeExport,
     jsescOption: {
       quotes: "double",
       wrap: true,
@@ -66,6 +65,7 @@ function normalizeOptions(code, opts): Format {
 
   if (!process.env.BABEL_8_BREAKING) {
     format.jsonCompatibleStrings = opts.jsonCompatibleStrings;
+    (format as any).decoratorsBeforeExport = !!opts.decoratorsBeforeExport;
   }
 
   if (format.minified) {
@@ -176,12 +176,6 @@ export interface GeneratorOptions {
    */
   jsonCompatibleStrings?: boolean;
 
-  /**
-   * Set to true to enable support for experimental decorators syntax before module exports.
-   * Defaults to `false`.
-   */
-  decoratorsBeforeExport?: boolean;
-
   /**
    * Options for outputting jsesc representation.
    */

packages/babel-generator/src/printer.ts

@@ -25,7 +25,6 @@ export type Format = {
     style: string;
     base: number;
   };
-  decoratorsBeforeExport: boolean;
   recordAndTupleSyntaxType: "bar" | "hash";
   jsescOption;
   jsonCompatibleStrings?;

packages/babel-generator/test/fixtures/decorators/options.json → packages/babel-generator/test/fixtures/decorators-babel-7/options.json

@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "plugins": [
     ["decorators", { "decoratorsBeforeExport": false }],
     "classProperties",

packages/babel-generator/test/fixtures/decoratorsBeforeExport/options.json

@@ -0,0 +1,3 @@
+{
+  "BABEL_8_BREAKING": false
+}

packages/babel-generator/test/fixtures/regression/11870/options.json

@@ -1,4 +1,4 @@
 {
   "retainLines": true,
-  "plugins": [["decorators", { "decoratorsBeforeExport": true }]]
+  "plugins": ["decorators-legacy"]
 }

packages/babel-generator/test/fixtures/types/Decorator-babel-7/input.js

@@ -0,0 +1,45 @@
+var obj = {
+  @foo
+  @bar
+  foo: "bar",
+
+  @foo
+  @bar
+  foo() {},
+
+  @foo
+  get foo() {},
+
+  @bar
+  set bar(foo) {}
+};
+
+class Foo {
+  @foo
+  @bar
+  foo() {}
+
+  @foo
+  @bar
+  foo() {}
+
+  @foo
+  get foo() {}
+
+  @bar
+  set bar(foo) {}
+}
+
+@foo
+export default class Foo2 {
+  bar() {
+    class Baz {}
+  }
+}
+
+@foo
+export class Foo3 {
+  bar() {
+    class Baz {}
+  }
+}

packages/babel-generator/test/fixtures/types/Decorator-babel-7/options.json

@@ -0,0 +1,4 @@
+{
+  "BABEL_8_BREAKING": false,
+  "plugins": ["decorators-legacy"]
+}

packages/babel-generator/test/fixtures/types/Decorator-babel-7/output.js

@@ -0,0 +1,48 @@
+var obj = {
+  @foo
+  @bar
+  foo: "bar",
+
+  @foo
+  @bar
+  foo() {},
+
+  @foo
+  get foo() {},
+
+  @bar
+  set bar(foo) {}
+
+};
+
+class Foo {
+  @foo
+  @bar
+  foo() {}
+
+  @foo
+  @bar
+  foo() {}
+
+  @foo
+  get foo() {}
+
+  @bar
+  set bar(foo) {}
+
+}
+
+export default @foo
+class Foo2 {
+  bar() {
+    class Baz {}
+  }
+
+}
+export @foo
+class Foo3 {
+  bar() {
+    class Baz {}
+  }
+
+}

packages/babel-generator/test/fixtures/types/Decorator/options.json

@@ -1 +1,4 @@
-{ "plugins": ["decorators-legacy"] }
+{
+  "BABEL_8_BREAKING": true,
+  "plugins": ["decorators-legacy"]
+}

packages/babel-generator/test/fixtures/types/Decorator/output.js

@@ -32,15 +32,15 @@ class Foo {
 
 }
 
-export default @foo
-class Foo2 {
+@foo
+export default class Foo2 {
   bar() {
     class Baz {}
   }
 
 }
-export @foo
-class Foo3 {
+@foo
+export class Foo3 {
   bar() {
     class Baz {}
   }