Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cross-fork lint: Support named export declaration #20784

Merged
merged 1 commit into from
Feb 10, 2021
+72 −37
Merged

Cross-fork lint: Support named export declaration #20784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-reconciler/src/ReactFiberReconciler.old.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export {
DefaultLanePriority as DefaultEventPriority,
} from './ReactFiberLane.old';

export {registerMutableSourceForHydration} from './ReactMutableSource.new';
export {registerMutableSourceForHydration} from './ReactMutableSource.old';
export {createPortal} from './ReactPortal';
export {
createComponentSelector,
Expand Down
24 changes: 24 additions & 0 deletions scripts/eslint-rules/__tests__/no-cross-fork-imports-test.internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,29 @@ ruleTester.run('eslint-rules/no-cross-fork-imports', rule, {
],
output: "import {scheduleUpdateOnFiber} from './ReactFiberWorkLoop.new';",
},
{
code: "export {DiscreteEventPriority} from './ReactFiberLane.old.js';",
filename: 'ReactFiberReconciler.new.js',
errors: [
{
message:
'A module that belongs to the new fork cannot import a module ' +
'from the old fork.',
},
],
output: "export {DiscreteEventPriority} from './ReactFiberLane.new';",
},
{
code: "export {DiscreteEventPriority} from './ReactFiberLane.new.js';",
filename: 'ReactFiberReconciler.old.js',
errors: [
{
message:
'A module that belongs to the old fork cannot import a module ' +
'from the new fork.',
},
],
output: "export {DiscreteEventPriority} from './ReactFiberLane.old';",
},
],
});
83 changes: 47 additions & 36 deletions scripts/eslint-rules/no-cross-fork-imports.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,48 +26,59 @@ module.exports = {
const sourceFilename = context.getFilename();

if (isOldFork(sourceFilename)) {
const visitor = node => {
const sourceNode = node.source;
if (sourceNode === null) {
return;
}
const filename = sourceNode.value;
if (isNewFork(filename)) {
context.report({
node: sourceNode,
message:
'A module that belongs to the old fork cannot import a module ' +
'from the new fork.',
fix(fixer) {
return fixer.replaceText(
sourceNode,
`'${filename.replace(/\.new(\.js)?$/, '.old')}'`
);
},
});
}
};
return {
ImportDeclaration(node) {
const importSourceNode = node.source;
const filename = importSourceNode.value;
if (isNewFork(filename)) {
context.report({
node: importSourceNode,
message:
'A module that belongs to the old fork cannot import a module ' +
'from the new fork.',
fix(fixer) {
return fixer.replaceText(
importSourceNode,
`'${filename.replace(/\.new(\.js)?$/, '.old')}'`
);
},
});
}
},
ImportDeclaration: visitor,
ExportNamedDeclaration: visitor,
};
}

if (isNewFork(sourceFilename)) {
const visitor = node => {
const sourceNode = node.source;
if (sourceNode === null) {
return;
}
const filename = sourceNode.value;
if (isOldFork(filename)) {
context.report({
node: sourceNode,
message:
'A module that belongs to the new fork cannot import a module ' +
'from the old fork.',
fix(fixer) {
return fixer.replaceText(
sourceNode,
`'${filename.replace(/\.old(\.js)?$/, '.new')}'`
);
},
});
}
};

return {
ImportDeclaration(node) {
const importSourceNode = node.source;
const filename = importSourceNode.value;
if (isOldFork(filename)) {
context.report({
node: importSourceNode,
message:
'A module that belongs to the new fork cannot import a module ' +
'from the old fork.',
fix(fixer) {
return fixer.replaceText(
importSourceNode,
`'${filename.replace(/\.old(\.js)?$/, '.new')}'`
);
},
});
}
},
ImportDeclaration: visitor,
ExportNamedDeclaration: visitor,
};
}

Expand Down