Fix env variables
This commit is contained in:
parent
873e498031
commit
4ce7386128
|
@ -272,7 +272,7 @@ export default {
|
||||||
// 3. use the current url
|
// 3. use the current url
|
||||||
const defaultInstanceUrl =
|
const defaultInstanceUrl =
|
||||||
this.$store.state.instance.frontSettings.defaultServerUrl ||
|
this.$store.state.instance.frontSettings.defaultServerUrl ||
|
||||||
process.env.VUE_APP_INSTANCE_URL || this.$store.getters['instance/defaultUrl']()
|
import.meta.env.VUE_APP_INSTANCE_URL || this.$store.getters['instance/defaultUrl']()
|
||||||
this.$store.commit('instance/instanceUrl', defaultInstanceUrl)
|
this.$store.commit('instance/instanceUrl', defaultInstanceUrl)
|
||||||
} else {
|
} else {
|
||||||
// needed to trigger initialization of axios / service worker
|
// needed to trigger initialization of axios / service worker
|
||||||
|
|
|
@ -590,7 +590,7 @@ export default {
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
production () {
|
production () {
|
||||||
return process.env.NODE_ENV === 'production'
|
return import.meta.env.NODE_ENV === 'production'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
|
|
@ -134,7 +134,7 @@ export default {
|
||||||
return _.get(this.nodeinfo, 'metadata.library.anonymousCanListen', false)
|
return _.get(this.nodeinfo, 'metadata.library.anonymousCanListen', false)
|
||||||
},
|
},
|
||||||
iframeSrc () {
|
iframeSrc () {
|
||||||
let base = process.env.BASE_URL
|
let base = import.meta.env.BASE_URL
|
||||||
if (base.startsWith('/')) {
|
if (base.startsWith('/')) {
|
||||||
// include hostname/protocol too so that the iframe link is absolute
|
// include hostname/protocol too so that the iframe link is absolute
|
||||||
base = `${window.location.protocol}//${window.location.host}${base}`
|
base = `${window.location.protocol}//${window.location.host}${base}`
|
||||||
|
|
|
@ -4,8 +4,8 @@ import { register } from 'register-service-worker'
|
||||||
|
|
||||||
import store from './store'
|
import store from './store'
|
||||||
|
|
||||||
if (process.env.NODE_ENV === 'production') {
|
if (import.meta.env.NODE_ENV === 'production') {
|
||||||
register(`${process.env.BASE_URL}service-worker.js`, {
|
register(`${import.meta.env.BASE_URL}service-worker.js`, {
|
||||||
registrationOptions: { scope: '/' },
|
registrationOptions: { scope: '/' },
|
||||||
ready () {
|
ready () {
|
||||||
console.log(
|
console.log(
|
||||||
|
|
|
@ -20,7 +20,7 @@ export default {
|
||||||
state: {
|
state: {
|
||||||
maxEvents: 200,
|
maxEvents: 200,
|
||||||
frontSettings: {},
|
frontSettings: {},
|
||||||
instanceUrl: process.env.VUE_APP_INSTANCE_URL,
|
instanceUrl: import.meta.env.VUE_APP_INSTANCE_URL,
|
||||||
events: [],
|
events: [],
|
||||||
knownInstances: [],
|
knownInstances: [],
|
||||||
nodeinfo: null,
|
nodeinfo: null,
|
||||||
|
|
Loading…
Reference in New Issue