Skip to content

Commit 4556f12

Browse files
committed
fix!: remove ecmaFeatures.globalReturn
1 parent 16219fe commit 4556f12

File tree

11 files changed

+26
-324
lines changed

11 files changed

+26
-324
lines changed

packages/espree/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,6 @@ const options = {
156156
// enable JSX parsing
157157
jsx: false,
158158

159-
// enable return in global scope (set to true automatically when sourceType is "commonjs")
160-
globalReturn: false,
161-
162159
// enable implied strict mode (if ecmaVersion >= 5)
163160
impliedStrict: false
164161
}

packages/espree/docs/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,6 @@ const options = {
156156
// enable JSX parsing
157157
jsx: false,
158158

159-
// enable return in global scope (set to true automatically when sourceType is "commonjs")
160-
globalReturn: false,
161-
162159
// enable implied strict mode (if ecmaVersion >= 5)
163160
impliedStrict: false
164161
}

packages/espree/lib/features.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ export default {
1919
// React JSX parsing
2020
jsx: false,
2121

22-
// allow return statement in global scope
23-
globalReturn: false,
24-
2522
// allow implied strict mode
2623
impliedStrict: false
2724
};

packages/espree/lib/options.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,12 @@ export function normalizeOptions(options) {
107107
}
108108
const allowReserved = ecmaVersion === 3 ? (options.allowReserved || "never") : false;
109109
const ecmaFeatures = options.ecmaFeatures || {};
110-
const allowReturnOutsideFunction = options.sourceType === "commonjs" ||
111-
Boolean(ecmaFeatures.globalReturn);
110+
111+
if (Object.hasOwn(ecmaFeatures, "globalReturn")) {
112+
throw new Error("`ecmaFeatures.globalReturn` has been removed. To allow top-level return statements, set `sourceType` to 'commonjs'.");
113+
}
114+
115+
const allowReturnOutsideFunction = options.sourceType === "commonjs";
112116

113117
if (sourceType === "module" && ecmaVersion < 6) {
114118
throw new Error("sourceType 'module' is not supported when ecmaVersion < 2015. Consider adding `{ ecmaVersion: 2015 }` to the parser options.");

packages/espree/tests/fixtures/ecma-features/globalReturn/return-identifier.result.js

Lines changed: 0 additions & 111 deletions
This file was deleted.

packages/espree/tests/fixtures/ecma-features/globalReturn/return-identifier.src.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/espree/tests/fixtures/ecma-features/globalReturn/return-no-arg.result.js

Lines changed: 0 additions & 76 deletions
This file was deleted.

packages/espree/tests/fixtures/ecma-features/globalReturn/return-no-arg.src.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/espree/tests/fixtures/ecma-features/globalReturn/return-true.result.js

Lines changed: 0 additions & 112 deletions
This file was deleted.

packages/espree/tests/fixtures/ecma-features/globalReturn/return-true.src.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)