From 5712438e2bb15fec620c4dedaef479c55a6b9275 Mon Sep 17 00:00:00 2001 From: Daniel Kavan Date: Fri, 21 Oct 2022 10:17:57 +0200 Subject: [PATCH 1/2] #1118 globbing removed in favor of naming the two files needed literally. --- arangodb-foxx-services/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arangodb-foxx-services/package.json b/arangodb-foxx-services/package.json index cd87c5505..d96e8199d 100644 --- a/arangodb-foxx-services/package.json +++ b/arangodb-foxx-services/package.json @@ -10,9 +10,9 @@ "postbuild": "npm run postbuild:copy && npm run postbuild:replace", "postbuild:copy": "copyfiles --up 1 src/*.json src/assets/* src/README* target/dist", "postbuild:replace": "npm run postbuild:replace:version && npm run postbuild:replace:revision && npm run postbuild:replace:timestamp", - "postbuild:replace:version": "cross-env-shell replace '@VERSION@' $npm_package_version target/dist/*", - "postbuild:replace:revision": "cross-env-shell replace '@REVISION@' $SPLINE_BUILD_REVISION target/dist/*", - "postbuild:replace:timestamp": "cross-env-shell replace '@BUILD_TIMESTAMP@' $SPLINE_BUILD_TIMESTAMP target/dist/*", + "postbuild:replace:version": "cross-env-shell replace '@VERSION@' $npm_package_version target/dist/README.md target/dist/manifest.json", + "postbuild:replace:revision": "cross-env-shell replace '@REVISION@' $SPLINE_BUILD_REVISION target/dist/README.md target/dist/manifest.json", + "postbuild:replace:timestamp": "cross-env-shell replace '@BUILD_TIMESTAMP@' $SPLINE_BUILD_TIMESTAMP target/dist/README.md target/dist/manifest.json", "test": "jest", "lint": "eslint src", "foxx:deploy": "npm run build && npm run foxx:uninstall && npm run foxx:install", From 5fd446f04daf649ce52b27347dd3c8dbd91fd6eb Mon Sep 17 00:00:00 2001 From: Daniel Kavan Date: Fri, 21 Oct 2022 10:47:29 +0200 Subject: [PATCH 2/2] #1118 fixing CRLF/LF on `arangodb-foxx-api` generated assembly - forcing to LF replace unnecesary removals --- arangodb-foxx-api/assembly.xml | 1 + arangodb-foxx-services/package.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arangodb-foxx-api/assembly.xml b/arangodb-foxx-api/assembly.xml index 4e231eefb..5419684c0 100644 --- a/arangodb-foxx-api/assembly.xml +++ b/arangodb-foxx-api/assembly.xml @@ -26,6 +26,7 @@ ${project.build.directory}/generated-ts + unix diff --git a/arangodb-foxx-services/package.json b/arangodb-foxx-services/package.json index d96e8199d..b0ed3aa25 100644 --- a/arangodb-foxx-services/package.json +++ b/arangodb-foxx-services/package.json @@ -11,8 +11,8 @@ "postbuild:copy": "copyfiles --up 1 src/*.json src/assets/* src/README* target/dist", "postbuild:replace": "npm run postbuild:replace:version && npm run postbuild:replace:revision && npm run postbuild:replace:timestamp", "postbuild:replace:version": "cross-env-shell replace '@VERSION@' $npm_package_version target/dist/README.md target/dist/manifest.json", - "postbuild:replace:revision": "cross-env-shell replace '@REVISION@' $SPLINE_BUILD_REVISION target/dist/README.md target/dist/manifest.json", - "postbuild:replace:timestamp": "cross-env-shell replace '@BUILD_TIMESTAMP@' $SPLINE_BUILD_TIMESTAMP target/dist/README.md target/dist/manifest.json", + "postbuild:replace:revision": "cross-env-shell replace '@REVISION@' $SPLINE_BUILD_REVISION target/dist/README.md", + "postbuild:replace:timestamp": "cross-env-shell replace '@BUILD_TIMESTAMP@' $SPLINE_BUILD_TIMESTAMP target/dist/README.md", "test": "jest", "lint": "eslint src", "foxx:deploy": "npm run build && npm run foxx:uninstall && npm run foxx:install",