@leverege/build-tools 2.23.6 → 2.24.1

package/.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "firebase deploy",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/src/firebaseDeploy.mjs",
+            "console": "integratedTerminal"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "unleash",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/src/unleash.js",
+            "args": [ "unleasb","unleash-flex" ],
+            "console": "integratedTerminal"
+        }
+    ]
+}

package/lib/server/unleash.js

@@ -14,9 +14,17 @@ const getCurrentBranchName = async () => {
   return Object.entries(branchInfo.branches).find(([name, info]) => info.current)[0];
 };
 const isProtected = async () => {
-  const protectedBranches = ['main', 'master', 'development', ...process.argv.slice(2)];
   const theBranch = await getCurrentBranchName();
-  return protectedBranches.includes(theBranch);
+  const protectedBranches = ['main', 'master', 'development'];
+  const additionalProtectedBranches = [...process.argv.slice(2)];
+
+  // Check if the current branch starts with any of the additional
+  // protected branch name
+  let matchesAdditionalBranch = false;
+  for (let i = 0; i < additionalProtectedBranches.length; i++) {
+    matchesAdditionalBranch = matchesAdditionalBranch || theBranch.startsWith(additionalProtectedBranches[i]);
+  }
+  return protectedBranches.includes(theBranch) || matchesAdditionalBranch;
 };
 const npmRunner = async script => {
   try {

package/lib/web/unleash.js

@@ -14,9 +14,17 @@ const getCurrentBranchName = async () => {
   return Object.entries(branchInfo.branches).find(([name, info]) => info.current)[0];
 };
 const isProtected = async () => {
-  const protectedBranches = ['main', 'master', 'development', ...process.argv.slice(2)];
   const theBranch = await getCurrentBranchName();
-  return protectedBranches.includes(theBranch);
+  const protectedBranches = ['main', 'master', 'development'];
+  const additionalProtectedBranches = [...process.argv.slice(2)];
+
+  // Check if the current branch starts with any of the additional
+  // protected branch name
+  let matchesAdditionalBranch = false;
+  for (let i = 0; i < additionalProtectedBranches.length; i++) {
+    matchesAdditionalBranch = matchesAdditionalBranch || theBranch.startsWith(additionalProtectedBranches[i]);
+  }
+  return protectedBranches.includes(theBranch) || matchesAdditionalBranch;
 };
 const npmRunner = async script => {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.23.6",
+  "version": "2.24.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -71,6 +71,6 @@
     "@babel/core": "^7.20.12",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^9.3.1"
+    "npm": "^9.4.0"
   }
 }

package/src/dockreate

@@ -4,6 +4,8 @@ if [ -z "$1" ]; then
   exit 1
 fi
 
+# printf "\n****LOCAL DOCKREATE****\n\n" && sleep 1
+
 # Load common bash functions
 . `build-tools --bashfun`
 PKGTOP="$npm_config_local_prefix"
@@ -266,7 +268,7 @@ artifact=$(packageJson '.leverege.artifact') # 'leverege')
 if [ ! -z "$artifact" ];
 then
   imagerepo=us-docker.pkg.dev/leverege-registry
-  registry=$imagerepo/$artifact/$container/images
+  registry=$imagerepo/$artifact/images/$container
 fi
 
 version=$1

package/src/unleash.js

@@ -17,9 +17,20 @@ const getCurrentBranchName = async () => {
 }
 
 const isProtected = async () => {
-  const protectedBranches = [ 'main', 'master', 'development', ...process.argv.slice( 2 ) ]
   const theBranch = await getCurrentBranchName()
-  return protectedBranches.includes( theBranch )
+
+  const protectedBranches = [ 'main', 'master', 'development' ]
+  const additionalProtectedBranches = [ ...process.argv.slice( 2 ) ]
+
+  // Check if the current branch starts with any of the additional
+  // protected branch name
+  let matchesAdditionalBranch = false
+  for ( let i = 0; i < additionalProtectedBranches.length; i++ ) {
+    matchesAdditionalBranch = matchesAdditionalBranch ||
+      theBranch.startsWith( additionalProtectedBranches[i] )
+  }
+
+  return protectedBranches.includes( theBranch ) || matchesAdditionalBranch
 }
 
 const npmRunner = async ( script ) => {