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

Rename decorators&decorators2 plugins to decorators-legacy&decorators. (#7821)

Browse Source 
Reasons:
1) Naming consistency with Babel plugins
2) Sooner or later the decorators2 plugin should become decorators anyway
This commit is contained in:
Nicolò Ribaudo 2018-05-10 20:01:35 +02:00 committed by GitHub
parent 21b03c35d3
commit 25c3f0d689
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/babel-generator/test/fixtures/types/Decorator/options.json vendored
View File

@ -1 +1 @@
{ "plugins": ["decorators"] } { "plugins": ["decorators-legacy"] }

2
packages/babel-generator/test/fixtures/typescript/class-parameter-properties-with-decorators/options.json vendored
View File

@ -1,3 +1,3 @@
{ {
"plugins": ["typescript", "decorators"] "plugins": ["typescript", "decorators-legacy"]
} }

2
packages/babel-plugin-syntax-decorators/src/index.js
View File

@ -10,7 +10,7 @@ export default declare((api, options) => {
return { return {
manipulateOptions(opts, parserOpts) { manipulateOptions(opts, parserOpts) {
parserOpts.plugins.push(legacy ? "decorators" : "decorators2"); parserOpts.plugins.push(legacy ? "decorators-legacy" : "decorators");
}, },
}; };
}); });

4
packages/babylon/src/index.js
View File

