From 41dbe8aaabfe303131cde6c98d977ac7c5dbf6a0 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 26 Aug 2019 13:53:08 +0200
Subject: [PATCH] Use rollup-plugin-consts for defining the build env
---
packages/common/env.js | 4 +++-
packages/common/karma.conf.js | 2 +-
packages/common/package.json | 2 +-
packages/common/rollup.config.js | 8 ++++----
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/packages/common/env.js b/packages/common/env.js
index a960d881..02d9d232 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 901e0780..6a646f5e 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 66e00616..69fb1008 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 e27f228d..ff11b8aa 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'},
--
GitLab