diff --git a/packages/common/env.js b/packages/common/env.js index a960d88139dc87c4089375c4468ad31fe4d89dcf..02d9d232f57b51c688aa5b728befac4420836f46 100644 --- a/packages/common/env.js +++ b/packages/common/env.js @@ -1,6 +1,8 @@ +import environment from 'consts:environment'; + var config; -switch(process.env.BUILD) { +switch(environment) { case "development": config = { apiBaseUrl: 'https://mw-dev.tugraz.at', diff --git a/packages/common/karma.conf.js b/packages/common/karma.conf.js index 901e07806c448e53fd84367917e67267a1836771..6a646f5ec9ea5a6c50dd25dc6038dd94fff1bc43 100644 --- a/packages/common/karma.conf.js +++ b/packages/common/karma.conf.js @@ -6,7 +6,7 @@ module.exports = function(config) { basePath: 'dist', frameworks: ['mocha', 'chai'], files: [ - './bundle.js', + {pattern: './*.js', included: true, watched: true, served: true, type: 'module'}, {pattern: './**/*', included: false, watched: true, served: true}, ], autoWatch: true, diff --git a/packages/common/package.json b/packages/common/package.json index 66e006160e75e787494b2a4271316b80898c3de5..69fb1008a13c26e8adefe1e3f38b51d3b154b2f7 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -13,10 +13,10 @@ "puppeteer": "^1.15.0", "rollup": "^1.11.3", "rollup-plugin-commonjs": "^10.0.2", + "rollup-plugin-consts": "^1.0.1", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-multi-entry": "^2.1.0", "rollup-plugin-node-resolve": "^5.2.0", - "rollup-plugin-replace": "^2.2.0", "rollup-plugin-serve": "^1.0.1" }, "scripts": { diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js index e27f228d273e973a15b98f11b35c52a78ae9390a..ff11b8aaecb0601a7c13856942f0a6935564241f 100644 --- a/packages/common/rollup.config.js +++ b/packages/common/rollup.config.js @@ -1,10 +1,10 @@ import path from 'path'; import resolve from 'rollup-plugin-node-resolve'; import commonjs from 'rollup-plugin-commonjs'; -import replace from "rollup-plugin-replace"; import multiEntry from 'rollup-plugin-multi-entry'; import copy from 'rollup-plugin-copy'; import serve from 'rollup-plugin-serve'; +import consts from 'rollup-plugin-consts'; const pkg = require('./package.json'); const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : 'local'; @@ -18,6 +18,9 @@ export default { }, plugins: [ multiEntry(), + consts({ + environment: build, + }), resolve({ customResolveOptions: { // ignore node_modules from vendored packages @@ -27,9 +30,6 @@ export default { commonjs({ include: 'node_modules/**' }), - replace({ - "process.env.BUILD": '"' + build + '"', - }), copy({ targets: [ {src: 'assets/index.html', dest: 'dist'},