From 1b94991b3509c3a469757b44149382bb1e841913 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sun, 7 Aug 2022 14:31:33 +0200
Subject: [PATCH] chore: commit save point
---
Makefile | 39 +++++++++++--------
application/package-lock.json | 13 +++++++
deployment/makefiles/directories-standard.mk | 5 ++-
deployment/makefiles/nodejs.mk | 34 +++++++---------
deployment/makefiles/project.mk | 2 +-
...{target-build-go.mk => target-go-build.mk} | 6 +--
...icenses.mk => target-go-fetch-licenses.mk} | 2 +-
deployment/makefiles/target-init-standard.mk | 2 +-
...t-build-jsdoc.mk => target-jsdoc-build.mk} | 2 +-
...t-build-nodejs.mk => target-node-build.mk} | 6 +--
...get-test-nodejs.mk => target-node-test.mk} | 6 +--
deployment/makefiles/version.mk | 2 +-
deployment/package-lock.json | 4 +-
deployment/package.json | 2 +-
package-lock.json | 6 +++
15 files changed, 77 insertions(+), 54 deletions(-)
create mode 100644 application/package-lock.json
rename deployment/makefiles/{target-build-go.mk => target-go-build.mk} (89%)
rename deployment/makefiles/{target-fetch-go-licenses.mk => target-go-fetch-licenses.mk} (96%)
rename deployment/makefiles/{target-build-jsdoc.mk => target-jsdoc-build.mk} (95%)
rename deployment/makefiles/{target-build-nodejs.mk => target-node-build.mk} (81%)
rename deployment/makefiles/{target-test-nodejs.mk => target-node-test.mk} (83%)
create mode 100644 package-lock.json
diff --git a/Makefile b/Makefile
index 11ca588e2..c6220e400 100644
--- a/Makefile
+++ b/Makefile
@@ -37,28 +37,35 @@ MAKEFILE_IMPORT_PATH?=$(PROJECT_ROOT)makefiles/
#############################################################################################
#############################################################################################
-include $(MAKEFILE_IMPORT_PATH)license-agpl3.mk
-include $(MAKEFILE_IMPORT_PATH)placeholder.mk
include $(MAKEFILE_IMPORT_PATH)directories-standard.mk
-include $(MAKEFILE_IMPORT_PATH)s3.mk
-include $(MAKEFILE_IMPORT_PATH)nodejs.mk
-include $(MAKEFILE_IMPORT_PATH)color.mk
-include $(MAKEFILE_IMPORT_PATH)terminal.mk
-include $(MAKEFILE_IMPORT_PATH)jsdoc-json.mk
include $(MAKEFILE_IMPORT_PATH)jsdoc.mk
include $(MAKEFILE_IMPORT_PATH)output.mk
-include $(MAKEFILE_IMPORT_PATH)version.mk
+include $(MAKEFILE_IMPORT_PATH)placeholder.mk
+include $(MAKEFILE_IMPORT_PATH)s3.mk
+include $(MAKEFILE_IMPORT_PATH)license-agpl3.mk
+include $(MAKEFILE_IMPORT_PATH)jsdoc-json.mk
+#include $(MAKEFILE_IMPORT_PATH)go.mk
include $(MAKEFILE_IMPORT_PATH)gitignore.mk
-include $(MAKEFILE_IMPORT_PATH)target-help.mk
-include $(MAKEFILE_IMPORT_PATH)target-variable.mk
-include $(MAKEFILE_IMPORT_PATH)target-docman.mk
-include $(MAKEFILE_IMPORT_PATH)target-update-makefiles.mk
+include $(MAKEFILE_IMPORT_PATH)color.mk
+include $(MAKEFILE_IMPORT_PATH)version.mk
+include $(MAKEFILE_IMPORT_PATH)nodejs.mk
+include $(MAKEFILE_IMPORT_PATH)terminal.mk
+#include $(MAKEFILE_IMPORT_PATH)target-go-fetch-licenses.mk
include $(MAKEFILE_IMPORT_PATH)target-deploy-tool.mk
-include $(MAKEFILE_IMPORT_PATH)target-build-nodejs.mk
-include $(MAKEFILE_IMPORT_PATH)target-test-nodejs.mk
+include $(MAKEFILE_IMPORT_PATH)target-jsdoc-build.mk
+include $(MAKEFILE_IMPORT_PATH)target-jekyll.mk
+include $(MAKEFILE_IMPORT_PATH)target-minerva.mk
+#include $(MAKEFILE_IMPORT_PATH)target-docman.mk
+include $(MAKEFILE_IMPORT_PATH)target-node-build.mk
+#include $(MAKEFILE_IMPORT_PATH)target-caddy.mk
+include $(MAKEFILE_IMPORT_PATH)target-update-makefiles.mk
+include $(MAKEFILE_IMPORT_PATH)target-help.mk
+#include $(MAKEFILE_IMPORT_PATH)target-go-build.mk
+include $(MAKEFILE_IMPORT_PATH)target-node-test.mk
include $(MAKEFILE_IMPORT_PATH)target-git.mk
-include $(MAKEFILE_IMPORT_PATH)target-build-jsdoc.mk
-include $(MAKEFILE_IMPORT_PATH)terminal-check.mk
+include $(MAKEFILE_IMPORT_PATH)target-init-standard.mk
+include $(MAKEFILE_IMPORT_PATH)target-variable.mk
+include $(MAKEFILE_IMPORT_PATH)terminal-check.mk
#############################################################################################
diff --git a/application/package-lock.json b/application/package-lock.json
new file mode 100644
index 000000000..9ea1f35e4
--- /dev/null
+++ b/application/package-lock.json
@@ -0,0 +1,13 @@
+{
+ "name": "@schukai/monster",
+ "version": "0.1.15",
+ "lockfileVersion": 2,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "@schukai/monster",
+ "version": "0.1.15",
+ "license": "AGPL 3.0"
+ }
+ }
+}
diff --git a/deployment/makefiles/directories-standard.mk b/deployment/makefiles/directories-standard.mk
index 898e580b8..a6f43e3e3 100644
--- a/deployment/makefiles/directories-standard.mk
+++ b/deployment/makefiles/directories-standard.mk
@@ -16,13 +16,14 @@ CREDENTIALS_PATH ?= $(PROJECT_ROOT)credential/
RESOURCE_PATH ?= $(APPLICATION_PATH)resource/
SOURCE_PATH ?= $(APPLICATION_PATH)source/
WEB_PATH ?= $(APPLICATION_PATH)web/
-
+
+## SCRIPTS_PATH IS DEPRECATED
SCRIPTS_PATH ?= $(DEVELOPMENT_PATH)script/
DEVELOPMENT_SCRIPTS_PATH ?= $(DEVELOPMENT_PATH)script/
BUILD_PATH ?= $(DEPLOYMENT_PATH)build/
VENDOR_PATH ?= $(DEPLOYMENT_PATH)vendor/
-TEST_PATH ?= $(DEVELOPMENT_PATH)tests/
+TEST_PATH ?= $(DEVELOPMENT_PATH)test/
DEPLOYMENT_SCRIPTS_PATH ?= $(DEPLOYMENT_PATH)script/
diff --git a/deployment/makefiles/nodejs.mk b/deployment/makefiles/nodejs.mk
index 5ffef4e52..c95e77a53 100644
--- a/deployment/makefiles/nodejs.mk
+++ b/deployment/makefiles/nodejs.mk
@@ -14,20 +14,20 @@ EXECUTABLES = $(EXECUTABLES:-) $(npm);
NODE_PACKAGES := $(shell find $(PROJECT_ROOT) -type f -name 'package.json' -not -path '*/node_modules/*')
-NODE_MODULES := $(shell find $(PROJECT_ROOT) -maxdepth 2 -type d -name 'node_modules')
-
-
-$(NODE_MODULES).modified: $(NODE_PACKAGES)
- @echo "node_modules modified"
- echo $@
-
-
-a: $(NODE_MODULES).modified
- @echo "node_modules modified"
- echo $@
-
+NODE_MODULES := $(shell find $(PROJECT_ROOT) -type d -name 'node_modules' -prune)
+NODE_MODULES_MODIFIED := $(shell find $(PROJECT_ROOT) -type d -name 'node_modules' -prune -exec echo {}/.modified \; )
+
+$(NODE_MODULES_MODIFIED): $(NODE_PACKAGES)
+ $(ECHOMARKER) "Updating node modules..."
+ $(QUIET) for p in $(NODE_PACKAGES); do \
+ DIR=$$(dirname $$p); \
+ echo "Updating package: $${DIR}" ;\
+ npm install --prefix $${DIR} ;\
+ done ; \
+ touch $(NODE_MODULES_MODIFIED)
-NODE_ROOT_DIR ?= $(PROJECT_ROOT)
+## Main Develpoment Node Repos
+NODE_ROOT_DIR ?= $(DEVELOPMENT_PATH)
NODE_MODULES_DIR ?= $(NODE_ROOT_DIR)node_modules/
NODE_MODULES_BIN_DIR ?= $(NODE_MODULES_DIR).bin/
@@ -39,16 +39,12 @@ C8 ?= $(NODE_MODULES_BIN_DIR)c8
MOCHA ?= $(NODE_MODULES_BIN_DIR)mocha
FIXBROKENPLANTUML := $(NODE_MODULES_DIR)jsdoc-plantuml/fixBrokenNodeJS.js
-PACKAGE_MODIFIED := $(NODE_MODULES_DIR).modified
PACKAGE_JSON ?= $(NODE_ROOT_DIR)package.json
MJS_SOURCE_FILES := $(shell find $(SOURCE_PATH) -name '*.mjs')
MJS_RELATIVE_SOURCE_FILES := $(shell find $(SOURCE_PATH) -name '*.mjs' -exec realpath --relative-to $(PROJECT_ROOT) {} \; )
+JS_SOURCE_FILES := $(shell find $(SOURCE_PATH) -name '*.js')
+JS_RELATIVE_SOURCE_FILES := $(shell find $(SOURCE_PATH) -name '*.js' -exec realpath --relative-to $(PROJECT_ROOT) {} \; )
-$(PACKAGE_MODIFIED): $(PACKAGE_JSON)
- $(QUIET) $(NPM) install
- $(QUIET) $(TEST) -s $(FIXBROKENPLANTUML) || $(NODE) $(FIXBROKENPLANTUML)
- $(QUIET) $(RM) $(PACKAGEMODIFIED)
- $(QUIET) $(TOUCH) -m $(PACKAGEMODIFIED)
diff --git a/deployment/makefiles/project.mk b/deployment/makefiles/project.mk
index 0fab28523..96e51e768 100644
--- a/deployment/makefiles/project.mk
+++ b/deployment/makefiles/project.mk
@@ -13,7 +13,7 @@ create-polyfill-monster: $(MONSTER_SOURCE_FILES)
.PHONY: test-browser-monster
## create test-browser-monster
test-browser-monster: create-polyfill-monster
- $(QUIET) $(ECHOMARKER) "create browser test and start chrome"
+ $(ECHOMARKER) "create browser test and start chrome"
$(QUIET) $(FIND) $(TEST_PATH)cases -type f | $(SED) "s|^$(TEST_PATH)cases||" > $(TEST_PATH)web/import.js
$(QUIET) $(SED) -i 's|^|import "../cases|' $(TEST_PATH)web/import.js
$(QUIET) $(SED) -i 's|$$|";|' $(TEST_PATH)web/import.js
diff --git a/deployment/makefiles/target-build-go.mk b/deployment/makefiles/target-go-build.mk
similarity index 89%
rename from deployment/makefiles/target-build-go.mk
rename to deployment/makefiles/target-go-build.mk
index 04a0afbfb..267cd95f0 100644
--- a/deployment/makefiles/target-build-go.mk
+++ b/deployment/makefiles/target-go-build.mk
@@ -9,9 +9,9 @@
.PHONY: compile
## Compiling for every OS and Platform
compile: next-patch-version
- $(QUIET) $(ECHOMARKER) "Compiling for every OS and Platform"
- $(QUIET) $(ECHO) "Version: $(PROJECT_VERSION)"
- $(QUIET) $(ECHO) "Build: $(PROJECT_BUILD_DATE)"
+ $(ECHOMARKER) "Compiling for every OS and Platform"
+ $(ECHO) "Version: $(PROJECT_VERSION)"
+ $(ECHO) "Build: $(PROJECT_BUILD_DATE)"
$(QUIET) cd $(SOURCE_PATH) ; \
GO111MODULE=on GOOS=linux GOARCH=arm $(GO) build -ldflags "-X main.version=$(PROJECT_VERSION) -X main.build=$(PROJECT_BUILD_DATE)" -o $(BUILD_PATH)$(COMPONENT_SLUG)-linux-arm ; \
diff --git a/deployment/makefiles/target-fetch-go-licenses.mk b/deployment/makefiles/target-go-fetch-licenses.mk
similarity index 96%
rename from deployment/makefiles/target-fetch-go-licenses.mk
rename to deployment/makefiles/target-go-fetch-licenses.mk
index 818c3482e..4bd753cb1 100644
--- a/deployment/makefiles/target-fetch-go-licenses.mk
+++ b/deployment/makefiles/target-go-fetch-licenses.mk
@@ -20,7 +20,7 @@ go-fetch-licenses:
ifeq ($(GO_CURRENT_MODULE),)
$(QUIET) $(ECHOERRORMARKER) "no go.mod file found, skipping fetching licenses"
else
- $(QUIET) $(ECHOMARKER) "Fetch licenses"
+ $(ECHOMARKER) "Fetch licenses"
$(QUIET) cd $(SOURCE_PATH); go-licenses save $(GO_CURRENT_MODULE) $(GO_LICENSES_IGNORE_PACKAGES) --force --save_path $(DOCUMENTATION_PATH)licenses/ ; cd -
endif
diff --git a/deployment/makefiles/target-init-standard.mk b/deployment/makefiles/target-init-standard.mk
index e67288f0a..7a69b0cc4 100644
--- a/deployment/makefiles/target-init-standard.mk
+++ b/deployment/makefiles/target-init-standard.mk
@@ -14,7 +14,7 @@ init-standard: .gitignore
# The default directories are defined in the
# directories-standard.mk file, but all other
# targets can define directories as well.
- $(QUIET) $(ECHOMARKER) "Run init-standard"
+ $(ECHOMARKER) "Run init-standard"
$(foreach path,$(PROJECT_DIRECTORIES),\
$(shell $(MKDIR) -p $(path)))
$(ECHO) "Done"
diff --git a/deployment/makefiles/target-build-jsdoc.mk b/deployment/makefiles/target-jsdoc-build.mk
similarity index 95%
rename from deployment/makefiles/target-build-jsdoc.mk
rename to deployment/makefiles/target-jsdoc-build.mk
index 3b818a592..702ad4e09 100644
--- a/deployment/makefiles/target-build-jsdoc.mk
+++ b/deployment/makefiles/target-jsdoc-build.mk
@@ -11,6 +11,6 @@
.PHONY: build-jsdoc
## generate js api docs
build-jsdoc: $(DEPLOYMENT_PATH)jsdoc.json
- $(QUIET) $(ECHOMARKER) "create doc"
+ $(ECHOMARKER) "create doc"
$(QUIET) cd $(DEPLOYMENT_PATH); $(JSDOC) --tutorials $(DOCUMENTATION_PATH)tutorials/ -c $(DEPLOYMENT_PATH)jsdoc.json $(DOCUMENTATION_PATH)README.md ; cd --
# $(QUIET) $(GREP) -rl 'Documentation generated by' $(THIS_DIR)docs/ | $(XARGS) sed -i '/Documentation generated by/d'
diff --git a/deployment/makefiles/target-build-nodejs.mk b/deployment/makefiles/target-node-build.mk
similarity index 81%
rename from deployment/makefiles/target-build-nodejs.mk
rename to deployment/makefiles/target-node-build.mk
index 6a27930fc..afd88d06d 100644
--- a/deployment/makefiles/target-build-nodejs.mk
+++ b/deployment/makefiles/target-node-build.mk
@@ -13,8 +13,8 @@ EXECUTABLES = $(EXECUTABLES:-) $(SPONGE);
.PHONY: build-node
## Build Node Components
build-node: next-patch-version $(PACKAGEMODIFIED)
- $(QUIET) $(ECHOMARKER) "Building Node Components"
- $(QUIET) $(ECHO) "Version: $(PROJECT_VERSION)"
- $(QUIET) $(ECHO) "Source Path: $(SOURCE_PATH)"
+ $(ECHOMARKER) "Building Node Components"
+ $(ECHO) "Version: $(PROJECT_VERSION)"
+ $(ECHO) "Source Path: $(SOURCE_PATH)"
$(QUIET) $(JQ) '.version = "$(PROJECT_VERSION)"' $(PACKAGE_JSON) | $(SPONGE) $(PACKAGE_JSON)
diff --git a/deployment/makefiles/target-test-nodejs.mk b/deployment/makefiles/target-node-test.mk
similarity index 83%
rename from deployment/makefiles/target-test-nodejs.mk
rename to deployment/makefiles/target-node-test.mk
index 39d15affc..05535db44 100644
--- a/deployment/makefiles/target-test-nodejs.mk
+++ b/deployment/makefiles/target-node-test.mk
@@ -6,9 +6,9 @@
#############################################################################################
#############################################################################################
-.PHONY: test-node
+.PHONY: node-test
## Test JS Components
-test-node: $(PACKAGEMODIFIED)
- $(QUIET) $(ECHOMARKER) "Test Node Components"
+node-test: $(NODE_MODULES_MODIFIED)
+ $(ECHOMARKER) "Test Node Components"
$(QUIET) cd $(TEST_PATH); $(MOCHA) --recursive $(TEST_PATH)cases/ ; cd -
diff --git a/deployment/makefiles/version.mk b/deployment/makefiles/version.mk
index 3d0215fc7..b4d7eb054 100644
--- a/deployment/makefiles/version.mk
+++ b/deployment/makefiles/version.mk
@@ -22,6 +22,6 @@ PROJECT_BUILD_DATE ?= $(shell $(VERSION_BIN) date)
.PHONY: next-patch-version
## create next-patch-version
next-patch-version:
- $(QUIET) $(ECHOMARKER) "Creating next version"
+ $(ECHOMARKER) "Creating next version"
$(QUIET) $(VERSION_BIN) patch --path $(RELEASE_FILE) --selector "version"
$(QUIET) $(eval PROJECT_VERSION := $(shell cat $(RELEASE_FILE) | jq -r .version))
diff --git a/deployment/package-lock.json b/deployment/package-lock.json
index 15804d0d3..a4c37da03 100644
--- a/deployment/package-lock.json
+++ b/deployment/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "monster",
- "version": "x.x.x",
+ "version": "x.x.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "monster",
- "version": "x.x.x",
+ "version": "x.x.1",
"license": "see LICENSE file",
"devDependencies": {
"@peculiar/webcrypto": "^1.4.0",
diff --git a/deployment/package.json b/deployment/package.json
index 817ee3e42..b2a71cb07 100644
--- a/deployment/package.json
+++ b/deployment/package.json
@@ -1,6 +1,6 @@
{
"name": "monster",
- "version": "x.x.x",
+ "version": "x.x.1",
"description": "monster",
"repository": {
"type": "git",
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..31f5a69b0
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+ "name": "monster",
+ "lockfileVersion": 2,
+ "requires": true,
+ "packages": {}
+}
--
GitLab