update version
This commit is contained in:
parent
44e4d3d005
commit
8e0b5624a9
|
@ -8,14 +8,14 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
|
|||
run(`vue-cli-service build ${args}`)
|
||||
|
||||
const port = 9526
|
||||
const basePath = config.baseUrl
|
||||
const publicPath = config.publicPath
|
||||
|
||||
var connect = require('connect')
|
||||
var serveStatic = require('serve-static')
|
||||
const app = connect()
|
||||
|
||||
app.use(
|
||||
basePath,
|
||||
publicPath,
|
||||
serveStatic('./dist', {
|
||||
index: ['index.html', '/']
|
||||
})
|
||||
|
@ -23,7 +23,7 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
|
|||
|
||||
app.listen(port, function() {
|
||||
console.log(
|
||||
chalk.green(`> Listening at http://localhost:${port}${basePath}`)
|
||||
chalk.green(`> Listening at http://localhost:${port}${publicPath}`)
|
||||
)
|
||||
})
|
||||
} else {
|
||||
|
|
15
package.json
15
package.json
|
@ -68,21 +68,24 @@
|
|||
"devDependencies": {
|
||||
"@babel/core": "7.0.0",
|
||||
"@babel/register": "7.0.0",
|
||||
"@vue/cli-plugin-babel": "3.2.0",
|
||||
"@vue/cli-plugin-eslint": "3.2.1",
|
||||
"@vue/cli-plugin-unit-jest": "3.2.0",
|
||||
"@vue/cli-service": "3.2.0",
|
||||
"@vue/test-utils": "1.0.0-beta.25",
|
||||
"@vue/cli-plugin-babel": "3.5.0",
|
||||
"@vue/cli-plugin-eslint": "3.5.0",
|
||||
"@vue/cli-plugin-unit-jest": "3.5.0",
|
||||
"@vue/cli-service": "3.5.0",
|
||||
"@vue/test-utils": "1.0.0-beta.29",
|
||||
"babel-core": "7.0.0-bridge.0",
|
||||
"babel-eslint": "10.0.1",
|
||||
"babel-jest": "23.6.0",
|
||||
"chalk": "^2.4.1",
|
||||
"connect": "^3.6.6",
|
||||
"eslint": "5.15.1",
|
||||
"eslint-plugin-vue": "5.2.2",
|
||||
"husky": "0.14.3",
|
||||
"lint-staged": "7.2.2",
|
||||
"mockjs": "1.0.1-beta3",
|
||||
"node-sass": "^4.9.0",
|
||||
"runjs": "^4.3.2",
|
||||
"sass-loader": "7.0.3",
|
||||
"sass-loader": "^7.1.0",
|
||||
"script-ext-html-webpack-plugin": "2.1.3",
|
||||
"script-loader": "0.7.2",
|
||||
"serve-static": "^1.13.2",
|
||||
|
|
|
@ -80,11 +80,6 @@ export default {
|
|||
if (this.data.length === 0) {
|
||||
return []
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
const func = this.evalFunc || treeToArray
|
||||
const args = this.evalArgs ? [].concat([tmp, this.expandAll], this.evalArgs) : [tmp, this.expandAll]
|
||||
return func.apply(null, args)
|
||||
=======
|
||||
addAttrs(data, {
|
||||
expand: this.defaultExpandAll,
|
||||
children: this.defaultChildren
|
||||
|
@ -92,7 +87,6 @@ export default {
|
|||
|
||||
const retval = treeToArray(data, this.defaultChildren)
|
||||
return retval
|
||||
>>>>>>> dc6030b... perf[Tree-Table]: refactor tree-table (#1587)
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
|
|
@ -15,9 +15,9 @@ module.exports = {
|
|||
* for example GitHub pages. If you plan to deploy your site to https://foo.github.io/bar/,
|
||||
* then assetsPublicPath should be set to "/bar/".
|
||||
* In most cases please use '/' !!!
|
||||
* Detail https://cli.vuejs.org/config/#baseurl
|
||||
* Detail https://cli.vuejs.org/config/#publicPath
|
||||
*/
|
||||
baseUrl: '/',
|
||||
publicPath: '/',
|
||||
outputDir: 'dist',
|
||||
assetsDir: 'static',
|
||||
lintOnSave: process.env.NODE_ENV !== 'production',
|
||||
|
|
Loading…
Reference in New Issue