Merge pull request #1213 from alibaba/fix-engineer-error

Fix engineer error

packages/rax-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rax-cli",
-  "version": "2.0.0-1",
+  "version": "2.0.0-7",
   "license": "BSD-3-Clause",
   "description": "Command line interface for Rax",
   "main": "src/index.js",

packages/rax-cli/src/generator/api/_package.json

@@ -19,7 +19,7 @@
     "universal-env": "^1.0.0"
   },
   "devDependencies": {
-    "rax-scripts": "^2.0.0-0",
-    "rax-plugin-api": "^0.1.0-1"
+    "rax-scripts": "^2.0.0-2",
+    "rax-plugin-api": "^0.1.0-2"
   }
 }

packages/rax-cli/src/generator/app/_package.json

@@ -19,14 +19,13 @@
     <%_ } -%>
     "rax-view": "^1.0.0",
     "rax-text": "^1.0.0",
-    "rax-view": "^1.0.0",
-    "universal-app-runtime": "^0.1.3"
+    "universal-app-runtime": "^0.1.5-0"
   },
   "devDependencies": {
     <%_ if (projectFeatures.includes('ssr')) { -%>
-    "rax-plugin-ssr": "^0.1.0",
+    "rax-plugin-ssr": "^0.1.0-1",
     <%_ } -%>
-    "rax-scripts": "^2.0.0-0",
-    "rax-plugin-app": "^0.1.0-1"
+    "rax-scripts": "^2.0.0-2",
+    "rax-plugin-app": "^0.1.0-4"
   }
 }

packages/rax-cli/src/generator/app/src/app.json

@@ -3,11 +3,7 @@
   "routes": [
     {
       "path": "/",
-      "component": "pages/home"
-    },
-    {
-      "path": "/about",
-      "component": "pages/about"
+      "component": "pages/Home/index"
     }
   ],
   <%_ if (isSSR) { -%>

packages/rax-cli/src/generator/app/src/components/Logo/index.css

@@ -0,0 +1,5 @@
+.logo {
+  width: 200rpx;
+  height: 180rpx;
+  margin-bottom: 20rpx;
+}

packages/rax-cli/src/generator/app/src/components/Logo/index.js

@@ -0,0 +1,14 @@
+import styles from './index.css';
+import { createElement } from 'rax';
+import Image from 'rax-image';
+
+export default (props) => {
+  return (
+    <Image
+      style={styles.logo}
+      source={{
+        uri: '//gw.alicdn.com/tfs/TB1MRC_cvb2gK0jSZK9XXaEgFXa-1701-1535.png',
+      }}
+    />
+  );
+};

packages/rax-cli/src/generator/app/src/pages/home/index.css

@@ -0,0 +1,16 @@
+.home {
+  align-items: center;
+  margin-top: 200rpx;
+}
+
+.title {
+  font-size: 45rpx;
+  font-weight: bold;
+  margin: 20rpx 0;
+}
+
+.info {
+  font-size: 36rpx;
+  margin: 8rpx 0;
+  color: #555;
+}

packages/rax-cli/src/generator/app/src/pages/home/index.jsx

@@ -1,9 +1,18 @@
+import styles from './index.css';
 import { createElement } from 'rax';
+import View from 'rax-view';
+import Text from 'rax-text';
 
-import Main from '../../components/Main';
+import Logo from '../../components/Logo';
 
 export default function Home() {
   return (
-    <Main />
+    <View style={styles.home}>
+      <Logo />
+      <Text style={styles.title}>Welcome to Your Rax App</Text>
+
+      <Text style={styles.info}>More information about Rax</Text>
+      <Text style={styles.info}>Visit https://rax.js.org</Text>
+    </View>
   );
 }

packages/rax-cli/src/generator/component/_package.json

@@ -25,7 +25,7 @@
   "devDependencies": {
     "driver-universal": "^1.0.0",
     "rax": "^1.0.0",
-    "rax-scripts": "^2.0.0-0",
-    "rax-plugin-component": "^0.1.0-1"
+    "rax-scripts": "^2.0.0-2",
+    "rax-plugin-component": "^0.1.0-2"
   }
 }

packages/rax-is-valid-element/src/index.js

@@ -1,3 +1,3 @@
 export default function isValidElement(object) {
-  return typeof object === 'object' && object !== null && object.type && object.props;
-}
+  return typeof object === 'object' && object !== null && object.type && !!object.props;
+}

packages/rax-miniapp-renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rax-miniapp-renderer",
-  "version": "0.1.0-2",
+  "version": "0.1.1",
   "description": "Rax renderer for miniapp.",
   "license": "BSD-3-Clause",
   "main": "dist/rax-miniapp-renderer.min.js",

packages/rax-miniapp-renderer/src/EventHandler.js

@@ -81,7 +81,12 @@ export default class EventHandler {
 
   addNoBubblesEventListener(node, name) {
     const listener = (evt) => {
-      const target = {$$id: node.$$id};
+      const target = { $$id: node.$$id };
+
+      if (node === document.body) {
+        target.nodeName = 'BODY';
+      }
+
       this.postMessage({
         type: 'event',
         event: {

packages/rax-miniapp-renderer/src/MutationHandler.js

@@ -37,7 +37,7 @@ export default class MutationHandler {
     let sharedNodeMap = this.sharedNodeMap;
     let vnode = target;
 
-    if (vnode && vnode.nodeName === 'BODY') {
+    if (vnode && vnode.nodeName === 'BODY' && vnode.$$id) {
       this.mountNode.$$id = vnode.$$id;
     }
 

packages/rax-plugin-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rax-plugin-api",
-  "version": "0.1.0-1",
+  "version": "0.1.0-2",
   "description": "rax api base plugins",
   "license": "BSD-3-Clause",
   "main": "src/index.js",

packages/rax-plugin-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rax-plugin-app",
-  "version": "0.1.0-3",
+  "version": "0.1.0-4",
   "description": "rax app base plugins",
   "license": "BSD-3-Clause",
   "main": "src/index.js",
@@ -50,7 +50,7 @@
     "deepmerge": "^4.0.0",
     "fs-extra": "^8.1.0",
     "image-source-loader": "^0.6.5",
-    "jsx2mp-cli": "^0.1.0-beta.1",
+    "jsx2mp-cli": "^0.1.0",
     "less": "^3.9.0",
     "less-loader": "^5.0.0",
     "loader-utils": "^1.1.0",
@@ -66,7 +66,7 @@
     "ts-loader": "^5.3.3",
     "typescript": "^3.2.4",
     "uglifyjs-webpack-plugin": "^2.1.2",
-    "universal-app-shell-loader": "^0.2.0-4",
+    "universal-app-shell-loader": "^0.2.0-5",
     "webpack": "^4.27.1",
     "webpack-bundle-analyzer": "^3.0.3",
     "webpack-chain": "^6.0.0",

packages/rax-plugin-app/src/config/miniapp/build.js

@@ -3,7 +3,7 @@ const jsx2mp = require('jsx2mp-cli');
 
 const getOutputPath = require('./getOutputPath');
 
-module.exports = (context) => {
+module.exports = (context, cancelClear) => {
   const outputPath = getOutputPath(context);
   fs.removeSync(outputPath);