diff --git a/Makefile b/Makefile
index d7b8cb84a8b6..0e614efde42d 100644
--- a/Makefile
+++ b/Makefile
@@ -332,7 +332,7 @@ contribs/dist: .build/build-dll.timestamp
 	touch $@
 
 .build/node_modules.timestamp: package.json
-	npm install
+	npm install || npm install --ignore-scripts
 	# Installed from peer dependency from ol-layerswitcher and that breaks our types
 	rm -rf ./node_modules/@types/openlayers
 	mkdir -p $(dir $@)
diff --git a/buildtools/webpack.commons.js b/buildtools/webpack.commons.js
index d3c1eccfea3e..872849d5f43d 100644
--- a/buildtools/webpack.commons.js
+++ b/buildtools/webpack.commons.js
@@ -71,7 +71,7 @@ module.exports = function (config) {
   });
 
   rules.push({
-    test: path.resolve(__dirname, '../srcapi/index.ts'),
+    test: /\/srcapi\/index.[tj]s$/,
     use: {
       loader: 'expose-loader',
       options: {