From 77c4063d48e91ce89e316f84fdf332ffaa4e02f1 Mon Sep 17 00:00:00 2001
From: Dustin Rue <dustin.rue@10up.com>
Date: Fri, 5 Jul 2024 13:46:05 -0500
Subject: [PATCH 01/27] fix deprecation warning, support a more modern layout

---
 packages/toolkit/scripts/project/init.js | 36 ++++++++++++++++++------
 1 file changed, 28 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 packages/toolkit/scripts/project/init.js

diff --git a/packages/toolkit/scripts/project/init.js b/packages/toolkit/scripts/project/init.js
old mode 100644
new mode 100755
index d8d815e6..7ac50fde
--- a/packages/toolkit/scripts/project/init.js
+++ b/packages/toolkit/scripts/project/init.js
@@ -14,6 +14,8 @@ const { getArgFromCLI, hasArgInCLI } = require('../../utils');
 
 const cliPath = hasArgInCLI('--path') ? getArgFromCLI('--path') : '.';
 
+const projectLayout = hasArgInCLI('--layout') ? getArgFromCLI('--layout') : 'legacy';
+
 const name = hasArgInCLI('--name') ? getArgFromCLI('--name') : '';
 
 const confirm = !!hasArgInCLI('--confirm');
@@ -25,7 +27,7 @@ let template = hasArgInCLI('--template') ? getArgFromCLI('--template') : '';
 const variables = require(`../../project/default-variables.json`);
 
 const description =
-	'10up-toolkit project init [--path=<path>] [--name=<name>] [--template=<template>] [--skip-composer] [--confirm]';
+	'10up-toolkit project init [--path=<path>] [--layout=<legacy>] [--name=<name>] [--template=<template>] [--skip-composer] [--confirm]';
 
 const run = async () => {
 	const questions = [];
@@ -46,6 +48,23 @@ const run = async () => {
 		}
 	}
 
