Skip to content
This repository has been archived by the owner on Mar 7, 2024. It is now read-only.

Support for react-devtools #994

Merged
merged 11 commits into from
Jun 15, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
refactor: 优化内部组件的 displayName
  • Loading branch information
yesmeck committed Jun 12, 2020
commit aa346c3fc5271fdbdebda14c5d679bd6d8508202
3 changes: 0 additions & 3 deletions e2e/mini/src/app.css
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
page {
background: #282c34;
}
16 changes: 12 additions & 4 deletions packages/remax-cli/src/build/babel/app.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
import * as t from '@babel/types';
import { slash } from '@remax/shared';
import { NodePath } from '@babel/traverse';
import { NodePath, Node } from '@babel/traverse';
import { addNamed } from '@babel/helper-module-imports';

function appConfigExpression(path: NodePath<t.ExportDefaultDeclaration>, id: t.Identifier) {
const createId = addNamed(path, 'createAppConfig', '@remax/runtime');
path.insertAfter(
t.exportDefaultDeclaration(t.callExpression(t.identifier('App'), [t.callExpression(createId, [id])]))
);
const insert: Node[] = [
t.exportDefaultDeclaration(t.callExpression(t.identifier('App'), [t.callExpression(createId, [id])])),
];
if (process.env.NODE_ENV === 'development') {
insert.unshift(
t.expressionStatement(
t.assignmentExpression('=', t.memberExpression(id, t.identifier('displayName')), t.stringLiteral('App'))
)
);
}
path.insertAfter(insert);
}

export default (entry: string) => {
Expand Down
28 changes: 21 additions & 7 deletions packages/remax-cli/src/build/babel/page.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,30 @@
import * as t from '@babel/types';
import { NodePath } from '@babel/traverse';
import { NodePath, Node } from '@babel/traverse';
import { addNamed } from '@babel/helper-module-imports';
import { Options } from '@remax/types';
import { slash } from '@remax/shared';
import { getPages } from '../../getEntries';
import API from '../../API';

function pageConfigExpression(path: NodePath<t.ExportDefaultDeclaration>, id: t.Identifier, name: t.StringLiteral) {
function pageConfigExpression(path: NodePath<t.ExportDefaultDeclaration>, id: t.Identifier, name: string) {
const createId = addNamed(path, 'createPageConfig', '@remax/runtime');
path.insertAfter(
t.exportDefaultDeclaration(t.callExpression(t.identifier('Page'), [t.callExpression(createId, [id, name])]))
);
const insert: Node[] = [
t.exportDefaultDeclaration(
t.callExpression(t.identifier('Page'), [t.callExpression(createId, [id, t.stringLiteral(name)])])
),
];
if (process.env.NODE_ENV === 'development') {
insert.unshift(
t.expressionStatement(
t.assignmentExpression(
'=',
t.memberExpression(id, t.identifier('displayName')),
t.stringLiteral(`Page[${name}]`)
)
)
);
}
path.insertAfter(insert);
}

export default function page(options: Options, api: API) {
Expand All @@ -32,14 +46,14 @@ export default function page(options: Options, api: API) {
const pageId = path.scope.generateUidIdentifier('page');
const declaration = path.node.declaration;
path.replaceWith(t.variableDeclaration('const', [t.variableDeclarator(pageId, declaration)]));
pageConfigExpression(path, pageId, t.stringLiteral(name));
pageConfigExpression(path, pageId, name);
path.stop();
} else if (t.isFunctionDeclaration(path.node.declaration) || t.isClassDeclaration(path.node.declaration)) {
const declaration = path.node.declaration;
const pageId = path.scope.generateUidIdentifierBasedOnNode(path.node);
declaration.id = pageId;
path.replaceWith(declaration);
pageConfigExpression(path, pageId, t.stringLiteral(name));
pageConfigExpression(path, pageId, name);
path.stop();
}
},
Expand Down
2 changes: 2 additions & 0 deletions packages/remax-runtime/src/PageInstanceContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ import * as React from 'react';

const PageInstanceContext = React.createContext<any>(null);

PageInstanceContext.displayName = 'PageContext';

export default PageInstanceContext;