Skip to content

Commit 7490d74

Browse files
committed
clean notices & fix web demo & add dependency of weex-vue-render. apache#1204.
1 parent 9ffdd04 commit 7490d74

File tree

4 files changed

+4
-28
lines changed

4 files changed

+4
-28
lines changed

POSSIBLE-NOTICES-FOR-BIN-DIST

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,13 @@ by Tom Preston-Werner , licensed under the Creative Commons - CC BY 3.0 License.
1010
This product contains software core-js(https://github.com/zloirock/core-js) developed
1111
by Denis Pushkarev , licensed under the MIT License.
1212

13-
This product contains software autoprefixer(https://github.com/postcss/autoprefixer) developed
14-
by postcss , licensed under the MIT License.
15-
16-
This product contains software query-string(https://github.com/sindresorhus/query-string) developed
17-
by sindresorhus , licensed under the MIT License.
18-
19-
This product contains software weex-picker(https://github.com/weexteam/weex-picker) developed
20-
by abigtree , licensed under the Apache 2.0 License.
21-
2213
This product contains software weex-rax-framework(https://github.com/alibaba/rax) developed
2314
by yuanyan , licensed under the BSD-3-Clause License.
2415

2516
This product contains software weex-vue-framework(https://github.com/vuejs/vue) developed
2617
by fkysly , licensed under the MIT License.
2718

28-
This product contains software weex-vue-render(https://github.com/vuejs/vue) developed
19+
This product contains software weex-vue-render(https://github.com/weexteam/weex-vue-render) developed
2920
by MrRaindrop , licensed under the Apache 2.0 License.
3021

3122
This product contains software weex-styler(https://github.com/weexteam/weex-styler) developed

examples/vue/include/base-url.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ exports.getBaseURL = function (vm) {
3737
}
3838
nativeBase = 'http://' + host + '/' + vm.dir + '/build/';
3939
}
40-
var h5Base = './vue.html?page=./' + vm.dir + '/build/';
40+
var h5Base = './index.html?page=./' + vm.dir + '/build/';
4141
// in Native
4242
var base = nativeBase;
4343
if (typeof window === 'object') {

index.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,9 @@
4747
</head>
4848
<body>
4949
<div id="root"></div>
50-
<!-- <script>
51-
window.onerror = function (err) {
52-
alert('error!' + JSON.stringify(err))
53-
}
54-
</script> -->
55-
<!--<script src="./node_modules/vue/dist/vue.runtime.min.js"></script>-->
5650
<script src="./node_modules/vue/dist/vue.runtime.js"></script>
57-
<!--<script src="dist/vue.runtime.js"></script> -->
58-
<!-- <script src="./node_modules/weex-vue-render/index.min.js"></script> -->
51+
<script src="./node_modules/weex-vue-render/dist/index.js"></script>
5952
<script src="./packages/weex-vue-render/dist/index.js"></script>
60-
<!--<script src="./dist/render.vue.js"></script>-->
61-
<!--<script src="./dist/render.vue.min.js"></script>-->
62-
<!--<script src="./packages/weex-vue-render/dist/index.min.js"></script>-->
63-
<!--This line is only used to run weex-picker example,you can remove this line when you do not need weex-picker module-->
64-
<script src="./node_modules/@weex-project/weex-picker/js/build/index.js"></script>
6553
<script>
6654
/**
6755
* these iife is just for the convenience for the showcase of demos.

package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,13 @@
7979
},
8080
"dependencies": {
8181
"@weex-project/downgrade": "^1.0.3",
82-
"autoprefixer": "^6.7.7",
8382
"blink-diff": "~1.0.12",
8483
"core-js": "^2.4.0",
85-
"query-string": "^4.2.3",
8684
"semver": "^5.1.0",
87-
"weex-picker": "^0.1.0",
8885
"weex-rax-framework": "0.4.20",
8986
"weex-vue-framework": "2.5.13-weex.5"
9087
},
9188
"devDependencies": {
92-
"@weex-project/weex-picker": "^0.2.4",
9389
"babel-core": "^6.17.0",
9490
"babel-eslint": "^7.2.1",
9591
"babel-istanbul": "^0.11.0",
@@ -139,6 +135,7 @@
139135
"weex-gcanvas": "^0.4.2",
140136
"weex-loader": "^0.5.3",
141137
"weex-vdom-tester": "^0.2.0",
138+
"weex-vue-render": "^1.0.24",
142139
"weex-wd": "^1.0.23",
143140
"xmldom": "^0.1.27"
144141
}

0 commit comments

Comments
 (0)