Merge branch 'dev' into alpha

packages/vue-cli-plugin-uni/lib/app-plus/index.js

@@ -147,8 +147,9 @@ const v3 = {
         rules: [{
           test: path.resolve(process.env.UNI_INPUT_DIR, getMainEntry()),
           use: [{
-            loader: isAppService ? 'wrap-loader' : path.resolve(__dirname,
-              '../../packages/webpack-uni-app-loader/view/main.js'),
+            loader: isAppService
+              ? path.resolve(__dirname, '../../packages/wrap-loader') : path.resolve(__dirname,
+                '../../packages/webpack-uni-app-loader/view/main.js'),
             options: {
               compiler: vueLoader.compiler,
               before: [

packages/vue-cli-plugin-uni/lib/h5/index.js

@@ -113,7 +113,7 @@ module.exports = {
         rules: [{
           test: path.resolve(process.env.UNI_INPUT_DIR, getMainEntry()),
           use: [{
-            loader: 'wrap-loader',
+            loader: path.resolve(__dirname, '../../packages/wrap-loader'),
             options: {
               before: [
                 beforeCode + statCode + getGlobalUsingComponentsCode()
@@ -123,7 +123,7 @@ module.exports = {
         }, {
           test: /App\.vue$/,
           use: {
-            loader: 'wrap-loader',
+            loader: path.resolve(__dirname, '../../packages/wrap-loader'),
             options: {
               before: [`<template><App :keepAliveInclude="keepAliveInclude"/></template>`]
             }

packages/vue-cli-plugin-uni/lib/mp/index.js

@@ -106,7 +106,7 @@ module.exports = {
         rules: [{
           test: path.resolve(process.env.UNI_INPUT_DIR, getMainEntry()),
           use: [{
-            loader: 'wrap-loader',
+            loader: path.resolve(__dirname, '../../packages/wrap-loader'),
             options: {
               before: [
                 beforeCode + statCode

packages/vue-cli-plugin-uni/packages/wrap-loader/LICENSE

+Copyright (c) 2014 Daniel Perez Alvarez
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

packages/vue-cli-plugin-uni/packages/wrap-loader/README.md

+# Wrap loader for webpack [![Version](https://img.shields.io/npm/v/wrap-loader.svg)](https://www.npmjs.com/package/wrap-loader) [![Build Status](https://img.shields.io/travis/unindented/wrap-loader.svg)](http://travis-ci.org/unindented/wrap-loader)
+
+Adds custom content before and after the loaded source.
+
+
+## Installation
+
+```sh
+$ npm install --save wrap-loader
+```
+
+
+## Usage
+
+[Documentation: Using loaders](http://webpack.github.io/docs/using-loaders.html)
+
+In your `webpack.config.js` file:
+
+```js
+module.exports = {
+  module: {
+    loaders: [{
+      test:   /\.less$/,
+      loader: 'style!css!less!wrap?less'
+    }]
+  },
+
+  wrap: {
+    less: {
+      before: [
+        '@import "~bootstrap/less/variables.less";',
+        '@import "~bootstrap/less/mixins.less";'
+      ],
+      after: '@import "~utils/debug.less";'
+    }
+  }
+};
+```
+
+
+## Meta
+
+* Code: `git clone git://github.com/unindented/wrap-loader.git`
+* Home: <https://github.com/unindented/wrap-loader/>
+
+
+## Contributors
+
+* Daniel Perez Alvarez ([unindented@gmail.com](mailto:unindented@gmail.com))
+
+
+## License
+
+Copyright (c) 2014 Daniel Perez Alvarez ([unindented.org](http://unindented.org/)). This is free software, and may be redistributed under the terms specified in the LICENSE file.

packages/vue-cli-plugin-uni/packages/wrap-loader/index.js

+const utils = require('loader-utils')
+
+module.exports = function (source) {
+  this.cacheable()
+
+  const opts = utils.getOptions(this) || {}
+  // fixed by xxxxxx 保持行号不变
+  return [].concat(opts.before, source, opts.after).join('').trim()
+  // return [].concat(opts.before, source, opts.after).join('\n').trim()
+}

packages/vue-cli-plugin-uni/packages/wrap-loader/package.json

+{
+  "_args": [
+    [
+      "wrap-loader@0.2.0",
+      "/Users/fxy/Documents/DCloud/HBuilderX/uniapp-cli"
+    ]
+  ],
+  "_development": true,
+  "_from": "wrap-loader@0.2.0",
+  "_id": "wrap-loader@0.2.0",
+  "_inBundle": false,
+  "_integrity": "sha512-Qdhdu7vr2H8dLE2sKySQznOBHXIHbKg7PZ5aqkeBOQHGqxLfcJw/ZlB40j67b1tks9OYqSBCHc+uHtGRCmQYlg==",
+  "_location": "/wrap-loader",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "wrap-loader@0.2.0",
+    "name": "wrap-loader",
+    "escapedName": "wrap-loader",
+    "rawSpec": "0.2.0",
+    "saveSpec": null,
+    "fetchSpec": "0.2.0"
+  },
+  "_requiredBy": [
+    "/@dcloudio/vue-cli-plugin-uni"
+  ],
+  "_resolved": "https://registry.npmjs.org/wrap-loader/-/wrap-loader-0.2.0.tgz",
+  "_spec": "0.2.0",
+  "_where": "/Users/fxy/Documents/DCloud/HBuilderX/uniapp-cli",
+  "author": {
+    "name": "Daniel Perez Alvarez",
+    "email": "unindented@gmail.com",
+    "url": "http://unindented.org/"
+  },
+  "bugs": {
+    "url": "https://github.com/unindented/wrap-loader/issues"
+  },
+  "dependencies": {
+    "loader-utils": "^1.1.0"
+  },
+  "description": "Add custom content before and after the loaded source.",
+  "devDependencies": {
+    "eslint": "^3.19.0",
+    "eslint-config-standard": "^10.2.1",
+    "eslint-plugin-import": "^2.3.0",
+    "eslint-plugin-node": "^5.0.0",
+    "eslint-plugin-promise": "^3.5.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "nodeunit": "^0.11.1",
+    "npm-run-all": "^4.0.2"
+  },
+  "homepage": "https://github.com/unindented/wrap-loader#readme",
+  "keywords": [
+    "wrap",
+    "webpack"
+  ],
+  "name": "wrap-loader",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/unindented/wrap-loader.git"
+  },
+  "scripts": {
+    "test": "run-s test:*",
+    "test:lint": "eslint .",
+    "test:unit": "nodeunit test/loader.js"
+  },
+  "version": "0.2.0"
+}

src/platforms/quickapp-vue/README.md

-## 快应用适配教程
+uni-app对快应用的适配，现状如下：
+1. 在uni-app的cli版本中，提供了快应用的条件编译，在条件编译里，使用快应用的组件和api，可以直接运行和发布快应用。
+2. 如果想使用uni-app的组件和api，在快应用里运行，需要一个中间适配层。这层目前DCloud官方完成一部分组件和api的适配，其余组件和api，计划交给社区开发者解决。
 
-使用 uni-app 规范适配快应用
+欢迎各位开发者一起参与完善，如下文档为开发者参与适配更多uni组件和API的教程。
 
+### 参考文档
 - uni-app文档 [https://uniapp.dcloud.io/](https://uniapp.dcloud.io/)
-- 快应用文档 [https://doc.quickapp.cn/](https://doc.quickapp.cn/)
+-  [快应用官网](https://doc.quickapp.cn/)，[使用 Vue开发快应用](https://doc.quickapp.cn/tutorial/others/vue.html)
+
+
+### 仓库介绍
+[uni-app](https://github.com/dcloudio/uni-app)
+uni-app 是一个使用 Vue.js 开发小程序、H5、App的统一前端框架。
+
+[hello quickapp](https://github.com/dcloudio/hello-quickapp-vue)
+测试uni-app快应用组件及 API，已包含 button 组件、剪切板、及平台调用示例
+
+
+### 快速体验
+1. 安装 [快应用调试器](https://statres.quickapp.cn/quickapp/quickapp/201806/file/quickapp_debugger.apk)
+
+2. 打开快应用调试器，下载平台（快应用预览版：版本号1060）
+
+3. 拉取 [hello quickapp](https://github.com/dcloudio/hello-quickapp-vue)
+```
+git clone https://github.com/dcloudio/hello-quickapp-vue.git
+cd ./hello-quickapp-vue
+yarn install
+```
+
+4. 编译快应用 `rpk`
+```
+npm run dev:quickapp-vue
+```
+5. 开启debug在线更新服务
+```
+npm run serve:quickapp-vue
+```
+
+6. 打开快应用调试器，扫码安装或右上角设置服务器地址(注意带上`http://`，关闭USB调试可看到扫码)
+- 修改代码后，会主动通知调试器更新，或者手动点击在线更新（调试可以点击右下角开始调试）
 
 
 ### 开发
 
-1.Fork 仓库 `uni-app` [https://github.com/dcloudio/uni-app](https://github.com/dcloudio/uni-app)，切换到 dev-quickapp 分支
+1. Fork 仓库 `uni-app` [https://github.com/dcloudio/uni-app](https://github.com/dcloudio/uni-app)，切换到 dev-quickapp 分支
 
-2.使用 Vue 规范开发组件，参考 `Button` 组件及 `clipboard` 示例
+2. 源码中有2个例子，分别是 `Button` 组件适配示例及 `clipboard`  API适配示例
 ```
 - button `src/platforms/quickapp-vue/view/components/button`
 - clipboard `src/platforms/quickapp-vue/service/api/device/clipboard`
 ```
 
-3.编译 (输出目录`packages/uni-quickapp-vue`)
+3. 编译 (输出目录`packages/uni-quickapp-vue`)
 ```
 npm run build:quickapp-vue
 ```
 
+手动替换 `uni-app` 编译输出目录 `packages/uni-quickapp-vue` 到 `hello quickapp` 工程 `node_modules/@dcloudio/uni-quickapp-vue`, 可以考虑 `npm link`
+
+
 #### `uni-app` 目录说明
 
 ```
@@ -41,44 +80,39 @@ src
  │              └─button
 ```
 
-### 测试
 
-#### 搭建测试环境
-
-1.安装 [快应用调试器](https://statres.quickapp.cn/quickapp/quickapp/201806/file/quickapp_debugger.apk)
-
-2.打开快应用调试器，下载平台（快应用预览版：版本号1060）
-
-#### 搭建测试工程
-
-1.测试工程 [https://github.com/dcloudio/test-quickapp-vue](https://github.com/dcloudio/test-quickapp-vue)
+### 提交代码
+使用 `pull request` 提交代码
 
-使用 git clone(需要配置 git 命令行支持) 或下载 zip 解压
+### 组件条件编译
 ```
-git clone https://github.com/dcloudio/test-quickapp-vue.git
-cd ./test-quickapp-vue
-yarn install
+<template>
+  <view>
+    <!-- #ifdef QUICKAPP-VUE -->
+    <button>Button</button>
+    <!-- #endif -->
+  </view>
+</template>
 ```
 
-
-2.编译快应用 `rpk`
+### 调用快应用平台 API
 ```
-npm run dev:quickapp-vue
+<script>
+// 剪切板，注意权限配置
+var clipboard = $app_require$("@app-module/system.clipboard");
+</script>
 ```
 
-3.开启debug在线更新服务
+### 权限配置
 ```
-npm run serve:quickapp-vue
-```
-
-4.打开快应用调试器，扫码安装或右上角设置服务器地址(注意带上`http://`，关闭USB调试可看到扫码)
-
-5.修改代码后，会主动通知调试器更新，或者手动点击在线更新（调试可以点击右下角开始调试）
+src/manifest.json
 
-6.手动替换 `uni-app` 编译输出目录 `packages/uni-quickapp-vue` 到测试工程 `node_modules/@dcloudio/uni-quickapp-vue`, 可以考虑 `npm link`
-
-### 提交代码
-使用 `pull request` 提交代码
+"quickapp-vue": {
+    "icon": "static/logo.png",
+    "package": "com.example.demo",
+    "features": [{ "name": "system.clipboard" }] //剪切板权限
+}
+```
 
 
 
@@ -89,6 +123,7 @@ openssl req -newkey rsa:2048 -nodes -keyout private.pem -x509 -days 3650 -out ce
 ```
 - 发布快应用时需要使用自己的证书，开发期间为debug证书
 
-注意：
-hello uni-app使用了px单位，在快应用里等同于rpx，故页面显示异常，非调试ui阶段，
-可以自己修改manifest.json->quickapp->config->designWidth=自己手头设备的逻辑像素，如360
+
+注：目前华为快应用还不支持这种开发方式，华为版的适配，uni-app官方会另行提供。
+
+QQ交流群：148203425

src/platforms/quickapp-vue/service/api/network/request.js

+import {
+  publish
+} from '../../bridge'
+
+import stream from '@system.fetch'
+
+let requestTaskId = 0
+const requestTasks = {}
+
+const publishStateChange = res => {
+  publish('onRequestTaskStateChange', res)
+  delete requestTasks[requestTaskId]
+}
+
+export function createRequestTaskById (requestTaskId, {
+  url,
+  data,
+  header,
+  method = 'GET',
+  responseType,
+  sslVerify = true
+} = {}) {
+  let abortTimeout
+  let aborted
+
+  const timeout = 60000
+  if (timeout) {
+    abortTimeout = setTimeout(() => {
+      aborted = true
+      publishStateChange({
+        requestTaskId,
+        state: 'fail',
+        statusCode: 0,
+        errMsg: 'timeout'
+      })
+    }, (timeout + 100))
+  }
+  const options = {
+    method,
+    url: url.trim(),
+    header,
+    type: responseType,
+    timeout: timeout || 6e5
+  }
+  if (method !== 'GET') {
+    options.body = data
+  }
+  try {
+    stream.fetch({
+      ...options,
+      success: ({
+        code,
+        data,
+        headers
+      }) => {
+        console.log(data)
+        if (aborted) {
+          return
+        }
+        if (abortTimeout) {
+          clearTimeout(abortTimeout)
+        }
+        const statusCode = code
+        if (statusCode > 0) {
+          publishStateChange({
+            requestTaskId,
+            state: 'success',
+            data: data,
+            statusCode,
+            header: headers
+          })
+        } else {
+          publishStateChange({
+            requestTaskId,
+            state: 'fail',
+            statusCode,
+            errMsg: 'abort statusCode:' + statusCode
+          })
+        }
+      },
+      fail: (data, code) => {
+        publishStateChange({
+          requestTaskId,
+          state: 'fail',
+          statusCode: code,
+          errMsg: 'abort statusCode:' + code
+        })
+      }
+    })
+    requestTasks[requestTaskId] = {
+      abort () {
+        aborted = true
+        if (abortTimeout) {
+          clearTimeout(abortTimeout)
+        }
+        publishStateChange({
+          requestTaskId,
+          state: 'fail',
+          statusCode: 0,
+          errMsg: 'abort'
+        })
+      }
+    }
+  } catch (e) {
+    return {
+      requestTaskId,
+      errMsg: 'createRequestTask:fail'
+    }
+  }
+  return {
+    requestTaskId,
+    errMsg: 'createRequestTask:ok'
+  }
+}
+
+export function createRequestTask (args) {
+  return createRequestTaskById(++requestTaskId, args)
+}
+
+export function operateRequestTask ({
+  requestTaskId,
+  operationType
+} = {}) {
+  const requestTask = requestTasks[requestTaskId]
+  if (requestTask && operationType === 'abort') {
+    requestTask.abort()
+    return {
+      errMsg: 'operateRequestTask:ok'
+    }
+  }
+  return {
+    errMsg: 'operateRequestTask:fail'
+  }
+}

src/platforms/quickapp-vue/service/base-api.js

@@ -5,5 +5,6 @@ export * from 'uni-core/service/api/base/interceptor'
 export * from 'uni-core/service/api/base/upx2px'
 
 export * from 'uni-core/service/api/context/audio'
-export * from 'uni-core/service/api/context/background-audio'
+export * from 'uni-core/service/api/context/background-audio'
+export * from 'uni-core/service/api/network/request'
 // TODO

src/platforms/quickapp-vue/service/bridge.js

 export function invoke (...args) {
   return global.UniServiceJSBridge.invokeCallbackHandler(...args)
 }
+
+export function publish (name, ...args) {
+  return global.UniServiceJSBridge.emit('api.' + name, ...args)
+}

src/platforms/quickapp-vue/service/platform-api.js

@@ -4,3 +4,6 @@ export * from './api/route/redirect-to'
 
 // device
 export * from './api/device/clipboard'
+
+// network
+export * from './api/network/request'