+	// we purposely do not actually expose projectLayout as a question for now and leave it as an advanced, semi-hidden option
+	/*
+	if (projectLayout === 'legacy') {
+		questions.push({
+			type: 'input',
+			name: 'layout',
+			validate: (input) => {
+				if (!['legacy','modern'].includes(input)) {
+					return false;
+				}
+				return true;
+			},
+			message: 'Project Layout (legacy or modern):',
+		});
+	}
+	*/
+
 	if (!name) {
 		questions.push({
 			type: 'input',
@@ -92,12 +111,13 @@ const run = async () => {
 		results = await inquirer.prompt(questions);
 	}
 
-	log(`Initializing project at ${cliPath}`);
+	log(`Initializing project at ${cliPath} with a ${projectLayout} project layout`);
 
 	variables.wordpress_version = await getWordPressLatestVersion();
 
 	const toolkitPath = resolve(`${__dirname}/../../`);
-	const initPath = resolve(cliPath);
+	const initPath =
+		projectLayout === 'modern' ? `${resolve(cliPath)}${path.sep}wordpress` : resolve(cliPath);
 	template = results.template || template;
 
 	const projectName = results.name || name;
@@ -133,7 +153,7 @@ const run = async () => {
 		}
 
 		execSync(`git clone ${template} '${initPath}'`);
-		fs.rmdirSync(path.join(initPath, '.git'), { recursive: true });
+		fs.rmSync(path.join(initPath, '.git'), { recursive: true });
 	}
 
 	const tenupComposerFiles = [];
@@ -186,13 +206,13 @@ const run = async () => {
 	const muPluginPath = `${initPath}/mu-plugins/${projectNameLowercaseHypen}-plugin`;
 
 	// Copy contents of toolkitPath/project/local into initPath
-	execSync(`rsync -rc "${toolkitPath}/project/local/" "${initPath}"`);
+	execSync(`rsync -rc "${toolkitPath}/project/local/" "${cliPath}"`);
 	tenupComposerFiles.forEach((file) => {
 		const command = `composer install --working-dir=${path
 			.dirname(file)
 			.replace(`${initPath}`, './')
 			.replace('//', '/')}\n`;
-		fs.appendFileSync(`${initPath}/scripts/build.sh`, command);
+		fs.appendFileSync(`${cliPath}/scripts/build.sh`, command);
 	});
 
 	if (!skipComposer) {
@@ -216,12 +236,12 @@ const run = async () => {
 	});
 
 	// Load the contents of the .tenup.yml file into a string
-	let configFile = fs.readFileSync(`${initPath}/.tenup.yml`, 'utf8');
+	let configFile = fs.readFileSync(`${cliPath}/.tenup.yml`, 'utf8');
 
 	configFile = replaceVariables(configFile, variables);
 
 	// Write config file back to disk
-	fs.writeFileSync(`${initPath}/.tenup.yml`, configFile);
+	fs.writeFileSync(`${cliPath}/.tenup.yml`, configFile);
 
 	log(chalk.green('Project initialized.'));
 

From cb6d5c9851731b0af6f91461926b6f9dcbf15b52 Mon Sep 17 00:00:00 2001
From: Dustin Rue <dustin.rue@10up.com>
Date: Fri, 5 Jul 2024 17:26:31 -0500
Subject: [PATCH 02/27] fix typo in readme

---
 packages/toolkit/PROJECTS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/toolkit/PROJECTS.md b/packages/toolkit/PROJECTS.md
index e1f8e2cf..f037939b 100644
--- a/packages/toolkit/PROJECTS.md
+++ b/packages/toolkit/PROJECTS.md
@@ -73,7 +73,7 @@ The project subcommand provides a variety of utlities for creating, building, an
 List of commands:
 
 ```bash
-10up-toolkit project init [<path>] [--template=<Git repository>] [--name=<Project Name>] [--confirm] [--skip-composer]
+10up-toolkit project init [--path=<path>] [--template=<Git repository>] [--name=<Project Name>] [--confirm] [--skip-composer]
 ```
 
 `init` creates a project. You can optionally provide it a number of parameters or answer the prompts. If no path is provided, it will initialize the project in the current directory. You will be prompted to choose a template e.g. [WP Scaffold](https://github.com/10up/wp-scaffold). Init will automatically search and replace prefixes using the project name you provide.

From 80092f3717887e84b9ef6caf2444740d266e270d Mon Sep 17 00:00:00 2001
From: Dustin Rue <dustin.rue@10up.com>
Date: Fri, 5 Jul 2024 17:29:43 -0500
Subject: [PATCH 03/27] improved init and build systems

---
 .../deploy-configs/pantheon-production.tmpl   |   2 +-
 .../deploy-configs/pantheon-staging.tmpl      |   2 +-
 .../deploy-configs/rsync-production.tmpl      |   2 +-
 .../gitlab/deploy-configs/rsync-staging.tmpl  |   2 +-
 .../toolkit/project/local/scripts/build.sh    |  21 +-
 ...deploy-excludes.txt => rsync-excludes.txt} |   0
 .../scripts/project/bash/build-setup.sh       | 179 +++++++++++++++++-
 .../scripts/project/bash/create-payload.sh    |   2 +-
 packages/toolkit/scripts/project/build.js     |   5 +-
 .../toolkit/scripts/project/create-payload.js |  48 ++---
 packages/toolkit/scripts/project/init.js      |  22 ++-
 packages/toolkit/utils/project.js             |   4 +-
 12 files changed, 230 insertions(+), 59 deletions(-)
 rename packages/toolkit/project/local/scripts/{deploy-excludes.txt => rsync-excludes.txt} (100%)

diff --git a/packages/toolkit/project/gitlab/deploy-configs/pantheon-production.tmpl b/packages/toolkit/project/gitlab/deploy-configs/pantheon-production.tmpl
index a3b01e80..a89db894 100644
--- a/packages/toolkit/project/gitlab/deploy-configs/pantheon-production.tmpl
+++ b/packages/toolkit/project/gitlab/deploy-configs/pantheon-production.tmpl
@@ -7,7 +7,7 @@ deploy_production:
     MULTI_DEV_ENVIRONMENT: "{{branch}}"
     WORDPRESS_VERSION: {{wordpress_version}}
     GIT_URL: {{deploy_to}}
-    EXCLUDES: {{deploy_file_excludes}}
+    EXCLUDES: {{rsync_file_excludes}}
   allow_failure: false
   only:
     refs:
diff --git a/packages/toolkit/project/gitlab/deploy-configs/pantheon-staging.tmpl b/packages/toolkit/project/gitlab/deploy-configs/pantheon-staging.tmpl
index a4bc4a2f..24b2bbf3 100644
--- a/packages/toolkit/project/gitlab/deploy-configs/pantheon-staging.tmpl
+++ b/packages/toolkit/project/gitlab/deploy-configs/pantheon-staging.tmpl
@@ -7,7 +7,7 @@ deploy_{{branch}}:
     MULTI_DEV_ENVIRONMENT: "{{branch}}"
     WORDPRESS_VERSION: {{wordpress_version}}
     GIT_URL: {{deploy_to}}
-    EXCLUDES: {{deploy_file_excludes}}
+    EXCLUDES: {{rsync_file_excludes}}
   allow_failure: false
   only:
     refs:
diff --git a/packages/toolkit/project/gitlab/deploy-configs/rsync-production.tmpl b/packages/toolkit/project/gitlab/deploy-configs/rsync-production.tmpl
index 36820df4..5862fe35 100644
--- a/packages/toolkit/project/gitlab/deploy-configs/rsync-production.tmpl
+++ b/packages/toolkit/project/gitlab/deploy-configs/rsync-production.tmpl
@@ -7,7 +7,7 @@ deploy_production:
   variables:
     DESTINATION: {{deploy_to}}
     SUBDIR: {{deploy_to_subdir}}
-    EXCLUDES: {{deploy_file_excludes}}
+    EXCLUDES: {{rsync_file_excludes}}
   only:
     refs:
       - {{branch}}
diff --git a/packages/toolkit/project/gitlab/deploy-configs/rsync-staging.tmpl b/packages/toolkit/project/gitlab/deploy-configs/rsync-staging.tmpl
index 5f47a7f5..0a6ffe71 100644
--- a/packages/toolkit/project/gitlab/deploy-configs/rsync-staging.tmpl
+++ b/packages/toolkit/project/gitlab/deploy-configs/rsync-staging.tmpl
@@ -7,7 +7,7 @@ deploy_{{branch}}:
   variables:
     DESTINATION: {{deploy_to}}
     SUBDIR: {{deploy_to_subdir}}
-    EXCLUDES: {{deploy_file_excludes}}
+    EXCLUDES: {{rsync_file_excludes}}
   only:
     refs:
       - {{branch}}
diff --git a/packages/toolkit/project/local/scripts/build.sh b/packages/toolkit/project/local/scripts/build.sh
index 888d0435..1c372aed 100644
--- a/packages/toolkit/project/local/scripts/build.sh
+++ b/packages/toolkit/project/local/scripts/build.sh
@@ -1,5 +1,18 @@
-# Add builds scripts here. This script will be run from the root of your project (same directory as .tenup.yml).
+#!/usr/bin/env bash -l
+# NOTE: you should keep the above line, at line 1. Only modify if you know what you are doing.
 
-nvm install
-node -v
-npm install
+# You should use npx 10up-toolkit build to build your project. When you do, there are a number of things
+# you get "for free" including nvm handling and the basics of building are handled automatically. You
+# only need to provide additional build routines if the default build system doesn't quite get things
+# right. Adding build scripts is easy. Create as many .sh files as you need in this scripts directory.
+
+# Here is an example script you can use to get you started It assumes you are using a "modern" layout.
+
+# change directories to your theme or plugin
+pushd .
+
+# run your build commands
+echo "Hello World!"
+
+# return to where we were so the next build script starts off from the same place
+popd
diff --git a/packages/toolkit/project/local/scripts/deploy-excludes.txt b/packages/toolkit/project/local/scripts/rsync-excludes.txt
similarity index 100%
rename from packages/toolkit/project/local/scripts/deploy-excludes.txt
rename to packages/toolkit/project/local/scripts/rsync-excludes.txt
diff --git a/packages/toolkit/scripts/project/bash/build-setup.sh b/packages/toolkit/scripts/project/bash/build-setup.sh
index a6c5eb7b..a531c82a 100644
--- a/packages/toolkit/scripts/project/bash/build-setup.sh
+++ b/packages/toolkit/scripts/project/bash/build-setup.sh
@@ -1,13 +1,180 @@
-#!/bin/bash
+#!/usr/bin/env bash -l
 
-maybe_init_nvm() {
+# Various tasks to determine some things like what kind of project is this
+# such as standard, wp-content rooted...something else?
+function build:preflight {
+  # Check for a default, standard layout that has a wordpress directory
+  if [ -d wordpress ] && [ -d build ]; then # this is probably a standard setup
+    echo "Detected standard WordPress repository layout"
+    PROJECT_TYPE="standard"
+    WORDPRESS_BUILD_ROOT="wordpress/wp-content"
+    return
+  fi
+
+  # Check for a wp-content rooted style repository
+  if [ -d plugins ] || [ -d themes ]; then # this is probably a wp-root repo
+    echo "Detected wp-content rooted WordPress repository layout"
+    PROJECT_TYPE="wpcontent"
+    WORDPRESS_BUILD_ROOT="."
+    return
+  fi
+
+}
+
+
+# Routine to determine what version of WordPress to install
+function build:version {
+
+  WORDPRESS_VERSION="latest"
+  if [ ${CI:-false} = "true" ]; then
+    if [ -z ${WORDPRESS_VERSION} ]; then
+      WORDPRESS_VERSION="latest"
+    fi
+  else
+    GIT_BRANCH=$(git branch --format='%(refname:short)' --show-current)
+    GIT_BRANCH_SLUG=$(utilities:create-gitlab-slug ${GIT_BRANCH})
+    ENVIRONMENT=$(yq eval '.environments | to_entries[] | select(.value.branch == "'${GIT_BRANCH_SLUG}'") | .key' ${TENUP_CI_FILE})
+
+    if [ ${ENVIRONMENT:-null} != "null" ]; then
+      WORDPRESS_VERSION=$(yq '.environments.'${ENVIRONMENT}'.wordpress_version' ${TENUP_CI_FILE})
+    fi
+  fi
+  
+  if [ "${WORDPRESS_VERSION}" == "latest" ]; then
+    WORDPRESS_VERSION=$(curl -s https://api.wordpress.org/core/version-check/1.7/ | jq '.offers[0].current' | tr -d '"')
+  fi
+
+  echo ${WORDPRESS_VERSION}
+}
+
+function build:install {
+  build:preflight
+
+  # we use command in case wp-cli is installed as an alias
+  if [[ -z $(command -v wp) ]]; then
+    echo "wp-cli is not installed or in your path but it is required"
+    exit 1
+  fi
+
+  local WORDPRESS_VERSION=$(build:version)
+  echo "Installing WordPress version: ${WORDPRESS_VERSION}"
+
+  if [ ${PROJECT_TYPE} = "standard" ]; then
+    mkdir -p wordpress/wp-content
+    pushd wordpress
+  else
+    mkdir -p payload/wp-content
+    pushd payload
+  fi
+  wp core download --version=${WORDPRESS_VERSION} --skip-content --force
+  popd
+
+}
+
+function build:main {
+  set -eo pipefail
+
+  build:preflight
 
-  if [ $(find . -name .nvmrc | wc -l) -gt 0 ] && [ ! -f $NVM_DIR/nvm.sh ]; then
-    echo "This project requires nvm. Please install nvm and try again"
+  # don't call this script directly
+  if [ $(shopt -q login_shell) ]; then
+    echo "Please call this using build/local.sh rather than directly"
     exit 1
   fi
 
-  . $NVM_DIR/nvm.sh
+  # This is your "main" build file. By default, it builds a 10up/wp-scaffold style project
+  # but you are free to modify it as required for your project. Remember, you can also
+  # drop in any number of scripts and they will be run in alphabetical order AFTER main.sh
+
+  # detect if this is a standard layout or not
+
+  if [ -d wordpress/wp-content ]; then
+    pushd wordpress/wp-content
+  elif [ -d plugins ]; then
+    pushd . # go no where, we are already in the right spot
+  fi
+  if [ "${CI:-false}" = "true" ] && [ -f composer.json ]; then
+    if [ ! -f composer.lock ] && [ -f composer.json ]; then
+      echo "No composer.lock file detected. You should create/commit an up to date composer.lock file!"
+      exit 1
+    else
+      composer install --no-dev
+    fi
+  elif [ -f composer.json ]; then
+    composer install
+  fi
+
+  
+  if [ -f package.json ]; then
+    # Ensure we have the correct node version installed
+    nvm install
+    nvm use
+
+    if [ "${CI:-false}" = "true" ] && [ -f package.json ]; then
+      if [ -f package-lock.json ]; then
+        npm ci
+      else
+        echo "No package-lock.json file detected. You should create/commit an up to date package-lock.json file!"
+        exit 1
+      fi
+    else
+      npm install
+    fi
+
+    npm run build
+  fi
+  popd
+}
+
+function build:local {
+  set -eo pipefail
+  # Create additional build scripts in the build directory with a .sh
+  # extension. They should do their work inside the wordpress directory.
+
+  # We always call main.sh first
+  build:main
+
+  # Then call any other drop in scripts next
+  for I in $(ls scripts/*sh)
+  do
+    . $I
+  done
+}
+
+# Perform a CI like build
+function build:full {
+  set -eo pipefail
+
+  build:preflight
+  build:install
+  build:local
+
+  # This rsync will typically work but if you have integrated the CI Library
+  # into a non project template based project you should adjust it
+
+  # First determine if we are using a project rsync-exclude or the included one
+  if [ -f scripts/rsync-excludes.txt ]; then
+    RSYNC_EXCLUDES="scripts/rsync-excludes.txt"
+  fi
+
+  if [ ${PROJECT_TYPE} == "standard" ]; then
+    rsync -a --exclude-from=${RSYNC_EXCLUDES} wordpress/ payload/
+  else
+    for I in themes mu-plugins plugins
+    do
+      if [ -d $I ]; then
+        rsync -a --exclude-from=${RSYNC_EXCLUDES} $I/ payload/wp-content/$I
+      fi
+    done
+  fi
+
+}
+
+# Converts a git branch to a gitlab compatible slug
+function utilities:create-gitlab-slug {
+  local VALUE=$(echo $1 | sed 's/[^a-zA-Z0-9]/-/g' | awk '{print tolower($0)}')
+
+  echo ${VALUE}
 }
 
-maybe_init_nvm
+eval build:$@
diff --git a/packages/toolkit/scripts/project/bash/create-payload.sh b/packages/toolkit/scripts/project/bash/create-payload.sh
index 91309781..075f37e0 100644
--- a/packages/toolkit/scripts/project/bash/create-payload.sh
+++ b/packages/toolkit/scripts/project/bash/create-payload.sh
@@ -17,4 +17,4 @@ download https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz wordpress.t
 tar --strip-components=1 -zxmf wordpress.tar.gz -C .
 rm wordpress.tar.gz
 
-rsync -avz --exclude-from=$deploy_file_excludes_absolute $project_root/$deploy_from $deploy_to_subdir
+rsync -avz --exclude-from=$rsync_file_excludes_absolute $project_root/$deploy_from $deploy_to_subdir
diff --git a/packages/toolkit/scripts/project/build.js b/packages/toolkit/scripts/project/build.js
index 92e789af..928a75a1 100644
--- a/packages/toolkit/scripts/project/build.js
+++ b/packages/toolkit/scripts/project/build.js
@@ -16,7 +16,8 @@ const run = async () => {
 		process.exit(1);
 	}
 
-	const variables = getProjectVariables();
+	// combine project variables with actual environment variables
+	const variables = { ...getProjectVariables(), ...process.env };
 
 	if (!variables) {
 		log(chalk.red('No .tenup.yml found.'));
@@ -26,7 +27,7 @@ const run = async () => {
 	setEnvVariables(variables);
 
 	if (fs.existsSync(variables.build_script_path)) {
-		execSync(`. ${__dirname}/bash/build-setup.sh; . ${variables.build_script_path}`, {
+		execSync(`bash -l ${__dirname}/bash/build-setup.sh local`, {
 			stdio: 'inherit',
 		});
 	} else {
diff --git a/packages/toolkit/scripts/project/create-payload.js b/packages/toolkit/scripts/project/create-payload.js
index 81134707..a6d96559 100644
--- a/packages/toolkit/scripts/project/create-payload.js
+++ b/packages/toolkit/scripts/project/create-payload.js
@@ -4,24 +4,11 @@ const chalk = require('chalk');
 const { log } = console;
 
 const fs = require('fs');
-const {
-	getProjectRoot,
-	getProjectVariables,
-	setEnvVariables,
-	getEnvironmentFromBranch,
-} = require('../../utils');
+const { getProjectRoot, getProjectVariables, setEnvVariables } = require('../../utils');
 
-const description = '10up-toolkit project create-payload <branch>';
+const description = '10up-toolkit project build';
 
 const run = async () => {
-	const branch = process.argv.slice(3)[0];
-
-	if (!branch || branch.match(/--/)) {
-		log(description);
-		log(chalk.red('No branch specified.'));
-		process.exit(1);
-	}
-
 	const root = getProjectRoot();
 
 	if (!root) {
@@ -29,34 +16,29 @@ const run = async () => {
 		process.exit(1);
 	}
 
-	let variables = getProjectVariables();
+	// combine project variables with actual environment variables
+	const variables = { ...getProjectVariables(), ...process.env };
+
+	// FIXME: This is a hack to force "create-payload" to behave like ci
+	variables.CI = true;
 
 	if (!variables) {
 		log(chalk.red('No .tenup.yml found.'));
 		process.exit(1);
 	}
 
-	const matchedEnvironment = getEnvironmentFromBranch(branch, variables.environments);
-
-	if (!matchedEnvironment) {
-		log(chalk.red(`No environment found matching branch \`${branch}\`.`));
-		process.exit(0);
-	}
-
-	variables = { ...variables, ...matchedEnvironment };
-
-	log(`Creating payload for environment ${matchedEnvironment.environment}.`);
-
 	setEnvVariables(variables);
 
-	// First run build
-	await require('./build').run();
-
-	if (fs.existsSync(variables.create_payload_script_path)) {
-		execSync(`bash ${variables.create_payload_script_path}`, { stdio: 'inherit' });
+	if (fs.existsSync(variables.build_script_path)) {
+		execSync(`bash -l ${__dirname}/bash/build-setup.sh full`, {
+			stdio: 'inherit',
+		});
+	} else {
+		log(chalk.red('No build script found.'));
+		process.exit(1);
 	}
 
-	log(chalk.green('Payload created.'));
+	log(chalk.green('Build complete.'));
 };
 
 module.exports = { run, description };
diff --git a/packages/toolkit/scripts/project/init.js b/packages/toolkit/scripts/project/init.js
index 7ac50fde..abc41aed 100755
--- a/packages/toolkit/scripts/project/init.js
+++ b/packages/toolkit/scripts/project/init.js
@@ -117,7 +117,9 @@ const run = async () => {
 
 	const toolkitPath = resolve(`${__dirname}/../../`);
 	const initPath =
-		projectLayout === 'modern' ? `${resolve(cliPath)}${path.sep}wordpress` : resolve(cliPath);
+		projectLayout === 'modern'
+			? `${resolve(cliPath)}${path.sep}wordpress${path.sep}wp-content`
+			: resolve(cliPath);
 	template = results.template || template;
 
 	const projectName = results.name || name;
@@ -205,14 +207,20 @@ const run = async () => {
 	const pluginPath = `${initPath}/plugins/${projectNameLowercaseHypen}-plugin`;
 	const muPluginPath = `${initPath}/mu-plugins/${projectNameLowercaseHypen}-plugin`;
 
-	// Copy contents of toolkitPath/project/local into initPath
+	// Copy contents of toolkitPath/project/local into cliPath
 	execSync(`rsync -rc "${toolkitPath}/project/local/" "${cliPath}"`);
 	tenupComposerFiles.forEach((file) => {
-		const command = `composer install --working-dir=${path
-			.dirname(file)
-			.replace(`${initPath}`, './')
-			.replace('//', '/')}\n`;
-		fs.appendFileSync(`${cliPath}/scripts/build.sh`, command);
+		// skip wp-content building, that's free in the build scripts already
+		if (path.basename(path.dirname(file)) !== 'wp-content') {
+			const workingDir = path.dirname(file).slice(resolve(cliPath).length).replace('//', '/');
+			const command = `composer install --working-dir=.${workingDir}\n`;
+
+			// FIXME: don't actually output the file, it results in brokeness
+			// fs.appendFileSync(
+			// 	`${cliPath}/scripts/build-${path.basename(path.dirname(file))}.sh`,
+			// 	command,
+			// );
+		}
 	});
 
 	if (!skipComposer) {
diff --git a/packages/toolkit/utils/project.js b/packages/toolkit/utils/project.js
index 762eb5a1..3df221b1 100644
--- a/packages/toolkit/utils/project.js
+++ b/packages/toolkit/utils/project.js
@@ -136,8 +136,8 @@ const getProjectVariables = (path = '.') => {
 		data.build_script_path = `${projectRoot}/scripts/build.sh`;
 	}
 
-	data.deploy_file_excludes = `./scripts/deploy-excludes.txt`;
-	data.deploy_file_excludes_absolute = `${projectRoot}/scripts/deploy-excludes.txt`;
+	data.rsync_file_excludes = `./scripts/rsync-excludess.txt`;
+	data.rsync_file_excludes_absolute = `${projectRoot}/scripts/rsync-excludess.txt`;
 
 	data.toolkit_path = resolve(`${__dirname}/../`);
 

From 147c72909a503b32f20784d5443b8f4144834180 Mon Sep 17 00:00:00 2001
From: Dustin Rue <dustin.rue@10up.com>
Date: Fri, 5 Jul 2024 17:44:37 -0500
Subject: [PATCH 04/27] attempt to make linter happy

---
 packages/toolkit/scripts/project/init.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/toolkit/scripts/project/init.js b/packages/toolkit/scripts/project/init.js
index abc41aed..1a251123 100755
--- a/packages/toolkit/scripts/project/init.js
+++ b/packages/toolkit/scripts/project/init.js
@@ -212,8 +212,8 @@ const run = async () => {
 	tenupComposerFiles.forEach((file) => {
 		// skip wp-content building, that's free in the build scripts already
 		if (path.basename(path.dirname(file)) !== 'wp-content') {
-			const workingDir = path.dirname(file).slice(resolve(cliPath).length).replace('//', '/');
-			const command = `composer install --working-dir=.${workingDir}\n`;
+			// const workingDir = path.dirname(file).slice(resolve(cliPath).length).replace('//', '/');
+			// const command = `composer install --working-dir=.${workingDir}\n`;
 
 			// FIXME: don't actually output the file, it results in brokeness
 			// fs.appendFileSync(

From bbaae339a54beebbfa307a5cada074e12bad8433 Mon Sep 17 00:00:00 2001
From: Dustin Rue <dustin.rue@10up.com>
Date: Fri, 9 Aug 2024 13:22:26 -0500
Subject: [PATCH 05/27] fix description for create-payload

---
 packages/toolkit/scripts/project/create-payload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/toolkit/scripts/project/create-payload.js b/packages/toolkit/scripts/project/create-payload.js
index a6d96559..a410009e 100644
--- a/packages/toolkit/scripts/project/create-payload.js
+++ b/packages/toolkit/scripts/project/create-payload.js
@@ -6,7 +6,7 @@ const { log } = console;
 const fs = require('fs');
 const { getProjectRoot, getProjectVariables, setEnvVariables } = require('../../utils');
 
-const description = '10up-toolkit project build';
+const description = '10up-toolkit project create-payload';
 
 const run = async () => {
 	const root = getProjectRoot();

From a50a15df200924c4a792ecb2c1a8889b0b1805ef Mon Sep 17 00:00:00 2001
From: Dustin Rue <dustin.rue@10up.com>
Date: Fri, 9 Aug 2024 14:26:59 -0500
Subject: [PATCH 06/27] monorepo instead of modern, common instead of legacy,
 improve init process

---
 .../scripts/project/bash/build-setup.sh       | 48 +++++++++++++++++--
 packages/toolkit/scripts/project/init.js      | 22 ++++++---
 2 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/packages/toolkit/scripts/project/bash/build-setup.sh b/packages/toolkit/scripts/project/bash/build-setup.sh
index a531c82a..5c13d623 100644
--- a/packages/toolkit/scripts/project/bash/build-setup.sh
+++ b/packages/toolkit/scripts/project/bash/build-setup.sh
@@ -3,10 +3,11 @@
 # Various tasks to determine some things like what kind of project is this
 # such as standard, wp-content rooted...something else?
 function build:preflight {
+  PROJECT_TYPE="standard"
   # Check for a default, standard layout that has a wordpress directory
   if [ -d wordpress ] && [ -d build ]; then # this is probably a standard setup
     echo "Detected standard WordPress repository layout"
-    PROJECT_TYPE="standard"
+
     WORDPRESS_BUILD_ROOT="wordpress/wp-content"
     return
   fi
@@ -39,7 +40,7 @@ function build:version {
       WORDPRESS_VERSION=$(yq '.environments.'${ENVIRONMENT}'.wordpress_version' ${TENUP_CI_FILE})
     fi
   fi
-  
+
   if [ "${WORDPRESS_VERSION}" == "latest" ]; then
     WORDPRESS_VERSION=$(curl -s https://api.wordpress.org/core/version-check/1.7/ | jq '.offers[0].current' | tr -d '"')
   fi
@@ -104,7 +105,7 @@ function build:main {
     composer install
   fi
 
-  
+
   if [ -f package.json ]; then
     # Ensure we have the correct node version installed
     nvm install
@@ -132,6 +133,7 @@ function build:local {
   # extension. They should do their work inside the wordpress directory.
 
   # We always call main.sh first
+  build:preflight
   build:main
 
   # Then call any other drop in scripts next
@@ -170,6 +172,46 @@ function build:full {
 
 }
 
+function build:update-composer {
+
+  build:preflight
+
+  if [ ${PROJECT_TYPE} == "standard" ]; then
+    pushd wordpress/wp-content
+  else
+    pushd .
+  fi
+
+  if [ ! composer.json ]; then
+    echo "No composer.json file found. Run this from the root of a project and try again."
+    exit 1
+  fi
+
+  for I in $(find . -maxdepth 1 -name composer.json)
+  do
+    composer update --no-install
+  done
+
+  pushd themes
+  for I in $(find . -maxdepth 2 -name composer.json)
+  do
+    pushd $(dirname $I)
+    composer update --no-install
+    popd
+  done
+
+  popd
+  popd
+}
+
+function build:initialize-git {
+  git init .
+  echo
+  echo
+  echo 'Git has been initialized. Please run "git remote add origin <project git url>" to set the remote repository location.'
+}
+
+
 # Converts a git branch to a gitlab compatible slug
 function utilities:create-gitlab-slug {
   local VALUE=$(echo $1 | sed 's/[^a-zA-Z0-9]/-/g' | awk '{print tolower($0)}')
diff --git a/packages/toolkit/scripts/project/init.js b/packages/toolkit/scripts/project/init.js
index 1a251123..ad7c2d7f 100755
--- a/packages/toolkit/scripts/project/init.js
+++ b/packages/toolkit/scripts/project/init.js
@@ -14,7 +14,7 @@ const { getArgFromCLI, hasArgInCLI } = require('../../utils');
 
 const cliPath = hasArgInCLI('--path') ? getArgFromCLI('--path') : '.';
 
-const projectLayout = hasArgInCLI('--layout') ? getArgFromCLI('--layout') : 'legacy';
+const projectLayout = hasArgInCLI('--layout') ? getArgFromCLI('--layout') : 'common';
 
 const name = hasArgInCLI('--name') ? getArgFromCLI('--name') : '';
 
@@ -27,7 +27,7 @@ let template = hasArgInCLI('--template') ? getArgFromCLI('--template') : '';
 const variables = require(`../../project/default-variables.json`);
 
 const description =
-	'10up-toolkit project init [--path=<path>] [--layout=<legacy>] [--name=<name>] [--template=<template>] [--skip-composer] [--confirm]';
+	'10up-toolkit project init [--path=<path>] [--layout=<common>] [--name=<name>] [--template=<template>] [--skip-composer] [--confirm]';
 
 const run = async () => {
 	const questions = [];
@@ -50,17 +50,17 @@ const run = async () => {
 
 	// we purposely do not actually expose projectLayout as a question for now and leave it as an advanced, semi-hidden option
 	/*
-	if (projectLayout === 'legacy') {
+	if (projectLayout === 'common') {
 		questions.push({
 			type: 'input',
 			name: 'layout',
 			validate: (input) => {
-				if (!['legacy','modern'].includes(input)) {
+				if (!['common','monorepo'].includes(input)) {
 					return false;
 				}
 				return true;
 			},
-			message: 'Project Layout (legacy or modern):',
+			message: 'Project Layout (common or monorepo):',
 		});
 	}
 	*/
@@ -117,7 +117,7 @@ const run = async () => {
 
 	const toolkitPath = resolve(`${__dirname}/../../`);
 	const initPath =
-		projectLayout === 'modern'
+		projectLayout === 'monorepo'
 			? `${resolve(cliPath)}${path.sep}wordpress${path.sep}wp-content`
 			: resolve(cliPath);
 	template = results.template || template;
@@ -251,6 +251,16 @@ const run = async () => {
 	// Write config file back to disk
 	fs.writeFileSync(`${cliPath}/.tenup.yml`, configFile);
 
+	const cwd = process.cwd();
+	process.chdir(cliPath);
+	execSync(`bash -l ${__dirname}/bash/build-setup.sh update-composer`, {
+		stdio: 'inherit',
+	});
+	execSync(`bash -l ${__dirname}/bash/build-setup.sh initialize-git`, {
+		stdio: 'inherit',
+	});
+	process.chdir(cwd);
+
 	log(chalk.green('Project initialized.'));
 
 	// Now generate CI

From 686b4e4324a6caaea35a98820d393bec8b80d351 Mon Sep 17 00:00:00 2001
From: Dustin Rue <dustin.rue@10up.com>
Date: Fri, 9 Aug 2024 14:27:51 -0500
Subject: [PATCH 07/27] convenience method for updating the composer lock file

---
 .../scripts/project/update-composer.js        | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 packages/toolkit/scripts/project/update-composer.js

diff --git a/packages/toolkit/scripts/project/update-composer.js b/packages/toolkit/scripts/project/update-composer.js
new file mode 100644
index 00000000..b0bccbc0
--- /dev/null
+++ b/packages/toolkit/scripts/project/update-composer.js
@@ -0,0 +1,41 @@
+const { execSync } = require('child_process');
+const chalk = require('chalk');
+
+const { log } = console;
+
+const fs = require('fs');
+const { getProjectRoot, getProjectVariables, setEnvVariables } = require('../../utils');
+
+const description = '10up-toolkit project update-composer';
+
+const run = async () => {
+	const root = getProjectRoot();
+
+	if (!root) {
+		log(chalk.red('This is not a project.'));
+		process.exit(1);
+	}
+
+	// combine project variables with actual environment variables
+	const variables = { ...getProjectVariables(), ...process.env };
+
+	if (!variables) {
+		log(chalk.red('No .tenup.yml found.'));
+		process.exit(1);
+	}
+
+	setEnvVariables(variables);
+
+	if (fs.existsSync(variables.build_script_path)) {
+		execSync(`bash -l ${__dirname}/bash/build-setup.sh update-composer`, {
+			stdio: 'inherit',
+		});
+	} else {
+		log(chalk.red('No build script found.'));
+		process.exit(1);
+	}
+
+	log(chalk.green('Composer update complete.'));
+};
+
+module.exports = { run, description };

From 83b03a4162408dce1d36ca3230a1e2fcd6543d87 Mon Sep 17 00:00:00 2001
From: Dustin Rue <dustin.rue@10up.com>
Date: Fri, 9 Aug 2024 15:30:40 -0500
Subject: [PATCH 08/27] ability to package into a container image, updated
 readme

---
 packages/toolkit/PROJECTS.md                  | 10 ++++-
 .../toolkit/project/gitlab/.gitlab-ci.tmpl    |  2 +-
 packages/toolkit/project/local/.gitignore     | 26 ++++++++++++
 .../toolkit/scripts/project/bash/Dockerfile   |  7 ++++
 .../scripts/project/bash/build-setup.sh       | 23 +++++++++++
 packages/toolkit/scripts/project/package.js   | 41 +++++++++++++++++++
 6 files changed, 106 insertions(+), 3 deletions(-)
 create mode 100644 packages/toolkit/project/local/.gitignore
 create mode 100644 packages/toolkit/scripts/project/bash/Dockerfile
 create mode 100644 packages/toolkit/scripts/project/package.js

diff --git a/packages/toolkit/PROJECTS.md b/packages/toolkit/PROJECTS.md
index f037939b..34461980 100644
--- a/packages/toolkit/PROJECTS.md
+++ b/packages/toolkit/PROJECTS.md
@@ -85,10 +85,10 @@ List of commands:
 `build` simply executes your `scripts/build.sh` file (or other path you specify). `build` will be executed before deploying files.
 
 ```bash
-10up-toolkit project create-payload <branch>
+10up-toolkit project create-payload
 ```
 
-This command creates a payload directory of the built project (including WordPress) for deployment. Engineers likely won't need to run this command themselves as GitLab does it automatically. You must provide a branch that corresponds to an environment in `.tenup.yml`.
+This command performs a simulated CI/CD build and creates a payload directory of the built project (including WordPress core). Useful for validating how a build will behave in CI/CD for deployment. Engineers likely won't need to run this command themselves as CI/CD does it automatically.
 
 ```bash
 10up-toolkit project generate-ci [--confirm] [--path=<path>]
@@ -96,4 +96,10 @@ This command creates a payload directory of the built project (including WordPre
 
 This command generates necessary CI files. For GitLab, this would be `.gitlab-ci.yml`. Right now this only supports GitLab but we will add support for GitHub in the future.
 
+```bash
+10up-toolkit project update-composer
+```
+
+Convenience function to update all dependencies in all found composer.json files. Also generates updated lock files.
+
 **Note that generating CI files is currently in alpha and may require manual editing to fix issues.**
diff --git a/packages/toolkit/project/gitlab/.gitlab-ci.tmpl b/packages/toolkit/project/gitlab/.gitlab-ci.tmpl
index 81fc5b15..4057be5d 100644
--- a/packages/toolkit/project/gitlab/.gitlab-ci.tmpl
+++ b/packages/toolkit/project/gitlab/.gitlab-ci.tmpl
@@ -25,7 +25,7 @@ build_plugins_and_themes:
   stage: build
   script:
     - nvm install 18
-    - npx 10up-toolkit project create-payload $CI_COMMIT_REF_NAME
+    - npx 10up-toolkit project create-payload
   artifacts:
     paths:
       - payload
diff --git a/packages/toolkit/project/local/.gitignore b/packages/toolkit/project/local/.gitignore
new file mode 100644
index 00000000..14fb7d13
--- /dev/null
+++ b/packages/toolkit/project/local/.gitignore
@@ -0,0 +1,26 @@
+payload
+build/vendor
+build/composer.lock
+build/composer.json
+/vendor
+wordpress/.env
+wordpress/*php
+wordpress/wp-content/uploads
+wordpress/wp-includes
+wordpress/wp-admin
+wordpress/license.txt
+wordpress/readme.html
+!wordpress/wp-config.php
+docker-compose.override.yml
+.config.json
+wordpress/wp-content/advanced-cache.php
+wordpress/wp-content/mu-plugins/10up-experience.php
+wordpress/wp-content/mu-plugins/10up-experience/
+wordpress/wp-content/mu-plugins/batcache.php
+wordpress/wp-content/mu-plugins/batcache/
+wordpress/wp-content/mu-plugins/redis-cache.php
+wordpress/wp-content/mu-plugins/redis-cache/
+wordpress/wp-content/mu-plugins/s3-uploads.php
+wordpress/wp-content/mu-plugins/s3-uploads/
+wordpress/wp-content/object-cache.php
+.lock
diff --git a/packages/toolkit/scripts/project/bash/Dockerfile b/packages/toolkit/scripts/project/bash/Dockerfile
new file mode 100644
index 00000000..666890b4
--- /dev/null
+++ b/packages/toolkit/scripts/project/bash/Dockerfile
@@ -0,0 +1,7 @@
+FROM alpine:latest
+
+USER root
+WORKDIR /var/www/html
+COPY payload .
+RUN mkdir wp-content/uploads && \
+    chown 33:33 wp-content/uploads
diff --git a/packages/toolkit/scripts/project/bash/build-setup.sh b/packages/toolkit/scripts/project/bash/build-setup.sh
index 5c13d623..4a59c283 100644
--- a/packages/toolkit/scripts/project/bash/build-setup.sh
+++ b/packages/toolkit/scripts/project/bash/build-setup.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash -l
 
+SHARE_DIR="$(dirname "$(realpath "$0")")"
 # Various tasks to determine some things like what kind of project is this
 # such as standard, wp-content rooted...something else?
 function build:preflight {
@@ -211,6 +212,28 @@ function build:initialize-git {
   echo 'Git has been initialized. Please run "git remote add origin <project git url>" to set the remote repository location.'
 }
 
+function build:package {
+
+  if [ -z $(which docker) ]; then
+    echo "You don't seem to have Docker installed but it is required for this to work."
+    exit 1
+  fi
+
+  if [ ! -d payload ]; then
+    echo "No payload directory found. Please run 10up-toolkit project create-payload first."
+    exit 1
+  fi
+
+  # First determine if we are using a project Dockerfile or the included one
+  if [ -f Dockerfile ]; then
+    DOCKERFILE="Dockerfile"
+  else
+    DOCKERFILE="${SHARE_DIR:?}/Dockerfile"
+  fi
+   # FIXME: This should be updated to use variables from .tenup-ci.yml
+  docker buildx build --load -f ${DOCKERFILE} . -t tenup-project:latest
+}
+
 
 # Converts a git branch to a gitlab compatible slug
 function utilities:create-gitlab-slug {
diff --git a/packages/toolkit/scripts/project/package.js b/packages/toolkit/scripts/project/package.js
new file mode 100644
index 00000000..9875f7c1
--- /dev/null
+++ b/packages/toolkit/scripts/project/package.js
@@ -0,0 +1,41 @@
+const { execSync } = require('child_process');
+const chalk = require('chalk');
+
+const { log } = console;
+
+const fs = require('fs');
+const { getProjectRoot, getProjectVariables, setEnvVariables } = require('../../utils');
+
+const description = '10up-toolkit project package';
+
+const run = async () => {
+	const root = getProjectRoot();
+
+	if (!root) {
+		log(chalk.red('This is not a project.'));
+		process.exit(1);
+	}
+
+	// combine project variables with actual environment variables
+	const variables = { ...getProjectVariables(), ...process.env };
+
+	if (!variables) {
+		log(chalk.red('No .tenup.yml found.'));
+		process.exit(1);
+	}
+
+	setEnvVariables(variables);
+
+	if (fs.existsSync(variables.build_script_path)) {
+		execSync(`bash -l ${__dirname}/bash/build-setup.sh package`, {
+			stdio: 'inherit',
+		});
+	} else {
+		log(chalk.red('No build script found.'));
+		process.exit(1);
+	}
+
+	log(chalk.green('Packing process complete.'));
+};
+
+module.exports = { run, description };

From 14e3cdc9f9014b3f522f7ce2eb404dcbb4e516fc Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Thu, 15 Aug 2024 11:45:21 -0400
Subject: [PATCH 09/27] Remove directory slash detection; properly name
 templateInitPath variable; remove composer block that wasnt doing anything

---
 packages/toolkit/scripts/project/init.js | 49 ++++++++----------------
 1 file changed, 17 insertions(+), 32 deletions(-)

diff --git a/packages/toolkit/scripts/project/init.js b/packages/toolkit/scripts/project/init.js
index 1a251123..4d9e1e8e 100755
--- a/packages/toolkit/scripts/project/init.js
+++ b/packages/toolkit/scripts/project/init.js
@@ -116,10 +116,8 @@ const run = async () => {
 	variables.wordpress_version = await getWordPressLatestVersion();
 
 	const toolkitPath = resolve(`${__dirname}/../../`);
-	const initPath =
-		projectLayout === 'modern'
-			? `${resolve(cliPath)}${path.sep}wordpress${path.sep}wp-content`
-			: resolve(cliPath);
+	const templateInitPath =
+		projectLayout === 'modern' ? `${resolve(cliPath)}/wordpress/wp-content` : resolve(cliPath);
 	template = results.template || template;
 
 	const projectName = results.name || name;
@@ -140,22 +138,22 @@ const run = async () => {
 	const projectNameUppercaseUnderscore = projectName.replace(/ /g, '_').toUpperCase();
 
 	// Create dir if it does not exist
-	if (!fs.existsSync(initPath)) {
-		fs.mkdirSync(initPath, { recursive: true });
+	if (!fs.existsSync(templateInitPath)) {
+		fs.mkdirSync(templateInitPath, { recursive: true });
 	}
 
 	// If template is not empty, git clone template to init_path
 	if (template !== 'none') {
 		// Check if init_path directory is not empty
-		if (fs.readdirSync(initPath).length > 0) {
+		if (fs.readdirSync(templateInitPath).length > 0) {
 			console.error(
-				`Directory ${initPath} is not empty. Please provide an empty directory to initialize the project.`,
+				`Directory ${templateInitPath} is not empty. Please provide an empty directory to initialize the project.`,
 			);
 			process.exit(1);
 		}
 
-		execSync(`git clone ${template} '${initPath}'`);
-		fs.rmSync(path.join(initPath, '.git'), { recursive: true });
+		execSync(`git clone ${template} '${templateInitPath}'`);
+		fs.rmSync(path.join(templateInitPath, '.git'), { recursive: true });
 	}
 
 	const tenupComposerFiles = [];
@@ -180,7 +178,7 @@ const run = async () => {
 		{ from: /Tenup Theme/g, to: `${projectName} Theme` },
 	];
 
-	const files = await fg(`${initPath}/**/*`, {
+	const files = await fg(`${templateInitPath}/**/*`, {
 		ignore: ['**/*/node_modules', '**/*/vendor', '**/*/dist'],
 		dot: true,
 	});
@@ -203,25 +201,12 @@ const run = async () => {
 		}
 	});
 
-	const themePath = `${initPath}/themes/${projectNameLowercaseHypen}-theme`;
-	const pluginPath = `${initPath}/plugins/${projectNameLowercaseHypen}-plugin`;
-	const muPluginPath = `${initPath}/mu-plugins/${projectNameLowercaseHypen}-plugin`;
+	const themePath = `${templateInitPath}/themes/${projectNameLowercaseHypen}-theme`;
+	const pluginPath = `${templateInitPath}/plugins/${projectNameLowercaseHypen}-plugin`;
+	const muPluginPath = `${templateInitPath}/mu-plugins/${projectNameLowercaseHypen}-plugin`;
 
 	// Copy contents of toolkitPath/project/local into cliPath
 	execSync(`rsync -rc "${toolkitPath}/project/local/" "${cliPath}"`);
-	tenupComposerFiles.forEach((file) => {
-		// skip wp-content building, that's free in the build scripts already
-		if (path.basename(path.dirname(file)) !== 'wp-content') {
-			// const workingDir = path.dirname(file).slice(resolve(cliPath).length).replace('//', '/');
-			// const command = `composer install --working-dir=.${workingDir}\n`;
-
-			// FIXME: don't actually output the file, it results in brokeness
-			// fs.appendFileSync(
-			// 	`${cliPath}/scripts/build-${path.basename(path.dirname(file))}.sh`,
-			// 	command,
-			// );
-		}
-	});
 
 	if (!skipComposer) {
 		tenupComposerFiles.forEach((file) => {
@@ -230,11 +215,11 @@ const run = async () => {
 	}
 
 	const renameDirs = [
-		{ from: `${initPath}/themes/tenup-theme`, to: themePath },
-		{ from: `${initPath}/plugins/tenup-plugin`, to: pluginPath },
-		{ from: `${initPath}/themes/10up-theme`, to: themePath },
-		{ from: `${initPath}/plugins/10up-plugin`, to: pluginPath },
-		{ from: `${initPath}/mu-plugins/10up-plugin`, to: muPluginPath },
+		{ from: `${templateInitPath}/themes/tenup-theme`, to: themePath },
+		{ from: `${templateInitPath}/plugins/tenup-plugin`, to: pluginPath },
+		{ from: `${templateInitPath}/themes/10up-theme`, to: themePath },
+		{ from: `${templateInitPath}/plugins/10up-plugin`, to: pluginPath },
+		{ from: `${templateInitPath}/mu-plugins/10up-plugin`, to: muPluginPath },
 	];
 
 	renameDirs.forEach((dir) => {

From 71547ffec7912570a9eb3c5bdbe9c7ec61430b88 Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Thu, 15 Aug 2024 16:02:50 -0400
Subject: [PATCH 10/27] Change standard layout to wpparent; remove
 create-payload and support a  option in the build command that lets you
 specify

---
 packages/toolkit/PROJECTS.md                  |  1 -
 .../toolkit/project/default-variables.json    |  1 -
 .../toolkit/project/gitlab/.gitlab-ci.tmpl    |  2 +-
 .../scripts/project/bash/build-setup.sh       | 16 +++----
 .../scripts/project/bash/create-payload.sh    | 20 ---------
 packages/toolkit/scripts/project/build.js     | 14 ++++--
 .../toolkit/scripts/project/create-payload.js | 44 -------------------
 packages/toolkit/scripts/project/init.js      | 23 ++--------
 packages/toolkit/utils/project.js             | 10 -----
 9 files changed, 24 insertions(+), 107 deletions(-)
 delete mode 100644 packages/toolkit/scripts/project/bash/create-payload.sh
 delete mode 100644 packages/toolkit/scripts/project/create-payload.js

diff --git a/packages/toolkit/PROJECTS.md b/packages/toolkit/PROJECTS.md
index 34461980..2c2de847 100644
--- a/packages/toolkit/PROJECTS.md
+++ b/packages/toolkit/PROJECTS.md
@@ -63,7 +63,6 @@ The following are additional optional variables that allow you to use custom scr
 ```yaml
 deploy_script_path: "" # Custom deploy script
 build_script_path: "" # For using a build script in a different location
-create_payload_script_path: "" # Custom create payload script
 ```
 
 ## Commands
diff --git a/packages/toolkit/project/default-variables.json b/packages/toolkit/project/default-variables.json
index b1b1a4a7..f810b37f 100644
--- a/packages/toolkit/project/default-variables.json
+++ b/packages/toolkit/project/default-variables.json
@@ -4,6 +4,5 @@
 	"build_script_path": "",
 	"wordpress_version": "",
 	"deploy_script_path": "",
-	"create_payload_script_path": "",
 	"environments": []
 }
diff --git a/packages/toolkit/project/gitlab/.gitlab-ci.tmpl b/packages/toolkit/project/gitlab/.gitlab-ci.tmpl
index 4057be5d..2f8bc3e1 100644
--- a/packages/toolkit/project/gitlab/.gitlab-ci.tmpl
+++ b/packages/toolkit/project/gitlab/.gitlab-ci.tmpl
@@ -25,7 +25,7 @@ build_plugins_and_themes:
   stage: build
   script:
     - nvm install 18
-    - npx 10up-toolkit project create-payload
+    - npx 10up-toolkit project build --type=full
   artifacts:
     paths:
       - payload
diff --git a/packages/toolkit/scripts/project/bash/build-setup.sh b/packages/toolkit/scripts/project/bash/build-setup.sh
index 4a59c283..b91b8832 100644
--- a/packages/toolkit/scripts/project/bash/build-setup.sh
+++ b/packages/toolkit/scripts/project/bash/build-setup.sh
@@ -2,12 +2,12 @@
 
 SHARE_DIR="$(dirname "$(realpath "$0")")"
 # Various tasks to determine some things like what kind of project is this
-# such as standard, wp-content rooted...something else?
+# such as wpparent, wp-content rooted...something else?
 function build:preflight {
-  PROJECT_TYPE="standard"
-  # Check for a default, standard layout that has a wordpress directory
-  if [ -d wordpress ] && [ -d build ]; then # this is probably a standard setup
-    echo "Detected standard WordPress repository layout"
+  PROJECT_TYPE="wpparent"
+  # Check for a parent layout that has a wordpress directory
+  if [ -d wordpress ] && [ -d build ]; then # this is probably a wpparent setup
+    echo "Detected parent WordPress repository layout"
 
     WORDPRESS_BUILD_ROOT="wordpress/wp-content"
     return
@@ -61,7 +61,7 @@ function build:install {
   local WORDPRESS_VERSION=$(build:version)
   echo "Installing WordPress version: ${WORDPRESS_VERSION}"
 
-  if [ ${PROJECT_TYPE} = "standard" ]; then
+  if [ ${PROJECT_TYPE} = "wpparent" ]; then
     mkdir -p wordpress/wp-content
     pushd wordpress
   else
@@ -88,7 +88,7 @@ function build:main {
   # but you are free to modify it as required for your project. Remember, you can also
   # drop in any number of scripts and they will be run in alphabetical order AFTER main.sh
 
-  # detect if this is a standard layout or not
+  # detect if this is a wpparent layout or not
 
   if [ -d wordpress/wp-content ]; then
     pushd wordpress/wp-content
@@ -220,7 +220,7 @@ function build:package {
   fi
 
   if [ ! -d payload ]; then
-    echo "No payload directory found. Please run 10up-toolkit project create-payload first."
+    echo "No payload directory found. Please run 10up-toolkit project build --type=full first."
     exit 1
   fi
 
diff --git a/packages/toolkit/scripts/project/bash/create-payload.sh b/packages/toolkit/scripts/project/bash/create-payload.sh
deleted file mode 100644
index 075f37e0..00000000
--- a/packages/toolkit/scripts/project/bash/create-payload.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-download() {
-	if [ `which curl` ]; then
-		curl -s "$1" > "$2";
-	elif [ `which wget` ]; then
-		wget -nv -O "$2" "$1"
-	fi
-}
-
-rm -rf payload
-mkdir payload
-cd payload
-
-echo "Downloading WordPress $WORDPRESS_VERSION..."
-download https://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz wordpress.tar.gz
-tar --strip-components=1 -zxmf wordpress.tar.gz -C .
-rm wordpress.tar.gz
-
-rsync -avz --exclude-from=$rsync_file_excludes_absolute $project_root/$deploy_from $deploy_to_subdir
diff --git a/packages/toolkit/scripts/project/build.js b/packages/toolkit/scripts/project/build.js
index 928a75a1..8322ec6b 100644
--- a/packages/toolkit/scripts/project/build.js
+++ b/packages/toolkit/scripts/project/build.js
@@ -4,9 +4,17 @@ const chalk = require('chalk');
 const { log } = console;
 
 const fs = require('fs');
-const { getProjectRoot, getProjectVariables, setEnvVariables } = require('../../utils');
+const {
+	getProjectRoot,
+	getProjectVariables,
+	setEnvVariables,
+	hasArgInCLI,
+	getArgFromCLI,
+} = require('../../utils');
 
-const description = '10up-toolkit project build';
+const buildType = hasArgInCLI('--type') ? getArgFromCLI('--type') : 'local';
+
+const description = '10up-toolkit project build [--type=<type>]';
 
 const run = async () => {
 	const root = getProjectRoot();
@@ -27,7 +35,7 @@ const run = async () => {
 	setEnvVariables(variables);
 
 	if (fs.existsSync(variables.build_script_path)) {
-		execSync(`bash -l ${__dirname}/bash/build-setup.sh local`, {
+		execSync(`bash -l ${__dirname}/bash/build-setup.sh ${buildType}`, {
 			stdio: 'inherit',
 		});
 	} else {
diff --git a/packages/toolkit/scripts/project/create-payload.js b/packages/toolkit/scripts/project/create-payload.js
deleted file mode 100644
index a410009e..00000000
--- a/packages/toolkit/scripts/project/create-payload.js
+++ /dev/null
@@ -1,44 +0,0 @@
-const { execSync } = require('child_process');
-const chalk = require('chalk');
-
-const { log } = console;
-
-const fs = require('fs');
-const { getProjectRoot, getProjectVariables, setEnvVariables } = require('../../utils');
-
-const description = '10up-toolkit project create-payload';
-
-const run = async () => {
-	const root = getProjectRoot();
-
-	if (!root) {
-		log(chalk.red('This is not a project.'));
-		process.exit(1);
-	}
-
-	// combine project variables with actual environment variables
-	const variables = { ...getProjectVariables(), ...process.env };
-
-	// FIXME: This is a hack to force "create-payload" to behave like ci
-	variables.CI = true;
-
-	if (!variables) {
-		log(chalk.red('No .tenup.yml found.'));
-		process.exit(1);
-	}
-
-	setEnvVariables(variables);
-
-	if (fs.existsSync(variables.build_script_path)) {
-		execSync(`bash -l ${__dirname}/bash/build-setup.sh full`, {
-			stdio: 'inherit',
-		});
-	} else {
-		log(chalk.red('No build script found.'));
-		process.exit(1);
-	}
-
-	log(chalk.green('Build complete.'));
-};
-
-module.exports = { run, description };
diff --git a/packages/toolkit/scripts/project/init.js b/packages/toolkit/scripts/project/init.js
index b96bc4a4..b900dc77 100755
--- a/packages/toolkit/scripts/project/init.js
+++ b/packages/toolkit/scripts/project/init.js
@@ -14,7 +14,7 @@ const { getArgFromCLI, hasArgInCLI } = require('../../utils');
 
 const cliPath = hasArgInCLI('--path') ? getArgFromCLI('--path') : '.';
 
-const projectLayout = hasArgInCLI('--layout') ? getArgFromCLI('--layout') : 'common';
+const projectLayout = hasArgInCLI('--layout') ? getArgFromCLI('--layout') : 'wpcontent';
 
 const name = hasArgInCLI('--name') ? getArgFromCLI('--name') : '';
 
@@ -48,23 +48,6 @@ const run = async () => {
 		}
 	}
 
-	// we purposely do not actually expose projectLayout as a question for now and leave it as an advanced, semi-hidden option
-	/*
-	if (projectLayout === 'common') {
-		questions.push({
-			type: 'input',
-			name: 'layout',
-			validate: (input) => {
-				if (!['common','monorepo'].includes(input)) {
-					return false;
-				}
-				return true;
-			},
-			message: 'Project Layout (common or monorepo):',
-		});
-	}
-	*/
-
 	if (!name) {
 		questions.push({
 			type: 'input',
@@ -117,7 +100,9 @@ const run = async () => {
 
 	const toolkitPath = resolve(`${__dirname}/../../`);
 	const templateInitPath =
-		projectLayout === 'modern' ? `${resolve(cliPath)}/wordpress/wp-content` : resolve(cliPath);
+		projectLayout === 'wpcontent'
+			? `${resolve(cliPath)}/wordpress/wp-content`
+			: resolve(cliPath);
 	template = results.template || template;
 
 	const projectName = results.name || name;
diff --git a/packages/toolkit/utils/project.js b/packages/toolkit/utils/project.js
index 3df221b1..6f539f7f 100644
--- a/packages/toolkit/utils/project.js
+++ b/packages/toolkit/utils/project.js
@@ -120,16 +120,6 @@ const getProjectVariables = (path = '.') => {
 
 	data.project_root = projectRoot;
 
-	if (data.create_payload_script_path) {
-		data.create_payload_script_path = resolve(
-			`${projectRoot}/${data.create_payload_script_path}`,
-		);
-	} else {
-		data.create_payload_script_path = resolve(
-			`${__dirname}/../scripts/project/bash/create-payload.sh`,
-		);
-	}
-
 	if (data.build_script_path) {
 		data.build_script_path = resolve(`${projectRoot}/${data.build_script_path}`);
 	} else {

From 53698e1162260eb07bdcb7fe49066a3d7550ec05 Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Thu, 15 Aug 2024 16:03:22 -0400
Subject: [PATCH 11/27] Fix typo

---
 packages/toolkit/utils/project.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/toolkit/utils/project.js b/packages/toolkit/utils/project.js
index 6f539f7f..781d680c 100644
--- a/packages/toolkit/utils/project.js
+++ b/packages/toolkit/utils/project.js
@@ -126,8 +126,8 @@ const getProjectVariables = (path = '.') => {
 		data.build_script_path = `${projectRoot}/scripts/build.sh`;
 	}
 
-	data.rsync_file_excludes = `./scripts/rsync-excludess.txt`;
-	data.rsync_file_excludes_absolute = `${projectRoot}/scripts/rsync-excludess.txt`;
+	data.rsync_file_excludes = `./scripts/rsync-excludes.txt`;
+	data.rsync_file_excludes_absolute = `${projectRoot}/scripts/rsync-excludes.txt`;
 
 	data.toolkit_path = resolve(`${__dirname}/../`);
 

From 81dc4c4b1bfcc206bf532f8a3a0dd4a2a8d5b43e Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Thu, 15 Aug 2024 16:18:12 -0400
Subject: [PATCH 12/27] Use wpparent

---
 packages/toolkit/scripts/project/bash/build-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/toolkit/scripts/project/bash/build-setup.sh b/packages/toolkit/scripts/project/bash/build-setup.sh
index b91b8832..21da5e7e 100644
--- a/packages/toolkit/scripts/project/bash/build-setup.sh
+++ b/packages/toolkit/scripts/project/bash/build-setup.sh
@@ -7,7 +7,7 @@ function build:preflight {
   PROJECT_TYPE="wpparent"
   # Check for a parent layout that has a wordpress directory
   if [ -d wordpress ] && [ -d build ]; then # this is probably a wpparent setup
-    echo "Detected parent WordPress repository layout"
+    echo "Detected wpparent WordPress repository layout"
 
     WORDPRESS_BUILD_ROOT="wordpress/wp-content"
     return

From 2741ae77ce0674b1c829f6e01deff7346d268f47 Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Thu, 15 Aug 2024 16:21:07 -0400
Subject: [PATCH 13/27] Remove build_script_path as it's not needed anymore

---
 packages/toolkit/PROJECTS.md                        |  1 -
 packages/toolkit/project/default-variables.json     |  1 -
 packages/toolkit/scripts/project/build.js           | 11 +++--------
 packages/toolkit/scripts/project/package.js         | 11 +++--------
 packages/toolkit/scripts/project/update-composer.js | 11 +++--------
 packages/toolkit/utils/project.js                   |  6 ------
 6 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/packages/toolkit/PROJECTS.md b/packages/toolkit/PROJECTS.md
index 2c2de847..8b19bd81 100644
--- a/packages/toolkit/PROJECTS.md
+++ b/packages/toolkit/PROJECTS.md
@@ -62,7 +62,6 @@ The following are additional optional variables that allow you to use custom scr
 
 ```yaml
 deploy_script_path: "" # Custom deploy script
-build_script_path: "" # For using a build script in a different location
 ```
 
 ## Commands
diff --git a/packages/toolkit/project/default-variables.json b/packages/toolkit/project/default-variables.json
index f810b37f..ed35d010 100644
--- a/packages/toolkit/project/default-variables.json
+++ b/packages/toolkit/project/default-variables.json
@@ -1,7 +1,6 @@
 {
 	"project_name": "10up Project",
 	"php_version": "8.2",
-	"build_script_path": "",
 	"wordpress_version": "",
 	"deploy_script_path": "",
 	"environments": []
diff --git a/packages/toolkit/scripts/project/build.js b/packages/toolkit/scripts/project/build.js
index 8322ec6b..d3f2dea9 100644
--- a/packages/toolkit/scripts/project/build.js
+++ b/packages/toolkit/scripts/project/build.js
@@ -34,14 +34,9 @@ const run = async () => {
 
 	setEnvVariables(variables);
 
-	if (fs.existsSync(variables.build_script_path)) {
-		execSync(`bash -l ${__dirname}/bash/build-setup.sh ${buildType}`, {
-			stdio: 'inherit',
-		});
-	} else {
-		log(chalk.red('No build script found.'));
-		process.exit(1);
-	}
+	execSync(`bash -l ${__dirname}/bash/build-setup.sh ${buildType}`, {
+		stdio: 'inherit',
+	});
 
 	log(chalk.green('Build complete.'));
 };
diff --git a/packages/toolkit/scripts/project/package.js b/packages/toolkit/scripts/project/package.js
index 9875f7c1..e16f8ffb 100644
--- a/packages/toolkit/scripts/project/package.js
+++ b/packages/toolkit/scripts/project/package.js
@@ -26,14 +26,9 @@ const run = async () => {
 
 	setEnvVariables(variables);
 
-	if (fs.existsSync(variables.build_script_path)) {
-		execSync(`bash -l ${__dirname}/bash/build-setup.sh package`, {
-			stdio: 'inherit',
-		});
-	} else {
-		log(chalk.red('No build script found.'));
-		process.exit(1);
-	}
+	execSync(`bash -l ${__dirname}/bash/build-setup.sh package`, {
+		stdio: 'inherit',
+	});
 
 	log(chalk.green('Packing process complete.'));
 };
diff --git a/packages/toolkit/scripts/project/update-composer.js b/packages/toolkit/scripts/project/update-composer.js
index b0bccbc0..4f351889 100644
--- a/packages/toolkit/scripts/project/update-composer.js
+++ b/packages/toolkit/scripts/project/update-composer.js
@@ -26,14 +26,9 @@ const run = async () => {
 
 	setEnvVariables(variables);
 
-	if (fs.existsSync(variables.build_script_path)) {
-		execSync(`bash -l ${__dirname}/bash/build-setup.sh update-composer`, {
-			stdio: 'inherit',
-		});
-	} else {
-		log(chalk.red('No build script found.'));
-		process.exit(1);
-	}
+	execSync(`bash -l ${__dirname}/bash/build-setup.sh update-composer`, {
+		stdio: 'inherit',
+	});
 
 	log(chalk.green('Composer update complete.'));
 };
diff --git a/packages/toolkit/utils/project.js b/packages/toolkit/utils/project.js
index 781d680c..c28ec2f4 100644
--- a/packages/toolkit/utils/project.js
+++ b/packages/toolkit/utils/project.js
@@ -120,12 +120,6 @@ const getProjectVariables = (path = '.') => {
 
 	data.project_root = projectRoot;
 
-	if (data.build_script_path) {
-		data.build_script_path = resolve(`${projectRoot}/${data.build_script_path}`);
-	} else {
-		data.build_script_path = `${projectRoot}/scripts/build.sh`;
-	}
-
 	data.rsync_file_excludes = `./scripts/rsync-excludes.txt`;
 	data.rsync_file_excludes_absolute = `${projectRoot}/scripts/rsync-excludes.txt`;
 

From e31e26266677d650bcc2ada8421b7a3100afc06d Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Thu, 15 Aug 2024 16:22:06 -0400
Subject: [PATCH 14/27] Remove deploy_script_path

---
 packages/toolkit/PROJECTS.md                    | 6 ------
 packages/toolkit/project/default-variables.json | 1 -
 2 files changed, 7 deletions(-)

diff --git a/packages/toolkit/PROJECTS.md b/packages/toolkit/PROJECTS.md
index 8b19bd81..52e03990 100644
--- a/packages/toolkit/PROJECTS.md
+++ b/packages/toolkit/PROJECTS.md
@@ -58,12 +58,6 @@ In this scenario, `deploy_from` would be set to `wp` and `deploy_to_subdir` woul
 
 `deploy_type` currently supports `rsync`, `wpe` (WP Engine), and `pantheon`. It defaults to `rsync`. If WPE or Pantheon is choosen, `deploy_to` should contain a Git URL. More deploy types will be added in the future.
 
-The following are additional optional variables that allow you to use custom scripts different than the ones provided by 10up Toolkit. You shouldn't need to use these unless you are doing something super custom. All these paths are relative from the root of your project.
-
-```yaml
-deploy_script_path: "" # Custom deploy script
-```
-
 ## Commands
 
 The project subcommand provides a variety of utlities for creating, building, and deploying 10up-specific projects.
diff --git a/packages/toolkit/project/default-variables.json b/packages/toolkit/project/default-variables.json
index ed35d010..f15098cb 100644
--- a/packages/toolkit/project/default-variables.json
+++ b/packages/toolkit/project/default-variables.json
@@ -2,6 +2,5 @@
 	"project_name": "10up Project",
 	"php_version": "8.2",
 	"wordpress_version": "",
-	"deploy_script_path": "",
 	"environments": []
 }

From ea8fc46c2727f1b65ea68cbde312df5c44f478a1 Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Thu, 15 Aug 2024 16:25:43 -0400
Subject: [PATCH 15/27] Rename build-setup.sh to scripts.sh

---
 .../scripts/project/bash/{build-setup.sh => scripts.sh}       | 0
 packages/toolkit/scripts/project/build.js                     | 2 +-
 packages/toolkit/scripts/project/init.js                      | 4 ++--
 packages/toolkit/scripts/project/package.js                   | 2 +-
 packages/toolkit/scripts/project/update-composer.js           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename packages/toolkit/scripts/project/bash/{build-setup.sh => scripts.sh} (100%)

diff --git a/packages/toolkit/scripts/project/bash/build-setup.sh b/packages/toolkit/scripts/project/bash/scripts.sh
similarity index 100%
rename from packages/toolkit/scripts/project/bash/build-setup.sh
rename to packages/toolkit/scripts/project/bash/scripts.sh
diff --git a/packages/toolkit/scripts/project/build.js b/packages/toolkit/scripts/project/build.js
index d3f2dea9..73876c40 100644
--- a/packages/toolkit/scripts/project/build.js
+++ b/packages/toolkit/scripts/project/build.js
@@ -34,7 +34,7 @@ const run = async () => {
 
 	setEnvVariables(variables);
 
-	execSync(`bash -l ${__dirname}/bash/build-setup.sh ${buildType}`, {
+	execSync(`bash -l ${__dirname}/bash/scripts.sh ${buildType}`, {
 		stdio: 'inherit',
 	});
 
diff --git a/packages/toolkit/scripts/project/init.js b/packages/toolkit/scripts/project/init.js
index b900dc77..573a4f00 100755
--- a/packages/toolkit/scripts/project/init.js
+++ b/packages/toolkit/scripts/project/init.js
@@ -223,10 +223,10 @@ const run = async () => {
 
 	const cwd = process.cwd();
 	process.chdir(cliPath);
-	execSync(`bash -l ${__dirname}/bash/build-setup.sh update-composer`, {
+	execSync(`bash -l ${__dirname}/bash/scripts.sh update-composer`, {
 		stdio: 'inherit',
 	});
-	execSync(`bash -l ${__dirname}/bash/build-setup.sh initialize-git`, {
+	execSync(`bash -l ${__dirname}/bash/scripts.sh initialize-git`, {
 		stdio: 'inherit',
 	});
 	process.chdir(cwd);
diff --git a/packages/toolkit/scripts/project/package.js b/packages/toolkit/scripts/project/package.js
index e16f8ffb..649bab2f 100644
--- a/packages/toolkit/scripts/project/package.js
+++ b/packages/toolkit/scripts/project/package.js
@@ -26,7 +26,7 @@ const run = async () => {
 
 	setEnvVariables(variables);
 
-	execSync(`bash -l ${__dirname}/bash/build-setup.sh package`, {
+	execSync(`bash -l ${__dirname}/bash/scripts.sh package`, {
 		stdio: 'inherit',
 	});
 
diff --git a/packages/toolkit/scripts/project/update-composer.js b/packages/toolkit/scripts/project/update-composer.js
index 4f351889..dbbaf0d3 100644
--- a/packages/toolkit/scripts/project/update-composer.js
+++ b/packages/toolkit/scripts/project/update-composer.js
@@ -26,7 +26,7 @@ const run = async () => {
 
 	setEnvVariables(variables);
 
-	execSync(`bash -l ${__dirname}/bash/build-setup.sh update-composer`, {
+	execSync(`bash -l ${__dirname}/bash/scripts.sh update-composer`, {
 		stdio: 'inherit',
 	});
 

From 345a06e940de6b938ec6ab9e0fbad728f051bbed Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Thu, 15 Aug 2024 17:20:15 -0400
Subject: [PATCH 16/27] Now we get the git branch in node so we can pass the
 proper environment to bash including the proper WORDPRESS_VERSION

---
 .../toolkit/scripts/project/bash/scripts.sh   | 18 +----
 packages/toolkit/scripts/project/build.js     |  6 +-
 packages/toolkit/scripts/project/package.js   |  1 -
 packages/toolkit/utils/index.js               |  2 +
 packages/toolkit/utils/project.js             | 74 +++++++++++++++++--
 5 files changed, 77 insertions(+), 24 deletions(-)

diff --git a/packages/toolkit/scripts/project/bash/scripts.sh b/packages/toolkit/scripts/project/bash/scripts.sh
index 21da5e7e..5f7fece6 100644
--- a/packages/toolkit/scripts/project/bash/scripts.sh
+++ b/packages/toolkit/scripts/project/bash/scripts.sh
@@ -27,20 +27,10 @@ function build:preflight {
 # Routine to determine what version of WordPress to install
 function build:version {
 
-  WORDPRESS_VERSION="latest"
-  if [ ${CI:-false} = "true" ]; then
-    if [ -z ${WORDPRESS_VERSION} ]; then
-      WORDPRESS_VERSION="latest"
-    fi
-  else
-    GIT_BRANCH=$(git branch --format='%(refname:short)' --show-current)
-    GIT_BRANCH_SLUG=$(utilities:create-gitlab-slug ${GIT_BRANCH})
-    ENVIRONMENT=$(yq eval '.environments | to_entries[] | select(.value.branch == "'${GIT_BRANCH_SLUG}'") | .key' ${TENUP_CI_FILE})
-
-    if [ ${ENVIRONMENT:-null} != "null" ]; then
-      WORDPRESS_VERSION=$(yq '.environments.'${ENVIRONMENT}'.wordpress_version' ${TENUP_CI_FILE})
-    fi
-  fi
+	# If the WORDPRESS_VERSION is not set, set to "latest"
+	if [ -z ${WORDPRESS_VERSION} ]; then
+		WORDPRESS_VERSION="latest"
+	fi
 
   if [ "${WORDPRESS_VERSION}" == "latest" ]; then
     WORDPRESS_VERSION=$(curl -s https://api.wordpress.org/core/version-check/1.7/ | jq '.offers[0].current' | tr -d '"')
diff --git a/packages/toolkit/scripts/project/build.js b/packages/toolkit/scripts/project/build.js
index 73876c40..bd6af3c2 100644
--- a/packages/toolkit/scripts/project/build.js
+++ b/packages/toolkit/scripts/project/build.js
@@ -3,7 +3,6 @@ const chalk = require('chalk');
 
 const { log } = console;
 
-const fs = require('fs');
 const {
 	getProjectRoot,
 	getProjectVariables,
@@ -13,8 +12,9 @@ const {
 } = require('../../utils');
 
 const buildType = hasArgInCLI('--type') ? getArgFromCLI('--type') : 'local';
+const buildEnvironment = hasArgInCLI('--environment') ? getArgFromCLI('--environment') : null;
 
-const description = '10up-toolkit project build [--type=<type>]';
+const description = '10up-toolkit project build [--type=<type>] [--environment=<environment>]';
 
 const run = async () => {
 	const root = getProjectRoot();
@@ -25,7 +25,7 @@ const run = async () => {
 	}
 
 	// combine project variables with actual environment variables
-	const variables = { ...getProjectVariables(), ...process.env };
+	const variables = { ...getProjectVariables(buildEnvironment), ...process.env };
 
 	if (!variables) {
 		log(chalk.red('No .tenup.yml found.'));
diff --git a/packages/toolkit/scripts/project/package.js b/packages/toolkit/scripts/project/package.js
index 649bab2f..4b7d24f3 100644
--- a/packages/toolkit/scripts/project/package.js
+++ b/packages/toolkit/scripts/project/package.js
@@ -3,7 +3,6 @@ const chalk = require('chalk');
 
 const { log } = console;
 
-const fs = require('fs');
 const { getProjectRoot, getProjectVariables, setEnvVariables } = require('../../utils');
 
 const description = '10up-toolkit project package';
diff --git a/packages/toolkit/utils/index.js b/packages/toolkit/utils/index.js
index ca7245bf..71ffbafd 100644
--- a/packages/toolkit/utils/index.js
+++ b/packages/toolkit/utils/index.js
@@ -37,6 +37,7 @@ const { maybeInsertStyleVersionHash } = require('./blocks');
 const {
 	getProjectRoot,
 	setEnvVariables,
+	getGitBranch,
 	getProjectVariables,
 	getEnvironmentFromBranch,
 	replaceVariables,
@@ -78,5 +79,6 @@ module.exports = {
 	getTenUpScriptsPackageBuildConfig,
 	hasWebpackConfig,
 	displayWebpackStats,
+	getGitBranch,
 	maybeInsertStyleVersionHash,
 };
diff --git a/packages/toolkit/utils/project.js b/packages/toolkit/utils/project.js
index c28ec2f4..ba2c1844 100644
--- a/packages/toolkit/utils/project.js
+++ b/packages/toolkit/utils/project.js
@@ -2,6 +2,7 @@ const YAML = require('yaml');
 const fs = require('fs');
 
 const { resolve } = require('path');
+const { execSync } = require('child_process');
 const fetch = require('node-fetch');
 
 /**
@@ -59,18 +60,43 @@ const getWordPressLatestVersion = async () => {
 	return null;
 };
 
+/**
+ * Flatten an object
+ *
+ * @param {*} obj
+ * @param {*} parentKey
+ * @param {*} result
+ * @returns {*}
+ */
+const flattenObject = (obj, parentKey = '', result = {}) => {
+	Object.keys(obj).forEach((key) => {
+		const newKey = parentKey ? `${parentKey}__${key}` : key;
+		const value = obj[key];
+
+		if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+			// Recursively flatten the nested object
+			flattenObject(value, newKey, result);
+		} else {
+			// Assign the value to the result object with the concatenated key
+			result[newKey] = value;
+		}
+	});
+
+	return result;
+};
+
 /**
  * Setuip environment variables
  *
  * @param {*} variables
  */
 const setEnvVariables = (variables) => {
+	const flattenedVariables = flattenObject(variables);
+
 	// Loop through variables and set them as environment variables
-	Object.keys(variables).forEach((key) => {
-		process.env[key] =
-			typeof variables[key] === 'object' ? JSON.stringify(variables[key]) : variables[key];
-		process.env[key.toUpperCase()] =
-			typeof variables[key] === 'object' ? JSON.stringify(variables[key]) : variables[key];
+	Object.keys(flattenedVariables).forEach((key) => {
+		process.env[key] = flattenedVariables[key];
+		process.env[key.toUpperCase()] = flattenedVariables[key];
 	});
 };
 
@@ -94,13 +120,29 @@ const getEnvironmentFromBranch = (branch, environments = []) => {
 	return matchedEnvironment;
 };
 
+const getGitBranch = () => {
+	let branch = null;
+	try {
+		// Get the current git branch into a variable. Ensure nothing is printed to the stdout
+		branch = execSync('git rev-parse --abbrev-ref HEAD 2>/dev/null', {
+			encoding: 'utf8',
+		})
+			.toString()
+			.trim();
+	} catch (error) {
+		// Do nothing
+	}
+
+	return branch;
+};
+
 /**
  * Get variables from .tenup.yml
  *
  * @param {string} path Path to check
  * @returns {object|null}
  */
-const getProjectVariables = (path = '.') => {
+const getProjectVariables = (environment, path = '.') => {
 	const projectRoot = getProjectRoot(path);
 
 	if (!projectRoot) {
@@ -118,6 +160,25 @@ const getProjectVariables = (path = '.') => {
 		return null;
 	}
 
+	if (!environment) {
+		const branch = getGitBranch();
+
+		if (branch) {
+			data.current_branch = branch;
+			const matchedEnvironment = getEnvironmentFromBranch(branch, data.environments);
+
+			if (matchedEnvironment) {
+				data.current_environment = {};
+				Object.keys(matchedEnvironment).forEach((key) => {
+					data.current_environment[key] = matchedEnvironment[key];
+
+					// We hoist these to the root of the object to make it easier to use in shell e.g. WORDPRESS_VERSION
+					data[key] = matchedEnvironment[key];
+				});
+			}
+		}
+	}
+
 	data.project_root = projectRoot;
 
 	data.rsync_file_excludes = `./scripts/rsync-excludes.txt`;
@@ -142,6 +203,7 @@ module.exports = {
 	getProjectRoot,
 	replaceVariables,
 	setEnvVariables,
+	getGitBranch,
 	getProjectVariables,
 	getWordPressLatestVersion,
 	getEnvironmentFromBranch,

From 470ae80c436959bdeab36b6e41cdcc5ffa8abb6c Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Mon, 19 Aug 2024 12:41:49 -0400
Subject: [PATCH 17/27] Add skip ci option

---
 packages/toolkit/scripts/project/init.js            | 10 +++++++---
 packages/toolkit/scripts/project/update-composer.js |  1 -
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/toolkit/scripts/project/init.js b/packages/toolkit/scripts/project/init.js
index 573a4f00..86d827c7 100755
--- a/packages/toolkit/scripts/project/init.js
+++ b/packages/toolkit/scripts/project/init.js
@@ -22,12 +22,14 @@ const confirm = !!hasArgInCLI('--confirm');
 
 const skipComposer = !!hasArgInCLI('--skip-composer');
 
+const skipCI = !!hasArgInCLI('--skip-ci');
+
 let template = hasArgInCLI('--template') ? getArgFromCLI('--template') : '';
 
 const variables = require(`../../project/default-variables.json`);
 
 const description =
-	'10up-toolkit project init [--path=<path>] [--layout=<common>] [--name=<name>] [--template=<template>] [--skip-composer] [--confirm]';
+	'10up-toolkit project init [--path=<path>] [--layout=<layout>] [--name=<name>] [--template=<template>] [--skip-composer] [--skip-ci] [--confirm]';
 
 const run = async () => {
 	const questions = [];
@@ -233,8 +235,10 @@ const run = async () => {
 
 	log(chalk.green('Project initialized.'));
 
-	// Now generate CI
-	await require('./generate-ci').run(true, cliPath);
+	if (!skipCI) {
+		// Now generate CI
+		await require('./generate-ci').run(true, cliPath);
+	}
 };
 
 module.exports = { run, description };
diff --git a/packages/toolkit/scripts/project/update-composer.js b/packages/toolkit/scripts/project/update-composer.js
index dbbaf0d3..86dc00ee 100644
--- a/packages/toolkit/scripts/project/update-composer.js
+++ b/packages/toolkit/scripts/project/update-composer.js
@@ -3,7 +3,6 @@ const chalk = require('chalk');
 
 const { log } = console;
 
-const fs = require('fs');
 const { getProjectRoot, getProjectVariables, setEnvVariables } = require('../../utils');
 
 const description = '10up-toolkit project update-composer';

From fc3f2c940e6c2485870203e278527739fa932a06 Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Mon, 19 Aug 2024 12:43:06 -0400
Subject: [PATCH 18/27] Remove unneeded default variable

---
 packages/toolkit/project/default-variables.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/toolkit/project/default-variables.json b/packages/toolkit/project/default-variables.json
index f15098cb..2b700958 100644
--- a/packages/toolkit/project/default-variables.json
+++ b/packages/toolkit/project/default-variables.json
@@ -1,6 +1,5 @@
 {
 	"project_name": "10up Project",
 	"php_version": "8.2",
-	"wordpress_version": "",
 	"environments": []
 }

From 4356cddfeae05a13ee5add9c6091cad1793f48dd Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Mon, 19 Aug 2024 13:05:01 -0400
Subject: [PATCH 19/27] Remove duplicate composer installs; fix project layout
 checking logic

---
 .../toolkit/scripts/project/bash/scripts.sh   |   4 +-
 packages/toolkit/scripts/project/init.js      | 124 ++++++++----------
 2 files changed, 58 insertions(+), 70 deletions(-)

diff --git a/packages/toolkit/scripts/project/bash/scripts.sh b/packages/toolkit/scripts/project/bash/scripts.sh
index 5f7fece6..e4ef639e 100644
--- a/packages/toolkit/scripts/project/bash/scripts.sh
+++ b/packages/toolkit/scripts/project/bash/scripts.sh
@@ -150,7 +150,7 @@ function build:full {
     RSYNC_EXCLUDES="scripts/rsync-excludes.txt"
   fi
 
-  if [ ${PROJECT_TYPE} == "standard" ]; then
+  if [ ${PROJECT_TYPE} == "wpparent" ]; then
     rsync -a --exclude-from=${RSYNC_EXCLUDES} wordpress/ payload/
   else
     for I in themes mu-plugins plugins
@@ -167,7 +167,7 @@ function build:update-composer {
 
   build:preflight
 
-  if [ ${PROJECT_TYPE} == "standard" ]; then
+  if [ ${PROJECT_TYPE} == "wpparent" ]; then
     pushd wordpress/wp-content
   else
     pushd .
diff --git a/packages/toolkit/scripts/project/init.js b/packages/toolkit/scripts/project/init.js
index 86d827c7..0ca39ce1 100755
--- a/packages/toolkit/scripts/project/init.js
+++ b/packages/toolkit/scripts/project/init.js
@@ -102,7 +102,7 @@ const run = async () => {
 
 	const toolkitPath = resolve(`${__dirname}/../../`);
 	const templateInitPath =
-		projectLayout === 'wpcontent'
+		projectLayout === 'wpparent'
 			? `${resolve(cliPath)}/wordpress/wp-content`
 			: resolve(cliPath);
 	template = results.template || template;
@@ -141,79 +141,63 @@ const run = async () => {
 
 		execSync(`git clone ${template} '${templateInitPath}'`);
 		fs.rmSync(path.join(templateInitPath, '.git'), { recursive: true });
-	}
-
-	const tenupComposerFiles = [];
-
-	const replaceOptions = [
-		{ from: /TenUpPlugin/g, to: `${projectNameCamelCase}Plugin` },
-		{ from: /TenupPlugin/g, to: `${projectNameCamelCase}Plugin` },
-		{ from: /TenUpTheme/g, to: `${projectNameCamelCase}Theme` },
-		{ from: /TenupTheme/g, to: `${projectNameCamelCase}Theme` },
-		{ from: /TENUP_/g, to: `${projectNameUppercaseUnderscore}_` },
-		{ from: /tenup_/g, to: `${projectNameLowercaseUnderscore}_` },
-		{ from: /tenup-theme/g, to: `${projectNameLowercaseHypen}-theme` },
-		{ from: /tenup-plugin/g, to: `${projectNameLowercaseHypen}-plugin` },
-		{ from: /10up-plugin/g, to: `${projectNameLowercaseHypen}-plugin` },
-		{ from: /tenup-wp-scaffold/g, to: `${projectNameLowercaseHypen}` },
-		{ from: /10up\/wp-theme/g, to: `10up/${projectNameLowercaseHypen}-theme` },
-		{ from: /10up\/wp-plugin/g, to: `10up/${projectNameLowercaseHypen}-plugin` },
-		{ from: /10up\/.*-scaffold/g, to: `10up/${projectNameLowercaseHypen}` },
-		{ from: /10up Plugin/g, to: `${projectName} Plugin` },
-		{ from: /Tenup Plugin/g, to: `${projectName} Plugin` },
-		{ from: /10up Theme/g, to: `${projectName} Theme` },
-		{ from: /Tenup Theme/g, to: `${projectName} Theme` },
-	];
-
-	const files = await fg(`${templateInitPath}/**/*`, {
-		ignore: ['**/*/node_modules', '**/*/vendor', '**/*/dist'],
-		dot: true,
-	});
-
-	files.forEach((file) => {
-		let fileContents = fs.readFileSync(file, 'utf8');
 
-		replaceOptions.forEach((option) => {
-			fileContents = fileContents.replace(option.from, option.to);
+		const replaceOptions = [
+			{ from: /TenUpPlugin/g, to: `${projectNameCamelCase}Plugin` },
+			{ from: /TenupPlugin/g, to: `${projectNameCamelCase}Plugin` },
+			{ from: /TenUpTheme/g, to: `${projectNameCamelCase}Theme` },
+			{ from: /TenupTheme/g, to: `${projectNameCamelCase}Theme` },
+			{ from: /TENUP_/g, to: `${projectNameUppercaseUnderscore}_` },
+			{ from: /tenup_/g, to: `${projectNameLowercaseUnderscore}_` },
+			{ from: /tenup-theme/g, to: `${projectNameLowercaseHypen}-theme` },
+			{ from: /tenup-plugin/g, to: `${projectNameLowercaseHypen}-plugin` },
+			{ from: /10up-plugin/g, to: `${projectNameLowercaseHypen}-plugin` },
+			{ from: /tenup-wp-scaffold/g, to: `${projectNameLowercaseHypen}` },
+			{ from: /10up\/wp-theme/g, to: `10up/${projectNameLowercaseHypen}-theme` },
+			{ from: /10up\/wp-plugin/g, to: `10up/${projectNameLowercaseHypen}-plugin` },
+			{ from: /10up\/.*-scaffold/g, to: `10up/${projectNameLowercaseHypen}` },
+			{ from: /10up Plugin/g, to: `${projectName} Plugin` },
+			{ from: /Tenup Plugin/g, to: `${projectName} Plugin` },
+			{ from: /10up Theme/g, to: `${projectName} Theme` },
+			{ from: /Tenup Theme/g, to: `${projectName} Theme` },
+		];
+
+		const files = await fg(`${templateInitPath}/**/*`, {
+			ignore: ['**/*/node_modules', '**/*/vendor', '**/*/dist'],
+			dot: true,
 		});
 
-		fs.writeFileSync(file, fileContents);
+		files.forEach((file) => {
+			let fileContents = fs.readFileSync(file, 'utf8');
 
-		if (file.match(/composer.json$/)) {
-			const composerData = JSON.parse(fileContents);
+			replaceOptions.forEach((option) => {
+				fileContents = fileContents.replace(option.from, option.to);
+			});
 
-			if (composerData.name.match(/^10up\//)) {
-				tenupComposerFiles.push(file);
-			}
-		}
-	});
-
-	const themePath = `${templateInitPath}/themes/${projectNameLowercaseHypen}-theme`;
-	const pluginPath = `${templateInitPath}/plugins/${projectNameLowercaseHypen}-plugin`;
-	const muPluginPath = `${templateInitPath}/mu-plugins/${projectNameLowercaseHypen}-plugin`;
-
-	// Copy contents of toolkitPath/project/local into cliPath
-	execSync(`rsync -rc "${toolkitPath}/project/local/" "${cliPath}"`);
+			fs.writeFileSync(file, fileContents);
+		});
 
-	if (!skipComposer) {
-		tenupComposerFiles.forEach((file) => {
-			execSync(`composer install --working-dir="${path.dirname(file)}"`);
+		const themePath = `${templateInitPath}/themes/${projectNameLowercaseHypen}-theme`;
+		const pluginPath = `${templateInitPath}/plugins/${projectNameLowercaseHypen}-plugin`;
+		const muPluginPath = `${templateInitPath}/mu-plugins/${projectNameLowercaseHypen}-plugin`;
+
+		const renameDirs = [
+			{ from: `${templateInitPath}/themes/tenup-theme`, to: themePath },
+			{ from: `${templateInitPath}/plugins/tenup-plugin`, to: pluginPath },
+			{ from: `${templateInitPath}/themes/10up-theme`, to: themePath },
+			{ from: `${templateInitPath}/plugins/10up-plugin`, to: pluginPath },
+			{ from: `${templateInitPath}/mu-plugins/10up-plugin`, to: muPluginPath },
+		];
+
+		renameDirs.forEach((dir) => {
+			if (fs.existsSync(dir.from)) {
+				fs.renameSync(dir.from, dir.to);
+			}
 		});
 	}
 
-	const renameDirs = [
-		{ from: `${templateInitPath}/themes/tenup-theme`, to: themePath },
-		{ from: `${templateInitPath}/plugins/tenup-plugin`, to: pluginPath },
-		{ from: `${templateInitPath}/themes/10up-theme`, to: themePath },
-		{ from: `${templateInitPath}/plugins/10up-plugin`, to: pluginPath },
-		{ from: `${templateInitPath}/mu-plugins/10up-plugin`, to: muPluginPath },
-	];
-
-	renameDirs.forEach((dir) => {
-		if (fs.existsSync(dir.from)) {
-			fs.renameSync(dir.from, dir.to);
-		}
-	});
+	// Copy contents of toolkitPath/project/local into cliPath
+	execSync(`rsync -rc "${toolkitPath}/project/local/" "${cliPath}"`);
 
 	// Load the contents of the .tenup.yml file into a string
 	let configFile = fs.readFileSync(`${cliPath}/.tenup.yml`, 'utf8');
@@ -225,9 +209,13 @@ const run = async () => {
 
 	const cwd = process.cwd();
 	process.chdir(cliPath);
-	execSync(`bash -l ${__dirname}/bash/scripts.sh update-composer`, {
-		stdio: 'inherit',
-	});
+
+	if (!skipComposer) {
+		execSync(`bash -l ${__dirname}/bash/scripts.sh update-composer`, {
+			stdio: 'inherit',
+		});
+	}
+
 	execSync(`bash -l ${__dirname}/bash/scripts.sh initialize-git`, {
 		stdio: 'inherit',
 	});

From f848f2740cfa2306194d26ddd51066f56da0b68b Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Mon, 19 Aug 2024 13:54:57 -0400
Subject: [PATCH 20/27] Fix variables

---
 packages/toolkit/project/default-variables.json | 1 +
 packages/toolkit/scripts/project/init.js        | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/toolkit/project/default-variables.json b/packages/toolkit/project/default-variables.json
index 2b700958..f15098cb 100644
--- a/packages/toolkit/project/default-variables.json
+++ b/packages/toolkit/project/default-variables.json
@@ -1,5 +1,6 @@
 {
 	"project_name": "10up Project",
 	"php_version": "8.2",
+	"wordpress_version": "",
 	"environments": []
 }
diff --git a/packages/toolkit/scripts/project/init.js b/packages/toolkit/scripts/project/init.js
index 0ca39ce1..3123ca86 100755
--- a/packages/toolkit/scripts/project/init.js
+++ b/packages/toolkit/scripts/project/init.js
@@ -110,6 +110,7 @@ const run = async () => {
 	const projectName = results.name || name;
 
 	variables.projectName = projectName;
+	variables.project_name = projectName;
 
 	// Make name camel case
 	const projectNameCamelCase = projectName
@@ -210,7 +211,7 @@ const run = async () => {
 	const cwd = process.cwd();
 	process.chdir(cliPath);
 
-	if (!skipComposer) {
+	if (template !== 'none' && !skipComposer) {
 		execSync(`bash -l ${__dirname}/bash/scripts.sh update-composer`, {
 			stdio: 'inherit',
 		});

From 800b38d4ed36eef73a6ed629cef17c57c33bffdb Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Mon, 19 Aug 2024 17:01:12 -0400
Subject: [PATCH 21/27] Doc updates

---
 packages/toolkit/PROJECTS.md | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/toolkit/PROJECTS.md b/packages/toolkit/PROJECTS.md
index 52e03990..d7526b38 100644
--- a/packages/toolkit/PROJECTS.md
+++ b/packages/toolkit/PROJECTS.md
@@ -65,10 +65,10 @@ The project subcommand provides a variety of utlities for creating, building, an
 List of commands:
 
 ```bash
-10up-toolkit project init [--path=<path>] [--template=<Git repository>] [--name=<Project Name>] [--confirm] [--skip-composer]
+10up-toolkit project init [--path=<path>] [--layout=<layout>] [--template=<Git repository>] [--name=<Project Name>] [--confirm] [--skip-composer] [--skip-ci]
 ```
 
-`init` creates a project. You can optionally provide it a number of parameters or answer the prompts. If no path is provided, it will initialize the project in the current directory. You will be prompted to choose a template e.g. [WP Scaffold](https://github.com/10up/wp-scaffold). Init will automatically search and replace prefixes using the project name you provide.
+`init` creates a project. You can optionally provide it a number of parameters or answer the prompts. If no path is provided, it will initialize the project in the current directory. If no layout is provided, it will default to `wpcontent` which means the project is rooted in `wp-content` (The other option is `wpparent` where the root of the project is one directory above WordPress). You will be prompted to choose a template e.g. [WP Scaffold](https://github.com/10up/wp-scaffold). Init will automatically search and replace prefixes using the project name you provide.
 
 ```bash
 10up-toolkit project build
@@ -76,12 +76,6 @@ List of commands:
 
 `build` simply executes your `scripts/build.sh` file (or other path you specify). `build` will be executed before deploying files.
 
-```bash
-10up-toolkit project create-payload
-```
-
-This command performs a simulated CI/CD build and creates a payload directory of the built project (including WordPress core). Useful for validating how a build will behave in CI/CD for deployment. Engineers likely won't need to run this command themselves as CI/CD does it automatically.
-
 ```bash
 10up-toolkit project generate-ci [--confirm] [--path=<path>]
 ```

From c6700d85f4263996e355ab228321dd2acf4a7219 Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Mon, 19 Aug 2024 17:07:43 -0400
Subject: [PATCH 22/27] Doc updates

---
 packages/toolkit/PROJECTS.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/toolkit/PROJECTS.md b/packages/toolkit/PROJECTS.md
index d7526b38..5dcd94fe 100644
--- a/packages/toolkit/PROJECTS.md
+++ b/packages/toolkit/PROJECTS.md
@@ -71,10 +71,10 @@ List of commands:
 `init` creates a project. You can optionally provide it a number of parameters or answer the prompts. If no path is provided, it will initialize the project in the current directory. If no layout is provided, it will default to `wpcontent` which means the project is rooted in `wp-content` (The other option is `wpparent` where the root of the project is one directory above WordPress). You will be prompted to choose a template e.g. [WP Scaffold](https://github.com/10up/wp-scaffold). Init will automatically search and replace prefixes using the project name you provide.
 
 ```bash
-10up-toolkit project build
+10up-toolkit project build [--type=<type>]
 ```
 
-`build` simply executes your `scripts/build.sh` file (or other path you specify). `build` will be executed before deploying files.
+`build` will build your project e.g. `composer install`, `npm install`, and `npm run build`. It will execute all the `.sh` files in your `scripts/` directory where you can add custom build logic for your particular project. `--type` defaults to local e.g. build for your local environment. In CI, type will be set to `full`.
 
 ```bash
 10up-toolkit project generate-ci [--confirm] [--path=<path>]

From 47aef83dd4d43385d06ba4065aa025eff92e592d Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Mon, 19 Aug 2024 17:09:48 -0400
Subject: [PATCH 23/27] Fix message

---
 packages/toolkit/scripts/project/bash/scripts.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/toolkit/scripts/project/bash/scripts.sh b/packages/toolkit/scripts/project/bash/scripts.sh
index e4ef639e..e6bac24c 100644
--- a/packages/toolkit/scripts/project/bash/scripts.sh
+++ b/packages/toolkit/scripts/project/bash/scripts.sh
@@ -70,7 +70,7 @@ function build:main {
 
   # don't call this script directly
   if [ $(shopt -q login_shell) ]; then
-    echo "Please call this using build/local.sh rather than directly"
+    echo "Do not call this script directly."
     exit 1
   fi
 

From 99fafc794845a2bb41b417af3b726144994606e3 Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Tue, 20 Aug 2024 12:01:27 -0400
Subject: [PATCH 24/27] Only pushd and popd in wpparent layout

---
 packages/toolkit/scripts/project/bash/scripts.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/toolkit/scripts/project/bash/scripts.sh b/packages/toolkit/scripts/project/bash/scripts.sh
index e6bac24c..9b2d5f3a 100644
--- a/packages/toolkit/scripts/project/bash/scripts.sh
+++ b/packages/toolkit/scripts/project/bash/scripts.sh
@@ -80,7 +80,7 @@ function build:main {
 
   # detect if this is a wpparent layout or not
 
-  if [ -d wordpress/wp-content ]; then
+  if [ ${PROJECT_TYPE} == "wpparent" ]; then
     pushd wordpress/wp-content
   elif [ -d plugins ]; then
     pushd . # go no where, we are already in the right spot
@@ -115,7 +115,10 @@ function build:main {
 
     npm run build
   fi
-  popd
+
+	if [ ${PROJECT_TYPE} == "wpparent" ]; then
+  	popd
+	fi
 }
 
 function build:local {

From a4499e869529bdfe71e136dc01620de2075e7d78 Mon Sep 17 00:00:00 2001
From: Dustin Rue <dustin.rue@10up.com>
Date: Tue, 20 Aug 2024 12:05:26 -0500
Subject: [PATCH 25/27] keep consistent with the project on tabs vs spaces

---
 .../toolkit/scripts/project/bash/scripts.sh   | 362 +++++++++---------
 1 file changed, 181 insertions(+), 181 deletions(-)

diff --git a/packages/toolkit/scripts/project/bash/scripts.sh b/packages/toolkit/scripts/project/bash/scripts.sh
index 9b2d5f3a..069cf548 100644
--- a/packages/toolkit/scripts/project/bash/scripts.sh
+++ b/packages/toolkit/scripts/project/bash/scripts.sh
@@ -4,22 +4,22 @@ SHARE_DIR="$(dirname "$(realpath "$0")")"
 # Various tasks to determine some things like what kind of project is this
 # such as wpparent, wp-content rooted...something else?
 function build:preflight {
-  PROJECT_TYPE="wpparent"
-  # Check for a parent layout that has a wordpress directory
-  if [ -d wordpress ] && [ -d build ]; then # this is probably a wpparent setup
-    echo "Detected wpparent WordPress repository layout"
-
-    WORDPRESS_BUILD_ROOT="wordpress/wp-content"
-    return
-  fi
-
-  # Check for a wp-content rooted style repository
-  if [ -d plugins ] || [ -d themes ]; then # this is probably a wp-root repo
-    echo "Detected wp-content rooted WordPress repository layout"
-    PROJECT_TYPE="wpcontent"
-    WORDPRESS_BUILD_ROOT="."
-    return
-  fi
+	PROJECT_TYPE="wpparent"
+	# Check for a parent layout that has a wordpress directory
+	if [ -d wordpress ] && [ -d build ]; then # this is probably a wpparent setup
+		echo "Detected wpparent WordPress repository layout"
+
+		WORDPRESS_BUILD_ROOT="wordpress/wp-content"
+		return
+	fi
+
+	# Check for a wp-content rooted style repository
+	if [ -d plugins ] || [ -d themes ]; then # this is probably a wp-root repo
+		echo "Detected wp-content rooted WordPress repository layout"
+		PROJECT_TYPE="wpcontent"
+		WORDPRESS_BUILD_ROOT="."
+		return
+	fi
 
 }
 
@@ -32,207 +32,207 @@ function build:version {
 		WORDPRESS_VERSION="latest"
 	fi
 
-  if [ "${WORDPRESS_VERSION}" == "latest" ]; then
-    WORDPRESS_VERSION=$(curl -s https://api.wordpress.org/core/version-check/1.7/ | jq '.offers[0].current' | tr -d '"')
-  fi
+	if [ "${WORDPRESS_VERSION}" == "latest" ]; then
+		WORDPRESS_VERSION=$(curl -s https://api.wordpress.org/core/version-check/1.7/ | jq '.offers[0].current' | tr -d '"')
+	fi
 
-  echo ${WORDPRESS_VERSION}
+	echo ${WORDPRESS_VERSION}
 }
 
 function build:install {
-  build:preflight
-
-  # we use command in case wp-cli is installed as an alias
-  if [[ -z $(command -v wp) ]]; then
-    echo "wp-cli is not installed or in your path but it is required"
-    exit 1
-  fi
-
-  local WORDPRESS_VERSION=$(build:version)
-  echo "Installing WordPress version: ${WORDPRESS_VERSION}"
-
-  if [ ${PROJECT_TYPE} = "wpparent" ]; then
-    mkdir -p wordpress/wp-content
-    pushd wordpress
-  else
-    mkdir -p payload/wp-content
-    pushd payload
-  fi
-  wp core download --version=${WORDPRESS_VERSION} --skip-content --force
-  popd
+	build:preflight
+
+	# we use command in case wp-cli is installed as an alias
+	if [[ -z $(command -v wp) ]]; then
+		echo "wp-cli is not installed or in your path but it is required"
+		exit 1
+	fi
+
+	local WORDPRESS_VERSION=$(build:version)
+	echo "Installing WordPress version: ${WORDPRESS_VERSION}"
+
+	if [ ${PROJECT_TYPE} = "wpparent" ]; then
+		mkdir -p wordpress/wp-content
+		pushd wordpress
+	else
+		mkdir -p payload/wp-content
+		pushd payload
+	fi
+	wp core download --version=${WORDPRESS_VERSION} --skip-content --force
+	popd
 
 }
 
 function build:main {
-  set -eo pipefail
-
-  build:preflight
-
-  # don't call this script directly
-  if [ $(shopt -q login_shell) ]; then
-    echo "Do not call this script directly."
-    exit 1
-  fi
-
-  # This is your "main" build file. By default, it builds a 10up/wp-scaffold style project
-  # but you are free to modify it as required for your project. Remember, you can also
-  # drop in any number of scripts and they will be run in alphabetical order AFTER main.sh
-
-  # detect if this is a wpparent layout or not
-
-  if [ ${PROJECT_TYPE} == "wpparent" ]; then
-    pushd wordpress/wp-content
-  elif [ -d plugins ]; then
-    pushd . # go no where, we are already in the right spot
-  fi
-  if [ "${CI:-false}" = "true" ] && [ -f composer.json ]; then
-    if [ ! -f composer.lock ] && [ -f composer.json ]; then
-      echo "No composer.lock file detected. You should create/commit an up to date composer.lock file!"
-      exit 1
-    else
-      composer install --no-dev
-    fi
-  elif [ -f composer.json ]; then
-    composer install
-  fi
-
-
-  if [ -f package.json ]; then
-    # Ensure we have the correct node version installed
-    nvm install
-    nvm use
-
-    if [ "${CI:-false}" = "true" ] && [ -f package.json ]; then
-      if [ -f package-lock.json ]; then
-        npm ci
-      else
-        echo "No package-lock.json file detected. You should create/commit an up to date package-lock.json file!"
-        exit 1
-      fi
-    else
-      npm install
-    fi
-
-    npm run build
-  fi
+	set -eo pipefail
+
+	build:preflight
+
+	# don't call this script directly
+	if [ $(shopt -q login_shell) ]; then
+		echo "Do not call this script directly."
+		exit 1
+	fi
+
+	# This is your "main" build file. By default, it builds a 10up/wp-scaffold style project
+	# but you are free to modify it as required for your project. Remember, you can also
+	# drop in any number of scripts and they will be run in alphabetical order AFTER main.sh
+
+	# detect if this is a wpparent layout or not
+
+	if [ ${PROJECT_TYPE} == "wpparent" ]; then
+		pushd wordpress/wp-content
+	elif [ -d plugins ]; then
+		pushd . # go no where, we are already in the right spot
+	fi
+	if [ "${CI:-false}" = "true" ] && [ -f composer.json ]; then
+		if [ ! -f composer.lock ] && [ -f composer.json ]; then
+			echo "No composer.lock file detected. You should create/commit an up to date composer.lock file!"
+			exit 1
+		else
+			composer install --no-dev
+		fi
+	elif [ -f composer.json ]; then
+		composer install
+	fi
+
+
+	if [ -f package.json ]; then
+		# Ensure we have the correct node version installed
+		nvm install
+		nvm use
+
+		if [ "${CI:-false}" = "true" ] && [ -f package.json ]; then
+			if [ -f package-lock.json ]; then
+				npm ci
+			else
+				echo "No package-lock.json file detected. You should create/commit an up to date package-lock.json file!"
+				exit 1
+			fi
+		else
+			npm install
+		fi
+
+		npm run build
+	fi
 
 	if [ ${PROJECT_TYPE} == "wpparent" ]; then
-  	popd
+		popd
 	fi
 }
 
 function build:local {
-  set -eo pipefail
-  # Create additional build scripts in the build directory with a .sh
-  # extension. They should do their work inside the wordpress directory.
-
-  # We always call main.sh first
-  build:preflight
-  build:main
-
-  # Then call any other drop in scripts next
-  for I in $(ls scripts/*sh)
-  do
-    . $I
-  done
+	set -eo pipefail
+	# Create additional build scripts in the build directory with a .sh
+	# extension. They should do their work inside the wordpress directory.
+
+	# We always call main.sh first
+	build:preflight
+	build:main
+
+	# Then call any other drop in scripts next
+	for I in $(ls scripts/*sh)
+	do
+		. $I
+	done
 }
 
 # Perform a CI like build
 function build:full {
-  set -eo pipefail
-
-  build:preflight
-  build:install
-  build:local
-
-  # This rsync will typically work but if you have integrated the CI Library
-  # into a non project template based project you should adjust it
-
-  # First determine if we are using a project rsync-exclude or the included one
-  if [ -f scripts/rsync-excludes.txt ]; then
-    RSYNC_EXCLUDES="scripts/rsync-excludes.txt"
-  fi
-
-  if [ ${PROJECT_TYPE} == "wpparent" ]; then
-    rsync -a --exclude-from=${RSYNC_EXCLUDES} wordpress/ payload/
-  else
-    for I in themes mu-plugins plugins
-    do
-      if [ -d $I ]; then
-        rsync -a --exclude-from=${RSYNC_EXCLUDES} $I/ payload/wp-content/$I
-      fi
-    done
-  fi
+	set -eo pipefail
+
+	build:preflight
+	build:install
+	build:local
+
+	# This rsync will typically work but if you have integrated the CI Library
+	# into a non project template based project you should adjust it
+
+	# First determine if we are using a project rsync-exclude or the included one
+	if [ -f scripts/rsync-excludes.txt ]; then
+		RSYNC_EXCLUDES="scripts/rsync-excludes.txt"
+	fi
+
+	if [ ${PROJECT_TYPE} == "wpparent" ]; then
+		rsync -a --exclude-from=${RSYNC_EXCLUDES} wordpress/ payload/
+	else
+		for I in themes mu-plugins plugins
+		do
+			if [ -d $I ]; then
+				rsync -a --exclude-from=${RSYNC_EXCLUDES} $I/ payload/wp-content/$I
+			fi
+		done
+	fi
 
 }
 
 function build:update-composer {
 
-  build:preflight
-
-  if [ ${PROJECT_TYPE} == "wpparent" ]; then
-    pushd wordpress/wp-content
-  else
-    pushd .
-  fi
-
-  if [ ! composer.json ]; then
-    echo "No composer.json file found. Run this from the root of a project and try again."
-    exit 1
-  fi
-
-  for I in $(find . -maxdepth 1 -name composer.json)
-  do
-    composer update --no-install
-  done
-
-  pushd themes
-  for I in $(find . -maxdepth 2 -name composer.json)
-  do
-    pushd $(dirname $I)
-    composer update --no-install
-    popd
-  done
-
-  popd
-  popd
+	build:preflight
+
+	if [ ${PROJECT_TYPE} == "wpparent" ]; then
+		pushd wordpress/wp-content
+	else
+		pushd .
+	fi
+
+	if [ ! composer.json ]; then
+		echo "No composer.json file found. Run this from the root of a project and try again."
+		exit 1
+	fi
+
+	for I in $(find . -maxdepth 1 -name composer.json)
+	do
+		composer update --no-install
+	done
+
+	pushd themes
+	for I in $(find . -maxdepth 2 -name composer.json)
+	do
+		pushd $(dirname $I)
+		composer update --no-install
+		popd
+	done
+
+	popd
+	popd
 }
 
 function build:initialize-git {
-  git init .
-  echo
-  echo
-  echo 'Git has been initialized. Please run "git remote add origin <project git url>" to set the remote repository location.'
+	git init .
+	echo
+	echo
+	echo 'Git has been initialized. Please run "git remote add origin <project git url>" to set the remote repository location.'
 }
 
 function build:package {
 
-  if [ -z $(which docker) ]; then
-    echo "You don't seem to have Docker installed but it is required for this to work."
-    exit 1
-  fi
-
-  if [ ! -d payload ]; then
-    echo "No payload directory found. Please run 10up-toolkit project build --type=full first."
-    exit 1
-  fi
-
-  # First determine if we are using a project Dockerfile or the included one
-  if [ -f Dockerfile ]; then
-    DOCKERFILE="Dockerfile"
-  else
-    DOCKERFILE="${SHARE_DIR:?}/Dockerfile"
-  fi
-   # FIXME: This should be updated to use variables from .tenup-ci.yml
-  docker buildx build --load -f ${DOCKERFILE} . -t tenup-project:latest
+	if [ -z $(which docker) ]; then
+		echo "You don't seem to have Docker installed but it is required for this to work."
+		exit 1
+	fi
+
+	if [ ! -d payload ]; then
+		echo "No payload directory found. Please run 10up-toolkit project build --type=full first."
+		exit 1
+	fi
+
+	# First determine if we are using a project Dockerfile or the included one
+	if [ -f Dockerfile ]; then
+		DOCKERFILE="Dockerfile"
+	else
+		DOCKERFILE="${SHARE_DIR:?}/Dockerfile"
+	fi
+	 # FIXME: This should be updated to use variables from .tenup-ci.yml
+	docker buildx build --load -f ${DOCKERFILE} . -t tenup-project:latest
 }
 
 
 # Converts a git branch to a gitlab compatible slug
 function utilities:create-gitlab-slug {
-  local VALUE=$(echo $1 | sed 's/[^a-zA-Z0-9]/-/g' | awk '{print tolower($0)}')
+	local VALUE=$(echo $1 | sed 's/[^a-zA-Z0-9]/-/g' | awk '{print tolower($0)}')
 
-  echo ${VALUE}
+	echo ${VALUE}
 }
 
 eval build:$@

From 61ba982bb728324fb149f8805622b0b2f9fd37a0 Mon Sep 17 00:00:00 2001
From: Dustin Rue <dustin.rue@10up.com>
Date: Tue, 20 Aug 2024 14:00:41 -0500
Subject: [PATCH 26/27] maybe support shells other than bash

---
 .../toolkit/scripts/project/bash/scripts.sh   | 55 ++++++++++---------
 packages/toolkit/scripts/project/build.js     |  2 +-
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/packages/toolkit/scripts/project/bash/scripts.sh b/packages/toolkit/scripts/project/bash/scripts.sh
index 069cf548..1874770d 100644
--- a/packages/toolkit/scripts/project/bash/scripts.sh
+++ b/packages/toolkit/scripts/project/bash/scripts.sh
@@ -4,6 +4,11 @@ SHARE_DIR="$(dirname "$(realpath "$0")")"
 # Various tasks to determine some things like what kind of project is this
 # such as wpparent, wp-content rooted...something else?
 function build:preflight {
+
+	# load nvm if it exists
+	export NVM_DIR="$HOME/.nvm"
+	[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+
 	PROJECT_TYPE="wpparent"
 	# Check for a parent layout that has a wordpress directory
 	if [ -d wordpress ] && [ -d build ]; then # this is probably a wpparent setup
@@ -28,11 +33,11 @@ function build:preflight {
 function build:version {
 
 	# If the WORDPRESS_VERSION is not set, set to "latest"
-	if [ -z ${WORDPRESS_VERSION} ]; then
+	if [[ -z ${WORDPRESS_VERSION} ]]; then
 		WORDPRESS_VERSION="latest"
 	fi
 
-	if [ "${WORDPRESS_VERSION}" == "latest" ]; then
+	if [[ "${WORDPRESS_VERSION}" == "latest" ]]; then
 		WORDPRESS_VERSION=$(curl -s https://api.wordpress.org/core/version-check/1.7/ | jq '.offers[0].current' | tr -d '"')
 	fi
 
@@ -68,42 +73,38 @@ function build:main {
 
 	build:preflight
 
-	# don't call this script directly
-	if [ $(shopt -q login_shell) ]; then
-		echo "Do not call this script directly."
-		exit 1
-	fi
-
 	# This is your "main" build file. By default, it builds a 10up/wp-scaffold style project
 	# but you are free to modify it as required for your project. Remember, you can also
 	# drop in any number of scripts and they will be run in alphabetical order AFTER main.sh
 
 	# detect if this is a wpparent layout or not
-
-	if [ ${PROJECT_TYPE} == "wpparent" ]; then
+	if [[ ${PROJECT_TYPE} == "wpparent" ]]; then
 		pushd wordpress/wp-content
 	elif [ -d plugins ]; then
 		pushd . # go no where, we are already in the right spot
 	fi
-	if [ "${CI:-false}" = "true" ] && [ -f composer.json ]; then
+
+	if [[ ! -z $(command -v nvm) ]]; then
+		# Ensure we have the correct node version installed
+		nvm install
+		nvm use
+	fi
+
+	if [[ "${CI:-false}" = "true" ]] && [[ -f composer.json ]]; then
 		if [ ! -f composer.lock ] && [ -f composer.json ]; then
 			echo "No composer.lock file detected. You should create/commit an up to date composer.lock file!"
 			exit 1
 		else
 			composer install --no-dev
 		fi
-	elif [ -f composer.json ]; then
+	elif [[ -f composer.json ]]; then
 		composer install
 	fi
 
 
-	if [ -f package.json ]; then
-		# Ensure we have the correct node version installed
-		nvm install
-		nvm use
-
-		if [ "${CI:-false}" = "true" ] && [ -f package.json ]; then
-			if [ -f package-lock.json ]; then
+	if [[ -f package.json ]]; then
+		if [[ "${CI:-false}" = "true" ]] && [[ -f package.json ]]; then
+			if [[ -f package-lock.json ]]; then
 				npm ci
 			else
 				echo "No package-lock.json file detected. You should create/commit an up to date package-lock.json file!"
@@ -116,7 +117,7 @@ function build:main {
 		npm run build
 	fi
 
-	if [ ${PROJECT_TYPE} == "wpparent" ]; then
+	if [[ ${PROJECT_TYPE} == "wpparent" ]]; then
 		popd
 	fi
 }
@@ -149,11 +150,11 @@ function build:full {
 	# into a non project template based project you should adjust it
 
 	# First determine if we are using a project rsync-exclude or the included one
-	if [ -f scripts/rsync-excludes.txt ]; then
+	if [[ -f scripts/rsync-excludes.txt ]]; then
 		RSYNC_EXCLUDES="scripts/rsync-excludes.txt"
 	fi
 
-	if [ ${PROJECT_TYPE} == "wpparent" ]; then
+	if [[ ${PROJECT_TYPE} == "wpparent" ]]; then
 		rsync -a --exclude-from=${RSYNC_EXCLUDES} wordpress/ payload/
 	else
 		for I in themes mu-plugins plugins
@@ -170,13 +171,13 @@ function build:update-composer {
 
 	build:preflight
 
-	if [ ${PROJECT_TYPE} == "wpparent" ]; then
+	if [[ ${PROJECT_TYPE} == "wpparent" ]]; then
 		pushd wordpress/wp-content
 	else
 		pushd .
 	fi
 
-	if [ ! composer.json ]; then
+	if [[ ! composer.json ]]; then
 		echo "No composer.json file found. Run this from the root of a project and try again."
 		exit 1
 	fi
@@ -207,18 +208,18 @@ function build:initialize-git {
 
 function build:package {
 
-	if [ -z $(which docker) ]; then
+	if [[ -z $(which docker) ]]; then
 		echo "You don't seem to have Docker installed but it is required for this to work."
 		exit 1
 	fi
 
-	if [ ! -d payload ]; then
+	if [[ ! -d payload ]]; then
 		echo "No payload directory found. Please run 10up-toolkit project build --type=full first."
 		exit 1
 	fi
 
 	# First determine if we are using a project Dockerfile or the included one
-	if [ -f Dockerfile ]; then
+	if [[ -f Dockerfile ]]; then
 		DOCKERFILE="Dockerfile"
 	else
 		DOCKERFILE="${SHARE_DIR:?}/Dockerfile"
diff --git a/packages/toolkit/scripts/project/build.js b/packages/toolkit/scripts/project/build.js
index bd6af3c2..f71d8a41 100644
--- a/packages/toolkit/scripts/project/build.js
+++ b/packages/toolkit/scripts/project/build.js
@@ -34,7 +34,7 @@ const run = async () => {
 
 	setEnvVariables(variables);
 
-	execSync(`bash -l ${__dirname}/bash/scripts.sh ${buildType}`, {
+	execSync(`${process.env.SHELL} ${__dirname}/bash/scripts.sh ${buildType}`, {
 		stdio: 'inherit',
 	});
 

From 8587947c96c0306daab33c0d71f5a517730923dd Mon Sep 17 00:00:00 2001
From: Taylor Lovett <tlovett88@gmail.com>
Date: Wed, 21 Aug 2024 14:39:21 -0400
Subject: [PATCH 27/27] Add changeset

---
 .changeset/eight-pumpkins-provide.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/eight-pumpkins-provide.md

diff --git a/.changeset/eight-pumpkins-provide.md b/.changeset/eight-pumpkins-provide.md
new file mode 100644
index 00000000..81296755
--- /dev/null
+++ b/.changeset/eight-pumpkins-provide.md
@@ -0,0 +1,5 @@
+---
+"10up-toolkit": patch
+---
+
+Simple enhancements to toolkit project command to align with devops needs.