diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js index 48fb9fd7051cfa20753ec19dc54b34184558bb00..92e6250bc295acd951eb7b4218fda5d7a218de3d 100644 --- a/packages/auth/rollup.config.js +++ b/packages/auth/rollup.config.js @@ -26,7 +26,9 @@ export default { moduleDirectory: path.join(process.cwd(), 'node_modules') } }), - commonjs(), + commonjs({ + include: 'node_modules/**' + }), json(), replace({ "process.env.BUILD": '"' + build + '"', diff --git a/packages/auth/src/utils.js b/packages/auth/src/utils.js index 30eaa4ec13f5e6f93bdf59cc84a5144139156c67..7e96c124421c14cf2e4b3c9ab8144a58d4971bda 100644 --- a/packages/auth/src/utils.js +++ b/packages/auth/src/utils.js @@ -1,6 +1,6 @@ -const vars = require("./vars"); +import vars from './vars.js'; -module.exports = { +export default { getAPiUrl: function(path = "", withPrefix = true) { return vars.apiBaseUrl + (withPrefix ? vars.apiUrlPrefix : "") + path; }, diff --git a/packages/auth/src/vars.js b/packages/auth/src/vars.js index d34d7b63f23d553f51165f12d8cffa61c87865f1..741b34e27abf609923ce55b7f4051f02b471a615 100644 --- a/packages/auth/src/vars.js +++ b/packages/auth/src/vars.js @@ -1,7 +1,8 @@ +var config = undefined; switch(process.env.BUILD) { case "development": - module.exports = { + config = { apiBaseUrl: 'https://mw-dev.tugraz.at', apiUrlPrefix: '', keyCloakClientId: 'auth-dev-mw-frontend', @@ -9,14 +10,14 @@ switch(process.env.BUILD) { break; case "production": - module.exports = { + config = { apiBaseUrl: 'https://mw.tugraz.at', apiUrlPrefix: '', keyCloakClientId: 'auth-prod-mw-frontend', }; break; case "demo": - module.exports = { + config = { apiBaseUrl: 'https://api-demo.tugraz.at', apiUrlPrefix: '', keyCloakClientId: 'auth-dev-mw-frontend', @@ -24,9 +25,11 @@ switch(process.env.BUILD) { break; case "local": default: - module.exports = { + config = { apiBaseUrl: 'http://127.0.0.1:8000', apiUrlPrefix: '', keyCloakClientId: 'auth-dev-mw-frontend-local', }; } + +export default config; diff --git a/packages/auth/vendor/common b/packages/auth/vendor/common index 68e0a4f1f1a3ef6e05aca5216bf8684578ec2229..b30eaa6475ccc65b5f99d2ead86ddbe2b8e015a7 160000 --- a/packages/auth/vendor/common +++ b/packages/auth/vendor/common @@ -1 +1 @@ -Subproject commit 68e0a4f1f1a3ef6e05aca5216bf8684578ec2229 +Subproject commit b30eaa6475ccc65b5f99d2ead86ddbe2b8e015a7