From 982182d58eff7025d63ef3a95828d9758c48268a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Mon, 14 Oct 2024 13:03:57 +0200 Subject: [PATCH 1/2] Fix npm install --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 $@) From 59d9945912b840cf71cec9d914a2ba6f27bd55a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Mon, 14 Oct 2024 13:04:28 +0200 Subject: [PATCH 2/2] Fix exposition of gmfapi --- buildtools/webpack.commons.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: {