Skip to content

Commit b72b8ca

Browse files
authored
Merge pull request #176 from GeekyAnts/develop
Release tag 0.1.0
2 parents 7e95962 + 23042f6 commit b72b8ca

File tree

100 files changed

+6560
-29915
lines changed

Some content is hidden

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

100 files changed

+6560
-29915
lines changed

README.md

+9-7
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,16 @@ $ vue-native init <projectName>
3636
## NOTE:
3737

3838
```
39+
'AlertIOS',
40+
'AsyncStorage',
41+
'ImageStore',
42+
'ListView',
43+
'MaskedViewIOS',
3944
'NetInfo',
40-
'AsyncStorage',
41-
'AlertIOS',
42-
'WebView',
43-
'ViewPagerAndroid',
44-
'ListView',
45-
'SwipeableListView',
46-
'Slider'
45+
'Slider',
46+
'SwipeableListView',
47+
'ViewPagerAndroid',
48+
'WebView',
4749
```
4850
The above modules are set to be removed from future core react-native.
4951
Hence these modules can no longer be imported from vue-native.

build/.eslintrc

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
12
{
3+
"env": {
4+
"es6": true,
5+
},
26
"rules": {
3-
"camelcase": 0
4-
}
7+
"camelcase": 0,
8+
},
59
}

build/build.js

+21-23
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ if (process.argv[2]) {
1616
builds = builds.filter(b => {
1717
return filters.some(f => b.dest.indexOf(f) > -1)
1818
})
19-
} else {
20-
// filter out weex builds by default
21-
builds = builds.filter(b => {
22-
return b.dest.indexOf('weex') === -1
23-
})
2419
}
2520

