upgrade to 2.0

zhang740 · zhang740 · commit 87567f4e90cf · 2017-09-28T12:42:55.000+08:00
diff --git a/web-ssr/components/MenuBar.js b/web-ssr/components/MenuBar.js
@@ -3,7 +3,7 @@ import Router from 'next/router'
 import { TabBar, Icon } from 'antd-mobile'
 
 export default class MenuBar extends Component {
-  render () {
+  render() {
     const {
       pathname,
       children
diff --git a/web-ssr/next.config.js b/web-ssr/next.config.js
@@ -1,28 +1,7 @@
 const path = require('path')
 const fs = require('fs')
-const requireHacker = require('require-hacker')
 
-function setupRequireHacker () {
-  const webjs = '.web.js'
-  const webModules = ['antd-mobile', 'rmc-picker'].map(m => path.join('node_modules', m))
-
-  requireHacker.hook('js', filename => {
-    if (filename.endsWith(webjs) || webModules.every(p => !filename.includes(p))) return
-
-    const webFilename = filename.replace(/\.js$/, webjs)
-    if (!fs.existsSync(webFilename)) return
-
-    return fs.readFileSync(webFilename, { encoding: 'utf8' })
-  })
-
-  requireHacker.hook('svg', filename => {
-    return requireHacker.to_javascript_module_source(`#${path.parse(filename).name}`)
-  })
-}
-
-setupRequireHacker()
-
-function moduleDir (m) {
+function moduleDir(m) {
   return path.dirname(require.resolve(`${m}/package.json`))
 }
 
diff --git a/web-ssr/package.json b/web-ssr/package.json
@@ -2,7 +2,7 @@
   "name": "with-antd-mobile",
   "version": "1.1.0",
   "dependencies": {
-    "antd-mobile": "1.4.0",
+    "antd-mobile": "^2.0.0-beta.2",
     "babel-plugin-import": "^1.2.1",
     "next": "latest",
     "react": "^15.6.1",
diff --git a/web-ssr/pages/_document.js b/web-ssr/pages/_document.js
@@ -1,14 +1,14 @@
 import Document, { Head, Main, NextScript } from 'next/document'
 
 export default class extends Document {
-  render () {
+  render() {
     return (
       <html>
         <Head>
-          <script src='/static/hd.min.js' />
-          <link rel='stylesheet' type='text/css' href='//unpkg.com/antd-mobile/dist/antd-mobile.min.css' />
+          <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1" />
+          <link rel='stylesheet' type='text/css' href='//unpkg.com/antd-mobile@2.0.0-beta.2/dist/antd-mobile.min.css' />
         </Head>
-        <body style={{margin: 0}}>
+        <body style={{ margin: 0 }}>
           <Main />
           <NextScript />
         </body>
