2
0
mirror of https://github.com/tenrok/vue-select.git synced 2026-06-16 09:10:33 +03:00

Merge remote-tracking branch 'origin/ft/vuepress' into ft/vuepress-no-cli

# Conflicts:
#	.babelrc
#	.gitignore
#	README.md
#	build/webpack.base.conf.js
#	build/webpack.dev.conf.js
#	build/webpack.prod.conf.js
#	build/webpack.site.conf.js
#	dev/dev.html
#	docs/gitbook/Api/Props.md
#	package.json
#	test/unit/karma.conf.js
#	test/unit/specs/Select.spec.js
#	tests/helpers.js
#	tests/unit/.eslintrc.js
#	tests/unit/Ajax.spec.js
#	tests/unit/Deselecting.spec.js
#	tests/unit/Dropdown.spec.js
#	tests/unit/Filtering.spec.js
#	tests/unit/Labels.spec.js
#	tests/unit/Layout.spec.js
#	tests/unit/ObjectIndex.spec.js
#	tests/unit/ReactiveOptions.spec.js
#	tests/unit/Selecting.spec.js
#	tests/unit/Tagging.spec.js
#	tests/unit/TypeAhead.spec.js
#	yarn.lock
This commit is contained in:
Jeff
2019-02-10 20:03:45 -08:00
56 changed files with 5087 additions and 1659 deletions
+3 -6
View File
@@ -9,13 +9,9 @@
"scripts": {
"start": "npm run dev",
"dev": "webpack-dev-server --config build/webpack.dev.conf.js --hot --progress -d",
"dev:homepage": "webpack-dev-server --config build/webpack.site.conf.js --hot --progress -d",
"dev:docs": "gitbook serve",
"dev:docs": "vuepress dev docs",
"build": "cross-env NODE_ENV=production webpack --config build/webpack.prod.conf.js --progress",
"build:homepage": "cross-env NODE_ENV=production webpack --config build/webpack.site.conf.js --progress",
"build:docs": "yarn run build:homepage && node build/build-docs.js",
"deploy": "yarn run build:homepage && node build/build-docs.js && gh-pages -d site",
"lint": "eslint --ext .js,.vue src test/unit/specs",
"build:docs": "vuepress build docs",
"test": "jest"
},
"repository": {
@@ -70,6 +66,7 @@
"vue-resource": "^1.5.1",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.4",
"vuepress": "^0.14.8",
"vuex": "^3.1.0",
"webpack": "^4.28.0",
"webpack-cli": "^3.2.1",