Skip to content

Commit cb253d7

Browse files
committed
wip: weex framework integration
1 parent 550dcee commit cb253d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+13404
-4
lines changed

.flowconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ module.name_mapper='^compiler/\(.*\)$' -> '<PROJECT_ROOT>/src/compiler/\1'
1515
module.name_mapper='^core/\(.*\)$' -> '<PROJECT_ROOT>/src/core/\1'
1616
module.name_mapper='^shared/\(.*\)$' -> '<PROJECT_ROOT>/src/shared/\1'
1717
module.name_mapper='^web/\(.*\)$' -> '<PROJECT_ROOT>/src/platforms/web/\1'
18+
module.name_mapper='^weex/\(.*\)$' -> '<PROJECT_ROOT>/src/platforms/weex/\1'
1819
module.name_mapper='^server/\(.*\)$' -> '<PROJECT_ROOT>/src/server/\1'
1920
module.name_mapper='^entries/\(.*\)$' -> '<PROJECT_ROOT>/src/entries/\1'
2021
module.name_mapper='^sfc/\(.*\)$' -> '<PROJECT_ROOT>/src/sfc/\1'

build/alias.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ module.exports = {
66
core: path.resolve(__dirname, '../src/core'),
77
shared: path.resolve(__dirname, '../src/shared'),
88
web: path.resolve(__dirname, '../src/platforms/web'),
9+
weex: path.resolve(__dirname, '../src/platforms/weex'),
910
server: path.resolve(__dirname, '../src/server'),
1011
entries: path.resolve(__dirname, '../src/entries'),
1112
sfc: path.resolve(__dirname, '../src/sfc')

build/config.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,19 @@ const builds = {
6464
dest: path.resolve(__dirname, '../packages/vue-server-renderer/build.js'),
6565
format: 'cjs',
6666
external: ['stream', 'module', 'vm', 'he', 'de-indent']
67+
},
68+
// Weex runtime framework (CommonJS).
69+
'weex-framework': {
70+
entry: path.resolve(__dirname, '../src/entries/weex-framework.js'),
71+
dest: path.resolve(__dirname, '../packages/weex-vue-framework/index.js'),
72+
format: 'cjs'
73+
},
74+
// Weex compiler (CommonJS). Used by Weex's Webpack loader.
75+
'weex-compiler': {
76+
entry: path.resolve(__dirname, '../src/entries/weex-compiler.js'),
77+
dest: path.resolve(__dirname, '../packages/weex-template-compiler/build.js'),
78+
format: 'cjs',
79+
external: ['entities', 'de-indent']
6780
}
6881
}
6982

build/release-weex.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# TODO, only release weex package by bumping the weex postfix

package.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,25 @@
2323
"dev:test": "karma start build/karma.dev.config.js",
2424
"dev:ssr": "TARGET=web-server-renderer rollup -w -c build/config.js",
2525
"dev:compiler": "TARGET=web-compiler rollup -w -c build/config.js",
26+
"dev:weex": "TARGET=weex-framework rollup -w -c build/config.js",
27+
"dev:weex:compiler": "TARGET=weex-compiler rollup -w -c build/config.js",
2628
"build": "node build/build.js",
2729
"build:ssr": "npm run build -- vue.common.js,vue-server-renderer",
30+
"build:weex": "npm run build -- weex-vue-framework,weex-template-compiler",
2831
"test": "npm run lint && flow check && npm run test:types && npm run test:cover && npm run test:e2e -- --env phantomjs && npm run test:ssr",
2932
"test:unit": "karma start build/karma.unit.config.js",
3033
"test:cover": "karma start build/karma.cover.config.js",
3134
"test:e2e": "npm run build -- vue.min.js && node test/e2e/runner.js",
35+
"test:weex": "npm run build:weex && jasmine JASMINE_CONFIG_PATH=test/weex/jasmine.json",
3236
"test:ssr": "npm run build:ssr && VUE_ENV=server jasmine JASMINE_CONFIG_PATH=test/ssr/jasmine.json",
3337
"test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2",
3438
"test:types": "tsc -p ./types/test/tsconfig.json",
3539
"lint": "eslint src build test",
3640
"flow": "flow check",
3741
"sauce": "SAUCE=true karma start build/karma.sauce.config.js",
3842
"bench:ssr": "npm run build:ssr && NODE_ENV=production VUE_ENV=server node benchmarks/ssr/renderToString.js && NODE_ENV=production VUE_ENV=server node benchmarks/ssr/renderToStream.js",
39-
"release": "bash build/release.sh"
43+
"release": "bash build/release.sh",
44+
"release:weex": "bash build/release-weex.sh"
4045
},
4146
"repository": {
4247
"type": "git",
@@ -99,6 +104,8 @@
99104
"selenium-server": "2.53.1",
100105
"typescript": "^2.0.2",
101106
"uglify-js": "^2.6.2",
102-
"webpack": "^1.13.2"
107+
"webpack": "^1.13.2",
108+
"weex-js-runtime": "^0.17.0-alpha4",
109+
"weex-vdom-tester": "^0.1.3"
103110
}
104111
}

packages/vue-server-renderer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
"he": "^1.1.0",
2222
"de-indent": "^1.0.2"
2323
},
24-
"homepage": "https://github.com/vuejs/vue#readme"
24+
"homepage": "https://github.com/vuejs/vue/tree/dev/packages/vue-server-renderer#readme"
2525
}

packages/vue-template-compiler/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"bugs": {
1717
"url": "https://github.com/vuejs/vue/issues"
1818
},
19-
"homepage": "https://github.com/vuejs/vue#readme",
19+
"homepage": "https://github.com/vuejs/vue/tree/dev/packages/vue-template-compiler#readme",
2020
"dependencies": {
2121
"he": "^1.1.0",
2222
"de-indent": "^1.0.2"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# weex-template-compiler
2+
3+
> This package is auto-generated. For pull requests please see [src/entries/weex-compiler.js](https://github.com/weexteam/weex-vue-framework/blob/dev-weex/src/entries/weex-compiler.js).

0 commit comments

Comments
 (0)