Skip to content

Commit f73cf9c

Browse files
committed
Merge branch 'dev' into v3-alpha for v3.0.0-alpha.3 version release
2 parents 5844f03 + a87d426 commit f73cf9c

File tree

138 files changed

+35033
-9950
lines changed

Some content is hidden

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

138 files changed

+35033
-9950
lines changed

.editorconfig

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

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.DS_Store
22
node_modules
3-
package-lock.json
43
/dist
54
/coverage
65

babel.config.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
module.exports = {
22
presets: [
3-
[ "@vue/app", {
4-
"useBuiltIns": 'entry'
5-
}]
3+
['@vue/app']
64
]
75
}

package-lock.json

Lines changed: 30828 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,44 @@
11
{
22
"name": "@coreui/coreui-free-vue-admin-template",
3-
"version": "3.0.0-alpha.2",
3+
"version": "3.0.0-alpha.3",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
77
"copyright": "Copyright 2018 creativeLabs Łukasz Holeczek",
88
"license": "MIT",
99
"scripts": {
1010
"serve": "vue-cli-service serve",
11-
"build": "vue-cli-service build --modern",
11+
"build": "vue-cli-service build",
1212
"lint": "vue-cli-service lint",
1313
"test:unit": "vue-cli-service test:unit",
1414
"test:e2e": "vue-cli-service test:e2e"
1515
},
1616
"dependencies": {
17-
"@coreui/coreui": "^2.1.6",
18-
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
19-
"@coreui/icons": "0.3.0",
20-
"@coreui/vue": "github:coreui/coreui-vue#v3-bridge-alpha",
21-
"bootstrap": "^4.1.3",
22-
"chart.js": "^2.7.3",
23-
"core-js": "^2.5.7",
24-
"css-vars-ponyfill": "^1.11.1",
25-
"current-script-polyfill": "^1.0.0",
26-
"element-resize-detector": "^1.2.0",
27-
"flag-icon-css": "^3.2.0",
28-
"font-awesome": "^4.7.0",
29-
"perfect-scrollbar": "^1.4.0",
30-
"simple-line-icons": "^2.4.1",
31-
"tooltip.js": "^1.3.1",
32-
"vue": "^2.6.6",
33-
"vue-chartjs": "^3.4.0",
34-
"vue-perfect-scrollbar": "^0.1.0",
35-
"vue-router": "^3.0.1"
17+
"@coreui/coreui": "next",
18+
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1",
19+
"@coreui/coreui-vue-chartjs": "coreui/coreui-vue-chartjs",
20+
"@coreui/icons": "coreui/coreui-icons#v1-alpha",
21+
"@coreui/vue": "../coreui-vue",
22+
"vue": "^2.6.10",
23+
"vue-router": "^3.0.6"
3624
},
3725
"devDependencies": {
38-
"@vue/cli-plugin-babel": "^3.0.5",
39-
"@vue/cli-plugin-e2e-nightwatch": "^3.0.5",
40-
"@vue/cli-plugin-eslint": "^3.0.5",
41-
"@vue/cli-plugin-unit-jest": "^3.0.5",
42-
"@vue/cli-service": "^3.0.5",
26+
"@vue/cli-plugin-babel": "^3.8.0",
27+
"@vue/cli-plugin-e2e-nightwatch": "^3.8.0",
28+
"@vue/cli-plugin-eslint": "^3.8.0",
29+
"@vue/cli-plugin-unit-jest": "^3.8.0",
30+
"@vue/cli-service": "^3.8.4",
4331
"@vue/test-utils": "^1.0.0-beta.25",
4432
"babel-core": "^6.26.3",
4533
"babel-plugin-dynamic-import-node": "^2.2.0",
46-
"babel-plugin-module-resolver": "^3.1.2",
34+
"babel-plugin-module-resolver": "^3.2.0",
4735
"babel-preset-vue-app": "^2.0.0",
4836
"babel-jest": "^23.6.0",
4937
"growl": "^1.10.5",
5038
"https-proxy-agent": "^2.2.1",
51-
"node-sass": "^4.9.4",
39+
"node-sass": "^4.12.0",
5240
"sass-loader": "^7.1.0",
53-
"vue-template-compiler": "^2.6.6"
41+
"vue-template-compiler": "^2.6.10"
5442
},
5543
"browserslist": [
5644
"> 1%",

src/App.vue

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ export default {
1111
<style lang="scss">
1212
// CoreUI Icons Set
1313
@import '~@coreui/icons/css/coreui-icons.min.css';
14-
/* Import Font Awesome Icons Set */
15-
$fa-font-path: '~font-awesome/fonts/';
16-
@import '~font-awesome/scss/font-awesome.scss';
17-
/* Import Simple Line Icons Set */
18-
$simple-line-font-path: '~simple-line-icons/fonts/';
19-
@import '~simple-line-icons/scss/simple-line-icons.scss';
20-
/* Import Flag Icons Set */
21-
@import '~flag-icon-css/css/flag-icon.min.css';
2214
// Import Main styles for this application
2315
@import 'assets/scss/style';
2416
</style>

0 commit comments

Comments
 (0)