mqzheng/Table
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

解决配置冲突

Browse Source
This commit is contained in:
xf 2018-08-21 14:25:58 +08:00
parent 238d143fdf
commit a2f98e79a3
3 changed files with 13 additions and 14059 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14018
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

26
package.json
View File

@ -1,9 +1,5 @@
{ {
<<<<<<< HEAD
"name": "web-gantt",
=======
"name": "table_dropdown", "name": "table_dropdown",
>>>>>>> dev-mq
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -13,27 +9,6 @@
"test:unit": "vue-cli-service test:unit" "test:unit": "vue-cli-service test:unit"
}, },
"dependencies": { "dependencies": {
<<<<<<< HEAD
"dayjs": "^1.7.4",
"vue": "^2.5.16"
},
"devDependencies": {
"@types/jest": "^23.1.4",
"@vue/cli-plugin-babel": "^3.0.0-rc.10",
"@vue/cli-plugin-eslint": "^3.0.0-rc.10",
"@vue/cli-plugin-typescript": "^3.0.0-rc.10",
"@vue/cli-plugin-unit-jest": "^3.0.0-rc.10",
"@vue/cli-service": "^3.0.0-rc.10",
"@vue/eslint-config-prettier": "^3.0.0-rc.10",
"@vue/eslint-config-typescript": "^3.0.0-rc.10",
"@vue/test-utils": "^1.0.0-beta.20",
"babel-core": "7.0.0-bridge.0",
"node-sass": "^4.9.0",
"sass-loader": "^7.0.1",
"ts-jest": "^23.0.0",
"typescript": "^3.0.0",
"vue-template-compiler": "^2.5.16"
=======
"vue": "^2.5.17", "vue": "^2.5.17",
"vue-class-component": "^6.0.0", "vue-class-component": "^6.0.0",
"vue-property-decorator": "^7.0.0" "vue-property-decorator": "^7.0.0"
@ -52,6 +27,5 @@
"ts-jest": "^23.0.0", "ts-jest": "^23.0.0",
"typescript": "^3.0.0", "typescript": "^3.0.0",
"vue-template-compiler": "^2.5.17" "vue-template-compiler": "^2.5.17"
>>>>>>> dev-mq
} }
} }

28
tsconfig.json
View File

@ -6,34 +6,16 @@
"jsx": "preserve", "jsx": "preserve",
"importHelpers": true, "importHelpers": true,
"moduleResolution": "node", "moduleResolution": "node",
<<<<<<< HEAD
"esModuleInterop": true,
=======
"experimentalDecorators": true, "experimentalDecorators": true,
"esModuleInterop": true, "esModuleInterop": true,
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
>>>>>>> dev-mq
"sourceMap": true, "sourceMap": true,
"baseUrl": ".", "baseUrl": ".",
"types": [ "types": ["node", "jest"],
"node",
"jest"
],
"paths": { "paths": {
"@/*": [ "@/*": ["src/*"]
"src/*"
]
}, },
"lib": [ "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
<<<<<<< HEAD
"es2015",
=======
"esnext",
>>>>>>> dev-mq
"dom",
"dom.iterable",
"scripthost"
]
}, },
"include": [ "include": [
"src/**/*.ts", "src/**/*.ts",
@ -42,7 +24,5 @@
"tests/**/*.ts", "tests/**/*.ts",
"tests/**/*.tsx" "tests/**/*.tsx"
], ],
"exclude": [ "exclude": ["node_modules"]
"node_modules"
]
} }