From 13d070961cc150cf83348a5167b42147f7d39a4c Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Mon, 13 Nov 2023 11:42:49 -0500 Subject: [PATCH 1/2] NPM dependencies: fix dep install timing issue --- package.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 958c8f19f6..5e29ff8414 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,9 @@ "scripts": { "_cd:docs": "cd userguide &&", "_check:format": "npx prettier --check .??* *.md", - "_mkdir:hugo-mod": "npx mkdirp ../github.com/FortAwesome/Font-Awesome ../github.com/twbs/bootstrap", "_cp:bs-rfs": "cp -R node_modules/bootstrap/scss/vendor/* assets/_vendor/bootstrap/scss/", + "_mkdir:hugo-mod": "npx mkdirp ../github.com/FortAwesome/Font-Awesome ../github.com/twbs/bootstrap", + "_prebuild": "npm run _cp:bs-rfs", "build:preview": "npm run cd:docs build:preview", "build:production": "npm run cd:docs build:production", "build": "npm run cd:docs build", @@ -21,11 +22,14 @@ "fix:format": "npm run _check:format -- --write", "get:hugo-modules": "node tools/getHugoModules/index.mjs", "get:submodule": "set -x && git submodule update --init ${DEPTH:- --depth 1}", - "postinstall": "npm run _mkdir:hugo-mod && npm run _cp:bs-rfs", + "postinstall": "npm run _mkdir:hugo-mod", + "prebuild:preview": "npm run _prebuild", + "prebuild:production": "npm run _prebuild", + "prepare": "npm run _cp:bs-rfs", "serve": "npm run cd:docs serve", "test": "npm run cd:docs test && npm run check:links--md", - "update:pkg:hugo": "npm install --save-exact -D hugo-extended@latest", - "update:pkg:dep": "npm install --save-exact @fortawesome/fontawesome-free@latest bootstrap@latest" + "update:pkg:dep": "npm install --save-exact @fortawesome/fontawesome-free@latest bootstrap@latest", + "update:pkg:hugo": "npm install --save-exact -D hugo-extended@latest" }, "spelling": "cSpell:ignore docsy hugo fortawesome fontawesome userguide ", "dependencies": { From c7a45e5912d3e819d9edf39addd3cc3b4bda9c50 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Thu, 16 Nov 2023 09:53:46 -0500 Subject: [PATCH 2/2] package.json script adjustments --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index 5e29ff8414..4a3a8d3916 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,8 @@ "prebuild:preview": "npm run _prebuild", "prebuild:production": "npm run _prebuild", "prepare": "npm run _cp:bs-rfs", + "preserve": "npm run _prebuild", + "pretest": "npm run _prebuild", "serve": "npm run cd:docs serve", "test": "npm run cd:docs test && npm run check:links--md", "update:pkg:dep": "npm install --save-exact @fortawesome/fontawesome-free@latest bootstrap@latest",