From 64828d50d43e542b6fc57e9a343680239991a4bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Tue, 2 Jul 2019 22:15:40 +0200 Subject: Use shared Browserslist config for Babel in root MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Browserslist is used by Babel, which in turn is used in Talk to bundle the SimpleWebRTC code with its dependencies (like WebRTC adapter). Until recently, in the server its configuration was got from the Babel config, but now it is stated in the "package.json" file. However, it is not hardcoded, but provided through a new NPM module, "browserslist-config-nextcloud". Browserslist gets its configuration from the "package.json" in current or parent directories, so if SimpleWebRTC was bundled and the "spreed" directory was a subdirectory of the "server" directory of Nextcloud Browserslists got its configuration from the "package.json" file in the server. In that case the bundle failed because "browserslist-config-nextcloud" was not part of the modules installed for Talk development. To prevent that, now "browserslist-config-nextcloud" is a development dependency of Talk. Also, for consistency, "browserslist-config-nextcloud" is now always used when bundling SimpleWebRTC, so the result is the same whether the Talk directory is a subdirectory of the server or not when performing the bundle. Signed-off-by: Daniel Calviño Sánchez --- package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 50ac209a1..1c2f35b87 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "attachmediastream": "^2.1.0", "babelify": "^10.0.0", "browserify": "^16.2.3", + "browserslist-config-nextcloud": "0.0.1", "handlebars": "^4.1.2", "hark": "^1.2.3", "mockconsole": "0.0.1", @@ -22,5 +23,8 @@ "webrtc-adapter": "^7.2.4", "webrtcsupport": "^2.2.0", "wildemitter": "^1.2.1" - } + }, + "browserslist": [ + "extends browserslist-config-nextcloud" + ] } -- cgit v1.2.3