bit-badger/myPrayerJournal
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 36 Activity

Upgrade to Vue CLI 3 / Webpack 4 #22

Merged
danieljsummers merged 5 commits from vue-cli-3 into master 2018-08-22 01:39:42 +00:00
Conversation 0 Commits 5 Files Changed 43 +17 -23
9 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 90ae68f816 - Show all commits

9
src/app/package.json
View File

@ -9,16 +9,12 @@
"build": "vue-cli-service build",
"lint": "vue-cli-service lint",
"apistart": "cd ../api/MyPrayerJournal.Api && dotnet run",
"vue": "vue-cli-service build && cd ../api/MyPrayerJournal.Api && dotnet run"
"vue": "vue-cli-service build --modern && cd ../api/MyPrayerJournal.Api && dotnet run"
},
"sideEffects": [
"**/*.css"
],
"dependencies": {
"auth0-js": "^9.7.3",
"axios": "^0.18.0",
"moment": "^2.18.1",
"pug": "^2.0.1",
"vue": "^2.5.15",
"vue-progressbar": "^0.7.3",
"vue-router": "^3.0.0",
@ -30,9 +26,8 @@
"@vue/cli-plugin-eslint": "^3.0.0",
"@vue/cli-service": "^3.0.0",
"@vue/eslint-config-standard": "^3.0.0",
"css-loader": "^1.0.0",
"pug": "^2.0.1",
"pug-plain-loader": "^1.0.0",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.5.17"
}
}

2
src/app/public/index.html
View File

@ -5,6 +5,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="preload" as="style">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<title>myPrayerJournal</title>
</head>
<body>

5
src/app/src/App.vue
View File

@ -29,7 +29,7 @@ export default {
Navigation
},
data () {
return { version }
return {}
},
mounted () {
this.$refs.toast.setOptions({ position: 'bottom right' })
@ -37,6 +37,9 @@ export default {
computed: {
toast () {
return this.$refs.toast
},
version () {
return version.endsWith('.0') ? version.substr(0, version.length - 2) : version
}
}
}

1
src/app/src/auth/AuthService.js
View File

@ -8,7 +8,6 @@ import mutations from '@/store/mutation-types'
var tokenRenewalTimeout
export default class AuthService {
constructor () {
this.login = this.login.bind(this)
this.setSession = this.setSession.bind(this)

2
src/app/src/components/Journal.vue
View File

@ -69,4 +69,4 @@ export default {
justify-content: center;
align-items: flex-start;
}
</style>
</style>

2
src/app/src/components/common/Navigation.vue
View File

@ -93,4 +93,4 @@ export default {
padding-left: 1.25rem;
padding-right: 1.25rem;
}
</style>
</style>

8
src/app/src/router.js
View File

@ -79,13 +79,5 @@ export default new Router({
name: 'LogOn',
component: LogOn
}
// {
// path: '/about',
// name: 'about',
// // route level code-splitting
// // this generates a separate chunk (about.[hash].js) for this route
// // which is lazy-loaded when the route is visited.
// component: () => import(/* webpackChunkName: "about" */ './views/About.vue')
// }
]
})

9
src/app/vue.config.js
View File

@ -1,6 +1,9 @@
const webpack = require('webpack')
module.exports = {
outputDir: '../api/MyPrayerJournal.Api/wwwroot',
css: {
modules: true
configureWebpack: {
plugins: [
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/)
]
}
}
}

2
src/app/yarn.lock
View File

@ -7008,7 +7008,7 @@ vue-router@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.1.tgz#d9b05ad9c7420ba0f626d6500d693e60092cc1e9"
vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
vue-style-loader@^4.1.0:
version "4.1.2"
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8"
dependencies: