Skip to content

Commit 55fb39f

Browse files
committed
Merge branch 'release/1.2.3'
2 parents bc448e0 + 61f542f commit 55fb39f

File tree

8 files changed

+755
-18167
lines changed

8 files changed

+755
-18167
lines changed

package-lock.json

Lines changed: 0 additions & 9040 deletions
This file was deleted.

package.json

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-types",
3-
"version": "1.2.2",
3+
"version": "1.2.3",
44
"description": "Prop types utility for Vue",
55
"author": "Marco Solazzi",
66
"license": "MIT",
@@ -36,39 +36,42 @@
3636
"url": "https://github.com/dwightjack/vue-types.git"
3737
},
3838
"bugs": "https://github.com/dwightjack/vue-types/issues",
39+
"peerDependencies": {
40+
"vue": "*"
41+
},
3942
"devDependencies": {
4043
"babel-cli": "6.26.0",
41-
"babel-core": "6.26.0",
44+
"babel-core": "6.26.3",
4245
"babel-plugin-add-module-exports": "0.2.1",
4346
"babel-plugin-external-helpers": "6.22.0",
44-
"babel-preset-env": "1.6.1",
45-
"cross-env": "5.1.3",
46-
"eslint": "4.18.2",
47+
"babel-preset-env": "1.7.0",
48+
"cross-env": "5.1.5",
49+
"eslint": "4.19.1",
4750
"eslint-config-vue": "2.0.2",
48-
"eslint-plugin-html": "4.0.2",
49-
"eslint-plugin-vue": "4.3.0",
51+
"eslint-plugin-html": "4.0.3",
52+
"eslint-plugin-vue": "4.5.0",
5053
"expect": "1.20.2",
51-
"express": "4.16.2",
52-
"karma": "2.0.0",
54+
"express": "4.16.3",
55+
"karma": "2.0.2",
5356
"karma-chrome-launcher": "2.2.0",
5457
"karma-firefox-launcher": "1.1.0",
5558
"karma-ie-launcher": "1.0.0",
5659
"karma-mocha": "1.3.0",
5760
"karma-mocha-reporter": "2.2.5",
5861
"karma-opera-launcher": "1.0.0",
5962
"karma-phantomjs-launcher": "1.0.4",
60-
"karma-rollup-preprocessor": "5.1.1",
63+
"karma-rollup-preprocessor": "6.0.0",
6164
"karma-safari-launcher": "1.0.0",
6265
"karma-sauce-launcher": "1.2.0",
63-
"mocha": "5.0.2",
66+
"mocha": "5.1.1",
6467
"rimraf": "2.6.2",
65-
"rollup": "0.56.4",
66-
"rollup-plugin-babel": "3.0.3",
67-
"rollup-plugin-commonjs": "9.0.0",
68+
"rollup": "0.58.2",
69+
"rollup-plugin-babel": "3.0.4",
70+
"rollup-plugin-commonjs": "9.1.3",
6871
"rollup-plugin-filesize": "1.5.0",
6972
"rollup-plugin-node-builtins": "2.1.2",
70-
"rollup-plugin-node-globals": "1.1.0",
71-
"rollup-plugin-node-resolve": "3.0.3",
73+
"rollup-plugin-node-globals": "1.2.1",
74+
"rollup-plugin-node-resolve": "3.3.0",
7275
"rollup-plugin-replace": "2.0.0",
7376
"rollup-plugin-stub": "1.2.0",
7477
"rollup-plugin-uglify": "3.0.0",

rollup.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,23 @@ const baseOutputConfig = {
2727
format: 'umd',
2828
name: 'VueTypes',
2929
sourcemap: true,
30-
banner
30+
banner,
31+
globals: { vue: 'Vue' }
3132
}
3233

3334
export default [
3435
{
3536
input: 'src/index.js',
3637
output: Object.assign({ file: 'umd/vue-types.js'}, baseOutputConfig),
38+
external: ['vue'],
3739
plugins: [replace({
3840
'process.env.NODE_ENV': JSON.stringify('development')
3941
}), ...plugins, filesize()]
4042
},
4143
{
4244
input: 'src/index.js',
4345
output: Object.assign({ file: 'umd/vue-types.min.js' }, baseOutputConfig),
46+
external: ['vue'],
4447
plugins: [replace({
4548
'process.env.NODE_ENV': JSON.stringify('production')
4649
}), ...plugins, uglify({

0 commit comments

Comments
 (0)