From b6f1d4f5092ff9a48baef50a527ae61713479503 Mon Sep 17 00:00:00 2001
From: Torleif Berger <torleif@outlook.com>
Date: Fri, 9 Aug 2019 14:21:09 +0200
Subject: [PATCH 1/3] fix(eslint-plugin): [explicit-function-return-type] Fix
 allowExpressions

---
 .../rules/explicit-function-return-type.ts    |  3 +-
 .../explicit-function-return-type.test.ts     | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/packages/eslint-plugin/src/rules/explicit-function-return-type.ts b/packages/eslint-plugin/src/rules/explicit-function-return-type.ts
index b431fe7675ce..44ea2d03c8e2 100644
--- a/packages/eslint-plugin/src/rules/explicit-function-return-type.ts
+++ b/packages/eslint-plugin/src/rules/explicit-function-return-type.ts
@@ -256,7 +256,8 @@ export default util.createRule<Options, MessageIds>({
         if (
           options.allowExpressions &&
           node.parent.type !== AST_NODE_TYPES.VariableDeclarator &&
-          node.parent.type !== AST_NODE_TYPES.MethodDefinition
+          node.parent.type !== AST_NODE_TYPES.MethodDefinition &&
+          node.parent.type !== AST_NODE_TYPES.ExportDefaultDeclaration
         ) {
           return;
         }
diff --git a/packages/eslint-plugin/tests/rules/explicit-function-return-type.test.ts b/packages/eslint-plugin/tests/rules/explicit-function-return-type.test.ts
index 72d64d2abe06..32f23792591e 100644
--- a/packages/eslint-plugin/tests/rules/explicit-function-return-type.test.ts
+++ b/packages/eslint-plugin/tests/rules/explicit-function-return-type.test.ts
@@ -90,6 +90,15 @@ class Test {
         },
       ],
     },
+    {
+      filename: 'test.ts',
+      code: `export default (): void => {}`,
+      options: [
+        {
+          allowExpressions: true,
+        },
+      ],
+    },
     {
       filename: 'test.ts',
       code: `
@@ -417,6 +426,30 @@ function test() {
         },
       ],
     },
+    {
+      filename: 'test.ts',
+      code: 'export default () => {};',
+      options: [{ allowExpressions: true }],
+      errors: [
+        {
+          messageId: 'missingReturnType',
+          line: 1,
+          column: 16,
+        },
+      ],
+    },
+    {
+      filename: 'test.ts',
+      code: 'export default function() {};',
+      options: [{ allowExpressions: true }],
+      errors: [
+        {
+          messageId: 'missingReturnType',
+          line: 1,
+          column: 16,
+        },
+      ],
+    },
     {
       filename: 'test.ts',
       code: "var arrowFn = () => 'test';",

From ba6cfa00392ec7c9a81712153bdb1b39876aa5a7 Mon Sep 17 00:00:00 2001
From: Torleif Berger <torleif@outlook.com>
Date: Fri, 9 Aug 2019 21:04:16 +0200
Subject: [PATCH 2/3] Added examples of incorrect code even with
 `allowExpressions` set to true

---
 .../eslint-plugin/docs/rules/explicit-function-return-type.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/eslint-plugin/docs/rules/explicit-function-return-type.md b/packages/eslint-plugin/docs/rules/explicit-function-return-type.md
index b1ac9af14ff4..9d6977a92c2c 100644
--- a/packages/eslint-plugin/docs/rules/explicit-function-return-type.md
+++ b/packages/eslint-plugin/docs/rules/explicit-function-return-type.md
@@ -84,6 +84,10 @@ Examples of **incorrect** code for this rule with `{ allowExpressions: true }`:
 
 ```ts
 function test() {}
+
+const fn = () => {};
+
+export default () => {};
 ```
 
 Examples of **correct** code for this rule with `{ allowExpressions: true }`:

From bcd562ea14aee0de87c7b7e6b96754bdc6923bc2 Mon Sep 17 00:00:00 2001
From: Torleif Berger <torleif@outlook.com>
Date: Fri, 9 Aug 2019 21:06:02 +0200
Subject: [PATCH 3/3] Simplified the examples I wrote for
 `allowHigherOrderFunctions` in my last PR by removing the parameters which
 are not relevant to the examples

---
 .../docs/rules/explicit-function-return-type.md  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/eslint-plugin/docs/rules/explicit-function-return-type.md b/packages/eslint-plugin/docs/rules/explicit-function-return-type.md
index 9d6977a92c2c..f31d6f42b8ba 100644
--- a/packages/eslint-plugin/docs/rules/explicit-function-return-type.md
+++ b/packages/eslint-plugin/docs/rules/explicit-function-return-type.md
@@ -159,24 +159,20 @@ functionWithObjectArg({
 Examples of **incorrect** code for this rule with `{ allowHigherOrderFunctions: true }`:
 
 ```ts
-var arrowFn = (x: number) => (y: number) => x + y;
+var arrowFn = () => () => {};
 
-function fn(x: number) {
-  return function(y: number) {
-    return x + y;
-  };
+function fn() {
+  return function() {};
 }
 ```
 
 Examples of **correct** code for this rule with `{ allowHigherOrderFunctions: true }`:
 
 ```ts
-var arrowFn = (x: number) => (y: number): number => x + y;
+var arrowFn = () => (): void => {};
 
-function fn(x: number) {
-  return function(y: number): number {
-    return x + y;
-  };
+function fn() {
+  return function(): void {};
 }
 ```