From 2b8c0b79ee4a6a3609a3d9a1f679efcdcc827c3a Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 26 Aug 2019 14:20:38 +0200
Subject: [PATCH] Switch to rollup-plugin-consts
---
packages/auth/karma.conf.js | 2 +-
packages/auth/package.json | 2 +-
packages/auth/rollup.config.js | 8 ++++----
packages/auth/vendor/common | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/packages/auth/karma.conf.js b/packages/auth/karma.conf.js
index 901e0780..6a646f5e 100644
--- a/packages/auth/karma.conf.js
+++ b/packages/auth/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/auth/package.json b/packages/auth/package.json
index 1fe43583..1477b54d 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -14,12 +14,12 @@
"puppeteer": "^1.15.0",
"rollup": "^1.20.0",
"rollup-plugin-commonjs": "^10.0.2",
+ "rollup-plugin-consts": "^1.0.1",
"rollup-plugin-copy": "^3.1.0",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-multi-entry": "^2.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-postcss": "^2.0.3",
- "rollup-plugin-replace": "^2.2.0",
"rollup-plugin-serve": "^1.0.1",
"rollup-plugin-terser": "^5.1.1",
"vpu-common": "file:./vendor/common"
diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js
index c8d02bdd..07601a24 100644
--- a/packages/auth/rollup.config.js
+++ b/packages/auth/rollup.config.js
@@ -5,9 +5,9 @@ import postcss from 'rollup-plugin-postcss';
import copy from 'rollup-plugin-copy';
import {terser} from "rollup-plugin-terser";
import json from 'rollup-plugin-json';
-import replace from "rollup-plugin-replace";
import serve from 'rollup-plugin-serve';
import multiEntry from 'rollup-plugin-multi-entry';
+import consts from 'rollup-plugin-consts';
const build = (typeof process.env.BUILD !== 'undefined') ? process.env.BUILD : 'local';
console.log("build: " + build);
@@ -20,6 +20,9 @@ export default {
},
plugins: [
multiEntry(),
+ consts({
+ environment: build,
+ }),
resolve({
customResolveOptions: {
// ignore node_modules from vendored packages
@@ -30,9 +33,6 @@ export default {
include: 'node_modules/**'
}),
json(),
- replace({
- "process.env.BUILD": '"' + build + '"',
- }),
postcss({
inject: false,
minimize: false,
diff --git a/packages/auth/vendor/common b/packages/auth/vendor/common
index f310ba99..91947464 160000
--- a/packages/auth/vendor/common
+++ b/packages/auth/vendor/common
@@ -1 +1 @@
-Subproject commit f310ba99da6347270774f6a9554368128f86721b
+Subproject commit 91947464b55c79c5b0aa2188f512e08ebc0be612
--
GitLab