@leverege/build-tools 2.8.6 → 2.8.8

package/lib/server/repo-init/gitter/Gitter.js

@@ -111,7 +111,7 @@ class Gitter {
     const git = SimpleGit(buildSpec.git.name);
 
     try {
-      await git.init().add(['--all', '--force']); // we want it all!
+      await git.init(['--initial-branch', 'development']).add(['--all', '--force']); // we want it all!
     } catch (initErr) {
       console.log(initErr);
       process.exit(1);
@@ -195,7 +195,13 @@ class Gitter {
 
     try {
       spinner.start('Adding all source to the git repository');
-      await git.add(['--all']).commit(initialCommit).branch(['development']).checkout(['development']);
+      await git.add(['--all']).commit(initialCommit); //    try {
+      //      await git.branch( [ 'development' ] )
+      //    } catch ( brerr ) {
+      //      console.log( brerr, '***CONTINUING ON' )//XXX
+      //    }
+      //    await git.checkout( [ 'development' ] )
+
       spinner.succeed();
     } catch (err) {
       console.log(err);
@@ -236,7 +242,7 @@ class Gitter {
 
     try {
       spinner.start(`Pushing ${buildSpec.git.name} repository upstream`);
-      await git.addRemote('origin', repoHosting.getGitURL('remote', buildSpec)).push(['--set-upstream', 'origin', 'master']).push(['--set-upstream', 'origin', 'development']).checkout(['development']);
+      await git.addRemote('origin', repoHosting.getGitURL('remote', buildSpec)).push(['--set-upstream', 'origin', 'development']).branch(['main']).push(['--set-upstream', 'origin', 'main']).checkout(['development']);
       spinner.succeed();
     } catch (err) {
       console.log(err);

package/lib/server/repo-init/gitter/RepoHosting.js

@@ -93,7 +93,6 @@ const openAdmin = async buildSpec => {
     ${chalk.keyword('green')('Project')}     - adjust if the original selection was slightly off
     ${chalk.keyword('green').bold('Description')} - a few words here wouldn't hurt
     ${chalk.keyword('green').bold('Language')}    - set this to Node.js or Javascript?
-    ${chalk.keyword('green').bold('Main branch')} - set that to ${chalk.keyword('red').bold('development')}, ok?
     `));
   await open(getGitURL('admin', buildSpec));
   await proceed('Please take a moment to at least set the Language and Main branch?');

package/lib/server/unleash.js

@@ -13,7 +13,7 @@ const getCurrentBranchName = async () => {
 };
 
 const isProtected = async () => {
-  const protectedBranches = ['master', 'development', ...process.argv.slice(2)];
+  const protectedBranches = ['main', 'master', 'development', ...process.argv.slice(2)];
   const theBranch = await getCurrentBranchName();
   return protectedBranches.includes(theBranch);
 };

package/lib/web/unleash.js

@@ -13,7 +13,7 @@ const getCurrentBranchName = async () => {
 };
 
 const isProtected = async () => {
-  const protectedBranches = ['master', 'development', ...process.argv.slice(2)];
+  const protectedBranches = ['main', 'master', 'development', ...process.argv.slice(2)];
   const theBranch = await getCurrentBranchName();
   return protectedBranches.includes(theBranch);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.8.6",
+  "version": "2.8.8",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -71,7 +71,7 @@
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.5",
-    "simple-git": "^2.47.0"
+    "simple-git": "^2.48.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.16.0",
@@ -79,6 +79,6 @@
     "@babel/node": "^7.16.0",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^8.1.3"
+    "npm": "^8.2.0"
   }
 }

package/src/dockreate

@@ -77,7 +77,7 @@ COPY ./.npmrc /usr/src/app/.npmrc
 RUN apk --no-cache add openssh-client && \
     apk --update add --no-cache --virtual build-dep g++ gcc libgcc \\
       libstdc++ linux-headers make ${apkadds} && \
-    npm install -g npm@7 && \
+    npm install -g npm@8 && \
     npm ci --only-production --ignore-scripts ${npmlogging} && \
     rm -f /usr/src/app/.npmrc /root/.ssh/*
  
@@ -90,7 +90,7 @@ FROM node:${nodeimg}
 # Install tini for PID 1 and replace shell with bash so we can source files
 RUN apk update && \
     apk add --no-cache bash curl tini vim ${apkadds} && \
-    npm install -g npm@7 && \
+    npm install -g npm@8 && \
     rm /bin/sh && ln -s /bin/bash /bin/sh && \
     mkdir -p /usr/src/app /tmp/levlog && \
     chown node:node /usr/src/app

package/src/unleash.js

@@ -12,7 +12,7 @@ const getCurrentBranchName = async () => {
 }
 
 const isProtected = async () => {
-  const protectedBranches = [ 'master', 'development', ...process.argv.slice( 2 ) ]
+  const protectedBranches = [ 'main', 'master', 'development', ...process.argv.slice( 2 ) ]
   const theBranch = await getCurrentBranchName()
   return protectedBranches.includes( theBranch )
 }