Cache make build-extensions (#1407)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

.azure-pipelines.yml

@@ -36,11 +36,11 @@ jobs:
             yarn
           path: $(YARN_CACHE_FOLDER)
         displayName: Cache Yarn packages
-      - script: make install-deps
+      - script: make node_modules
         displayName: Install dependencies
       - script: make build-npm
         displayName: Generate npm package
-      - script: make build-extensions
+      - script: make -j2 build-extensions
         displayName: Build bundled extensions
       - script: make integration-win
         displayName: Run integration tests
@@ -76,11 +76,11 @@ jobs:
             yarn
           path: $(YARN_CACHE_FOLDER)
         displayName: Cache Yarn packages
-      - script: make install-deps
+      - script: make node_modules
         displayName: Install dependencies
       - script: make build-npm
         displayName: Generate npm package
-      - script: make build-extensions
+      - script: make -j2 build-extensions
         displayName: Build bundled extensions
       - script: make test
         displayName: Run tests
@@ -122,13 +122,13 @@ jobs:
             yarn
           path: $(YARN_CACHE_FOLDER)
         displayName: Cache Yarn packages
-      - script: make install-deps
+      - script: make node_modules
         displayName: Install dependencies
       - script: make lint
         displayName: Lint
       - script: make build-npm
         displayName: Generate npm package
-      - script: make build-extensions
+      - script: make -j2 build-extensions
         displayName: Build bundled extensions
       - script: make test
         displayName: Run tests

Makefile

@@ -1,4 +1,7 @@
 EXTENSIONS_DIR = ./extensions
+extensions = $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), ${dir})
+extension_node_modules = $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), ${dir}/node_modules)
+extension_dists = $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), ${dir}/dist)
 
 ifeq ($(OS),Windows_NT)
     DETECTED_OS := Windows
@@ -6,29 +9,23 @@ else
     DETECTED_OS := $(shell uname)
 endif
 
-.PHONY: init
+binaries/client:
-init: install-deps download-bins compile-dev
-	echo "Init done"
-
-.PHONY: download-bins
-download-bins:
 	yarn download-bins
 
-.PHONY: install-deps
+node_modules:
-install-deps:
 	yarn install --frozen-lockfile --verbose
 	yarn check --verify-tree --integrity
 
+static/build/LensDev.html:
+	yarn compile:renderer
+
 .PHONY: compile-dev
 compile-dev:
 	yarn compile:main --cache
 	yarn compile:renderer --cache
 
 .PHONY: dev
-dev:
+dev: node_modules binaries/client build-extensions static/build/LensDev.html
-ifeq ("$(wildcard static/build/main.js)","")
-	make init
-endif
 	yarn dev
 
 .PHONY: lint
@@ -36,7 +33,7 @@ lint:
 	yarn lint
 
 .PHONY: test
-test: download-bins
+test: binaries/client
 	yarn test
 
 .PHONY: integration-linux
@@ -59,20 +56,25 @@ test-app:
 	yarn test
 
 .PHONY: build
-build: install-deps download-bins build-extensions
+build: node_modules binaries/client build-extensions
 ifeq "$(DETECTED_OS)" "Windows"
 	yarn dist:win
 else
 	yarn dist
 endif
 
+$(extension_node_modules):
+	cd $(@:/node_modules=) && npm install --no-audit --no-fund
+
+$(extension_dists): src/extensions/npm/extensions/dist
+	cd $(@:/dist=) && npm run build
+
 .PHONY: build-extensions
-build-extensions:
+build-extensions: $(extension_node_modules) $(extension_dists)
-	$(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), (cd $(dir) && npm install && npm run build || exit $?);)
 
 .PHONY: test-extensions
-test-extensions:
+test-extensions: $(extension_node_modules)
-	$(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), (cd $(dir) && npm install --dev && npm run test || exit $?);)
+	$(foreach dir, $(extensions), (cd $(dir) && npm run test || exit $?);)
 
 .PHONY: copy-extension-themes
 copy-extension-themes:
@@ -97,6 +99,16 @@ publish-npm: build-npm
 	npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
 	cd src/extensions/npm/extensions && npm publish --access=public
 
+.PHONY: clean-extensions
+clean-extensions:
+ifeq "$(DETECTED_OS)" "Windows"
+	$(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), if exist $(dir)\dist del /s /q $(dir)\dist)
+	$(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), if exist $(dir)\node_modules del /s /q $(dir)\node_modules)
+else
+	$(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), rm -rf $(dir)/dist)
+	$(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), rm -rf $(dir)/node_modules)
+endif
+
 .PHONY: clean-npm
 clean-npm:
 ifeq "$(DETECTED_OS)" "Windows"
@@ -110,13 +122,13 @@ else
 endif
 
 .PHONY: clean
-clean: clean-npm
+clean: clean-npm clean-extensions
 ifeq "$(DETECTED_OS)" "Windows"
-	if exist binaries\client del /s /q binaries\client\*.*
+	if exist binaries\client del /s /q binaries\client
 	if exist dist del /s /q dist\*.*
 	if exist static\build del /s /q static\build\*.*
 else
-	rm -rf binaries/client/*
+	rm -rf binaries/client
 	rm -rf dist/*
 	rm -rf static/build/*
 endif