2621
build(builds)
@@ -42,24 +37,27 @@ function build (builds) {
4237

4338
function buildEntry (config) {
4439
const isProd = /min\.js$/.test(config.dest)
45-
return rollup.rollup(config).then(bundle => {
46-
const code = bundle.generate(config).code
47-
if (isProd) {
48-
var minified = (config.banner ? config.banner + '\n' : '') + uglify.minify(code, {
49-
fromString: true,
50-
output: {
51-
screw_ie8: true,
52-
ascii_only: true
53-
},
54-
compress: {
55-
pure_funcs: ['makeMap']
56-
}
57-
}).code
58-
return write(config.dest, minified, true)
59-
} else {
60-
return write(config.dest, code)
61-
}
62-
})
40+
const output = config.output
41+
const { file, banner } = output
42+
return rollup.rollup(config)
43+
.then(bundle => bundle.generate(output))
44+
.then(({ output: [{ code }] }) => {
45+
if (isProd) {
46+
const minified = (banner ? banner + '\n' : '') + uglify.minify(code, {
47+
fromString: true,
48+
output: {
49+
screw_ie8: true,
50+
ascii_only: true
51+
},
52+
compress: {
53+
pure_funcs: ['makeMap']
54+
}
55+
}).code
56+
return write(file, minified, true)
57+
} else {
58+
return write(file, code)
59+
}
60+
})
6361
}
6462

6563
function write (dest, code, zip) {

build/config.js

+26-138
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ const buble = require("rollup-plugin-buble");
33
const alias = require("rollup-plugin-alias");
44
const replace = require("rollup-plugin-replace");
55
const flow = require("rollup-plugin-flow-no-whitespace");
6-
const version = process.env.VERSION || require("../package.json").version;
7-
const weexVersion =
8-
process.env.WEEX_VERSION ||
9-
require("../packages/weex-vue-framework/package.json").version;
6+
const version =
7+
process.env.VERSION
8+
|| require("../packages/vue-native-core/package.json").version;
109

1110
const banner =
1211
"/*!\n" +
@@ -19,15 +18,6 @@ const banner =
1918
" * Released under the MIT License.\n" +
2019
" */";
2120

22-
const weexFactoryPlugin = {
23-
intro() {
24-
return "module.exports = function weexFactory (exports, renderer) {";
25-
},
26-
outro() {
27-
return "}";
28-
}
29-
};
30-
3121
const aliases = require("./alias");
3222
const resolve = p => {
3323
const base = p.split("/")[0];
@@ -43,154 +33,52 @@ const builds = {
4333
entry: resolve("vue-native/index.js"),
4434
dest: resolve("packages/vue-native-core/build.js"),
4535
format: "cjs",
46-
external: ["react"]
36+
external: ["react"],
4737
},
4838
"vue-native-helper": {
4939
entry: resolve("vue-native/runtime/helpers.js"),
5040
dest: resolve("packages/vue-native-helper/build.js"),
5141
format: "cjs",
52-
external: ["react", "change-case", "he", "de-indent"]
42+
},
43+
"vue-native-scripts": {
44+
entry: resolve("vue-native/scripts/index.js"),
45+
dest: resolve("packages/vue-native-scripts/build.js"),
46+
format: "cjs",
47+
external: []
48+
.concat(Object.keys(require("../packages/vue-native-scripts/package.json").dependencies))
49+
.concat(Object.keys(require("../packages/vue-native-scripts/package.json").peerDependencies)),
5350
},
5451
"vue-native-template-compiler": {
5552
entry: resolve("vue-native/compiler.js"),
5653
dest: resolve("packages/vue-native-template-compiler/build.js"),
5754
format: "cjs",
58-
external: ["change-case", "he", "de-indent"]
55+
external: ["change-case", "he", "de-indent"],
5956
}
60-
// Runtime only (CommonJS). Used by bundlers e.g. Webpack & Browserify
61-
// 'web-runtime-cjs': {
62-
// entry: resolve('web/runtime.js'),
63-
// dest: resolve('dist/vue.runtime.common.js'),
64-
// format: 'cjs',
65-
// banner
66-
// },
67-
// // Runtime+compiler CommonJS build (CommonJS)
68-
// 'web-full-cjs': {
69-
// entry: resolve('web/runtime-with-compiler.js'),
70-
// dest: resolve('dist/vue.common.js'),
71-
// format: 'cjs',
72-
// alias: { he: './entity-decoder' },
73-
// banner
74-
// },
75-
// // Runtime only (ES Modules). Used by bundlers that support ES Modules,
76-
// // e.g. Rollup & Webpack 2
77-
// 'web-runtime-esm': {
78-
// entry: resolve('web/runtime.js'),
79-
// dest: resolve('dist/vue.runtime.esm.js'),
80-
// format: 'es',
81-
// banner
82-
// },
83-
// // Runtime+compiler CommonJS build (ES Modules)
84-
// 'web-full-esm': {
85-
// entry: resolve('web/runtime-with-compiler.js'),
86-
// dest: resolve('dist/vue.esm.js'),
87-
// format: 'es',
88-
// alias: { he: './entity-decoder' },
89-
// banner
90-
// },
91-
// // runtime-only build (Browser)
92-
// 'web-runtime-dev': {
93-
// entry: resolve('web/runtime.js'),
94-
// dest: resolve('dist/vue.runtime.js'),
95-
// format: 'umd',
96-
// env: 'development',
97-
// banner
98-
// },
99-
// // runtime-only production build (Browser)
100-
// 'web-runtime-prod': {
101-
// entry: resolve('web/runtime.js'),
102-
// dest: resolve('dist/vue.runtime.min.js'),
103-
// format: 'umd',
104-
// env: 'production',
105-
// banner
106-
// },
107-
// // Runtime+compiler development build (Browser)
108-
// 'web-full-dev': {
109-
// entry: resolve('web/runtime-with-compiler.js'),
110-
// dest: resolve('dist/vue.js'),
111-
// format: 'umd',
112-
// env: 'development',
113-
// alias: { he: './entity-decoder' },
114-
// banner
115-
// },
116-
// // Runtime+compiler production build (Browser)
117-
// 'web-full-prod': {
118-
// entry: resolve('web/runtime-with-compiler.js'),
119-
// dest: resolve('dist/vue.min.js'),
120-
// format: 'umd',
121-
// env: 'production',
122-
// alias: { he: './entity-decoder' },
123-
// banner
124-
// },
125-
// // Web compiler (CommonJS).
126-
// 'web-compiler': {
127-
// entry: resolve('web/compiler.js'),
128-
// dest: resolve('packages/vue-template-compiler/build.js'),
129-
// format: 'cjs',
130-
// external: Object.keys(require('../packages/vue-template-compiler/package.json').dependencies)
131-
// },
132-
// // Web server renderer (CommonJS).
133-
// 'web-server-renderer': {
134-
// entry: resolve('web/server-renderer.js'),
135-
// dest: resolve('packages/vue-server-renderer/build.js'),
136-
// format: 'cjs',
137-
// external: Object.keys(require('../packages/vue-server-renderer/package.json').dependencies)
138-
// },
139-
// 'web-server-renderer-webpack-server-plugin': {
140-
// entry: resolve('server/webpack-plugin/server.js'),
141-
// dest: resolve('packages/vue-server-renderer/server-plugin.js'),
142-
// format: 'cjs',
143-
// external: Object.keys(require('../packages/vue-server-renderer/package.json').dependencies)
144-
// },
145-
// 'web-server-renderer-webpack-client-plugin': {
146-
// entry: resolve('server/webpack-plugin/client.js'),
147-
// dest: resolve('packages/vue-server-renderer/client-plugin.js'),
148-
// format: 'cjs',
149-
// external: Object.keys(require('../packages/vue-server-renderer/package.json').dependencies)
150-
// },
151-
// // Weex runtime factory
152-
// 'weex-factory': {
153-
// weex: true,
154-
// entry: resolve('weex/runtime-factory.js'),
155-
// dest: resolve('packages/weex-vue-framework/factory.js'),
156-
// format: 'cjs',
157-
// plugins: [weexFactoryPlugin]
158-
// },
159-
// // Weex runtime framework (CommonJS).
160-
// 'weex-framework': {
161-
// weex: true,
162-
// entry: resolve('weex/framework.js'),
163-
// dest: resolve('packages/weex-vue-framework/index.js'),
164-
// format: 'cjs'
165-
// },
166-
// // Weex compiler (CommonJS). Used by Weex's Webpack loader.
167-
// 'weex-compiler': {
168-
// weex: true,
169-
// entry: resolve('weex/compiler.js'),
170-
// dest: resolve('packages/weex-template-compiler/build.js'),
171-
// format: 'cjs',
172-
// external: Object.keys(require('../packages/weex-template-compiler/package.json').dependencies)
173-
// }
17457
};
17558

17659
function genConfig(opts) {
17760
const config = {
178-
entry: opts.entry,
179-
dest: opts.dest,
61+
input: opts.entry,
62+
output: {
63+
file: opts.dest,
64+
format: opts.format,
65+
banner: opts.banner,
66+
name: "Vue",
67+
},
18068
external: opts.external,
181-
format: opts.format,
182-
banner: opts.banner,
183-
moduleName: "Vue",
18469
plugins: [
18570
replace({
186-
__WEEX__: !!opts.weex,
187-
__WEEX_VERSION__: weexVersion,
18871
__VERSION__: version
18972
}),
19073
flow(),
19174
buble(),
19275
alias(Object.assign({}, aliases, opts.alias))
193-
].concat(opts.plugins || [])
76+
].concat(opts.plugins || []),
77+
onwarn: (msg, warn) => {
78+
if (!/Circular/.test(msg)) {
79+
warn(msg)
80+
}
81+
},
19482
};
19583

19684
if (opts.env) {

build/release-weex.sh

-37
This file was deleted.

0 commit comments

Comments
 (0)