fix(web): 修复样式加载顺序问题 (#1129)

remaxjs · Jul 3, 2020 · af8db50 · af8db50 · vercel · Jul 3, 2020
1 parent 5d63358
commit af8db50
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 67 deletions.
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/web/index.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/web/index.js
diff --git a/...ges/remax-cli/src/__tests__/integration/fixtures/one/expected/web/packageA/pages/index.js b/...ges/remax-cli/src/__tests__/integration/fixtures/one/expected/web/packageA/pages/index.js
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/web/pages/index.js b/packages/remax-cli/src/__tests__/integration/fixtures/one/expected/web/pages/index.js
diff --git a/packages/remax-cli/template/entry.js.ejs b/packages/remax-cli/template/entry.js.ejs
@@ -1,12 +1,12 @@
+import 'remax/web/normalize.css';
+import 'remax/web/app.css';
+
 import App from './app';
 import * as React from 'react';
 import { createPageConfig, createAppConfig } from 'remax';
 import { Router, CacheSwitch, CacheRoute, Route, Redirect, Link, createHashHistory, createBrowserHistory, render, hd, loadable } from 'remax/web';
 import { RuntimeOptions } from '@remax/runtime';
 
-import 'remax/web/normalize.css';
-import 'remax/web/app.css';
-
 hd();
 
 <%- pages.map((page, i) => `const page_${i} = loadable(() => import(/* webpackChunkName: "${page.route}" */'${page.path}').then(({ default: c }) => createPageConfig(c)));`).join('\n') %>

diff --git a/packages/remax-one/src/hostComponents/Label/index.web.tsx b/packages/remax-one/src/hostComponents/Label/index.web.tsx
@@ -8,4 +8,4 @@ const Label: React.ForwardRefRenderFunction<any, LabelProps> = (props, ref) => (
  <label {...filterProps(props)} ref={ref} />
 );
 
-export default Label;
+export default React.forwardRef(Label);