From 4ad289ffce9e17d63bcfc0b8cd29ec2523b98161 Mon Sep 17 00:00:00 2001 From: Christoph Reiter <reiter.christoph@gmail.com> Date: Mon, 26 Aug 2019 15:49:15 +0200 Subject: [PATCH] Update deps --- packages/language-select/karma.conf.js | 2 +- packages/language-select/package.json | 2 +- packages/language-select/rollup.config.js | 8 ++++---- packages/language-select/vendor/common | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/language-select/karma.conf.js b/packages/language-select/karma.conf.js index 901e0780..6a646f5e 100644 --- a/packages/language-select/karma.conf.js +++ b/packages/language-select/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/language-select/package.json b/packages/language-select/package.json index fe8abde0..db13c3df 100644 --- a/packages/language-select/package.json +++ b/packages/language-select/package.json @@ -13,12 +13,12 @@ "chai": "^4.2.0", "rollup": "^1.19.4", "rollup-plugin-commonjs": "^10.0.2", + "rollup-plugin-consts": "^1.0.1", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-serve": "^1.0.1", "rollup-plugin-terser": "^5.1.1", "rollup-plugin-json": "^4.0.0", - "rollup-plugin-replace": "^2.2.0", "rollup-plugin-multi-entry": "^2.1.0", "i18next-scanner": "^2.10.2", "vpu-common": "file:./vendor/common" diff --git a/packages/language-select/rollup.config.js b/packages/language-select/rollup.config.js index 674946cf..9de7bfa6 100644 --- a/packages/language-select/rollup.config.js +++ b/packages/language-select/rollup.config.js @@ -4,9 +4,9 @@ import commonjs from 'rollup-plugin-commonjs'; 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); @@ -19,6 +19,9 @@ export default { }, plugins: [ multiEntry(), + consts({ + environment: build, + }), resolve({ customResolveOptions: { // ignore node_modules from vendored packages @@ -29,9 +32,6 @@ export default { include: 'node_modules/**' }), json(), - replace({ - "process.env.BUILD": '"' + build + '"', - }), (build !== 'local' && build !== 'test') ? terser() : false, copy({ targets: [ diff --git a/packages/language-select/vendor/common b/packages/language-select/vendor/common index 8a80921c..f65096b9 160000 --- a/packages/language-select/vendor/common +++ b/packages/language-select/vendor/common @@ -1 +1 @@ -Subproject commit 8a80921c5f8ea2b0d1a0a548741d2ca1716a5139 +Subproject commit f65096b99b737a046d07ad6616eec31788850422 -- GitLab