@ -67,8 +67,8 @@ function getParserClass(
pluginsFromOptions: $ReadOnlyArray<string>, pluginsFromOptions: $ReadOnlyArray<string>,
): Class<Parser> { ): Class<Parser> {
if ( if (
pluginsFromOptions.indexOf("decorators") >= 0 && pluginsFromOptions.indexOf("decorators-legacy") >= 0 &&
pluginsFromOptions.indexOf("decorators2") >= 0 pluginsFromOptions.indexOf("decorators") >= 0
) { ) {
throw new Error("Cannot use decorators and decorators2 plugin together"); throw new Error("Cannot use decorators and decorators2 plugin together");
} }

2
packages/babylon/src/parser/expression.js
View File

@ -1273,7 +1273,7 @@ export default class ExpressionParser extends LValParser {
} }
if (this.match(tt.at)) { if (this.match(tt.at)) {
if (this.hasPlugin("decorators2")) { if (this.hasPlugin("decorators")) {
this.raise( this.raise(
this.state.start, this.state.start,
"Stage 2 decorators disallow object literal property decorators", "Stage 2 decorators disallow object literal property decorators",

2
packages/babylon/src/parser/lval.js
View File

@ -261,7 +261,7 @@ export default class LValParser extends NodeUtils {
break; break;
} else { } else {
const decorators = []; const decorators = [];
if (this.match(tt.at) && this.hasPlugin("decorators2")) { if (this.match(tt.at) && this.hasPlugin("decorators")) {
this.raise( this.raise(
this.state.start, this.state.start,
"Stage 2 decorators cannot be used to decorate parameters", "Stage 2 decorators cannot be used to decorate parameters",

8
packages/babylon/src/parser/statement.js
View File

@ -230,7 +230,7 @@ export default class StatementParser extends ExpressionParser {
} }
parseDecorators(allowExport?: boolean): void { parseDecorators(allowExport?: boolean): void {
if (this.hasPlugin("decorators2")) { if (this.hasPlugin("decorators")) {
allowExport = false; allowExport = false;
} }
@ -263,12 +263,12 @@ export default class StatementParser extends ExpressionParser {
} }
parseDecorator(): N.Decorator { parseDecorator(): N.Decorator {
this.expectOnePlugin(["decorators", "decorators2"]); this.expectOnePlugin(["decorators-legacy", "decorators"]);
const node = this.startNode(); const node = this.startNode();
this.next(); this.next();
if (this.hasPlugin("decorators2")) { if (this.hasPlugin("decorators")) {
// Every time a decorator class expression is evaluated, a new empty array is pushed onto the stack // Every time a decorator class expression is evaluated, a new empty array is pushed onto the stack
// So that the decorators of any nested class expressions will be dealt with separately // So that the decorators of any nested class expressions will be dealt with separately
this.state.decoratorStack.push([]); this.state.decoratorStack.push([]);
@ -1525,7 +1525,7 @@ export default class StatementParser extends ExpressionParser {
this.state.type.keyword === "function" || this.state.type.keyword === "function" ||
this.state.type.keyword === "class" || this.state.type.keyword === "class" ||
this.isContextual("async") || this.isContextual("async") ||
(this.match(tt.at) && this.expectPlugin("decorators2")) (this.match(tt.at) && this.expectPlugin("decorators"))
); );
} }

2
packages/babylon/test/fixtures/experimental/_no-plugin/decorators/options.json vendored
View File

@ -1,4 +1,4 @@
{ {
"throws": "This experimental syntax requires enabling one of the following parser plugin(s): 'decorators, decorators2' (1:0)", "throws": "This experimental syntax requires enabling one of the following parser plugin(s): 'decorators-legacy, decorators' (1:0)",
"plugins": [] "plugins": []
} }

2
packages/babylon/test/fixtures/experimental/decorators-2/class-property/options.json vendored
View File

@ -1,3 +1,3 @@
{ {
"plugins": ["classProperties", "classPrivateProperties", "decorators2"] "plugins": ["classProperties", "classPrivateProperties", "decorators"]
} }

2
packages/babylon/test/fixtures/experimental/decorators-2/compued-property/options.json vendored
View File

@ -1,3 +1,3 @@
{ {
"plugins": ["decorators2", "classProperties"] "plugins": ["decorators", "classProperties"]
} }

2
packages/babylon/test/fixtures/experimental/decorators-2/export-decorated-class-without-plugin/options.json vendored
View File

@ -1,5 +1,5 @@
{ {
"sourceType": "module", "sourceType": "module",
"throws": "This experimental syntax requires enabling the parser plugin: 'decorators2' (1:7)", "throws": "This experimental syntax requires enabling the parser plugin: 'decorators' (1:7)",
"plugins": null "plugins": null
} }

2
packages/babylon/test/fixtures/experimental/decorators-2/options.json vendored
View File

@ -1,3 +1,3 @@
{ {
"plugins": ["decorators2"] "plugins": ["decorators"]
} }

2
packages/babylon/test/fixtures/experimental/decorators-2/plugin-conflict/options.json vendored
View File

@ -1,4 +1,4 @@
{ {
"plugins": ["decorators", "decorators2"], "plugins": ["decorators-legacy", "decorators"],
"throws": "Cannot use decorators and decorators2 plugin together" "throws": "Cannot use decorators and decorators2 plugin together"
} }

2
packages/babylon/test/fixtures/experimental/decorators-2/private-property/options.json vendored
View File

@ -1,3 +1,3 @@
{ {
"plugins": ["classProperties", "classPrivateProperties", "decorators2"] "plugins": ["classProperties", "classPrivateProperties", "decorators"]
} }

2
packages/babylon/test/fixtures/experimental/decorators-2/static-property/options.json vendored
View File

@ -1,3 +1,3 @@
{ {
"plugins": ["classProperties", "decorators2"] "plugins": ["classProperties", "decorators"]
} }

2
packages/babylon/test/fixtures/experimental/decorators/computed-member-expr-on-prop/options.json vendored
View File

@ -1,3 +1,3 @@
{ {
"plugins": ["decorators", "classProperties"] "plugins": ["decorators-legacy", "classProperties"]
} }

2
packages/babylon/test/fixtures/experimental/decorators/options.json vendored
View File

@ -1,3 +1,3 @@
{ {
"plugins": ["decorators"] "plugins": ["decorators-legacy"]
} }

2
packages/babylon/test/fixtures/experimental/uncategorised/40/options.json vendored
View File

@ -1,3 +1,3 @@
{ {
"plugins": ["decorators"] "plugins": ["decorators-legacy"]
} }

2
packages/babylon/test/fixtures/experimental/uncategorised/41/options.json vendored
View File

@ -1,4 +1,4 @@
{ {
"plugins": ["decorators"], "plugins": ["decorators-legacy"],
"throws": "Leading decorators must be attached to a class declaration (1:5)" "throws": "Leading decorators must be attached to a class declaration (1:5)"
} }

2
packages/babylon/test/fixtures/experimental/uncategorised/42/options.json vendored
View File

@ -1,4 +1,4 @@
{ {
"plugins": ["decorators"], "plugins": ["decorators-legacy"],
"throws": "You have trailing decorators with no method (1:18)" "throws": "You have trailing decorators with no method (1:18)"
} }

2
packages/babylon/test/fixtures/experimental/uncategorised/47/options.json vendored
View File

@ -1,6 +1,6 @@
{ {
"plugins": [ "plugins": [
"classProperties", "classProperties",
"decorators" "decorators-legacy"
] ]
} }

2
packages/babylon/test/fixtures/experimental/uncategorised/48/options.json vendored
View File

@ -1,6 +1,6 @@
{ {
"plugins": [ "plugins": [
"classProperties", "classProperties",
"decorators" "decorators-legacy"
] ]
} }

2
packages/babylon/test/fixtures/experimental/uncategorised/49/options.json vendored
View File

@ -1,3 +1,3 @@
{ {
"plugins": ["decorators"] "plugins": ["decorators-legacy"]
} }

2
packages/babylon/test/fixtures/experimental/uncategorised/62/options.json vendored
View File

@ -1,3 +1,3 @@
{ {
"plugins": ["decorators"] "plugins": ["decorators-legacy"]
} }

2
packages/babylon/test/fixtures/typescript/class/parameter-properties-with-decorators/options.json vendored
View File

@ -1,3 +1,3 @@
{ {
"plugins": ["typescript", "decorators"] "plugins": ["typescript", "decorators-legacy"]
} }

2
scripts/tests/flow/run_babylon_flow_tests.js
View File

@ -115,7 +115,7 @@ const flowOptionsMapping = {
esproposal_class_instance_fields: "classProperties", esproposal_class_instance_fields: "classProperties",
esproposal_class_static_fields: "classProperties", esproposal_class_static_fields: "classProperties",
esproposal_export_star_as: "exportNamespaceFrom", esproposal_export_star_as: "exportNamespaceFrom",
esproposal_decorators: "decorators", esproposal_decorators: "decorators-legacy",
esproposal_optional_chaining: "optionalChaining", esproposal_optional_chaining: "optionalChaining",
types: "flowComments", types: "flowComments",
}; };