wp-blank-scripts 3.1.19 → 4.0.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wp-blank-scripts",
-  "version": "3.1.19",
+  "version": "4.0.0-alpha.1",
   "description": "Personal Wordpress Scripts",
   "main": "index.js",
   "bin": {
@@ -10,7 +10,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "engines": {
-    "node": ">=10"
+    "node": ">=18"
   },
   "files": [
     "cli",
@@ -31,63 +31,58 @@
   "author": "ViVO Digital",
   "license": "ISC",
   "dependencies": {
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
-    "@prettier/plugin-php": "^0.19.6",
-    "@swc/cli": "^0.1.62",
-    "@swc/core": "^1.3.67",
-    "browser-sync": "^2.29.3",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.17",
+    "@prettier/plugin-php": "^0.19.7",
+    "@swc/core": "^1.15.18",
+    "browser-sync": "^3.0.4",
     "chalk": "4.1.2",
     "copy-webpack-plugin": "^11.0.0",
-    "core-js": "^3.31.0",
-    "css-loader": "^6.8.1",
-    "cssnano": "^6.0.1",
-    "esbuild-loader": "^3.0.1",
-    "eslint": "^8.42.0",
+    "css-loader": "^6.11.0",
+    "cssnano": "^6.1.2",
+    "eslint": "^8.57.1",
     "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-import-resolver-node": "^0.3.7",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.32.2",
+    "eslint-config-prettier": "^8.10.2",
+    "eslint-import-resolver-node": "^0.3.9",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
+    "eslint-plugin-prettier": "^4.2.5",
+    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react-hooks": "^4.6.2",
     "get-port": "5.1.1",
-    "glob": "^10.2.7",
-    "html-webpack-plugin": "^5.5.3",
-    "husky": "^8.0.3",
+    "glob": "^10.5.0",
+    "html-webpack-plugin": "^5.6.6",
+    "husky": "^9.1.7",
     "inquirer": "3.0.4",
-    "lint-staged": "^13.2.2",
-    "mini-css-extract-plugin": "^2.7.6",
+    "lint-staged": "^13.3.0",
+    "mini-css-extract-plugin": "^2.10.1",
     "mysql": "^2.18.1",
-    "node-fetch": "2",
+    "node-fetch": "^2.7.0",
     "ora": "^5.4.1",
-    "postcss": "^8.4.24",
-    "postcss-loader": "^7.3.3",
-    "postcss-preset-env": "^8.5.0",
+    "postcss": "^8.5.8",
+    "postcss-loader": "^7.3.4",
+    "postcss-preset-env": "^8.5.1",
     "prettier": "^2.8.8",
-    "raw-loader": "^4.0.2",
-    "react-refresh": "^0.14.0",
-    "replace-in-file": "^7.0.1",
-    "rimraf": "^5.0.5",
+    "react-refresh": "^0.14.2",
+    "replace-in-file": "^7.2.0",
+    "rimraf": "^5.0.10",
     "rsync": "^0.6.1",
-    "sass": "^1.97.3",
+    "sass": "^1.98.0",
     "sass-loader": "16.0.7",
-    "semver": "^7.5.2",
-    "slugify": "^1.6.6",
-    "ssh2": "0.8.9",
-    "style-loader": "^3.3.3",
-    "swc-loader": "^0.2.3",
+    "semver": "^7.7.4",
+    "slugify": "^1.6.8",
+    "ssh2": "^1.17.0",
+    "style-loader": "^3.3.4",
+    "swc-loader": "^0.2.7",
     "tempy": "^0.2.1",
-    "terser-webpack-plugin": "^5.3.9",
-    "webpack": "^5.87.0",
-    "webpack-dev-middleware": "^6.1.1",
-    "webpack-hot-middleware": "^2.25.3",
-    "webpack-merge": "^5.9.0",
-    "webpack-remove-empty-scripts": "^1.0.3",
+    "terser-webpack-plugin": "^5.4.0",
+    "webpack": "^5.105.4",
+    "webpack-dev-middleware": "^6.1.3",
+    "webpack-hot-middleware": "^2.26.1",
+    "webpack-merge": "^5.10.0",
+    "webpack-remove-empty-scripts": "^1.1.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jsx-a11y": "^6.1.2",
     "eslint-plugin-node": "^11.1.0"
   }
-}
+}

package/utils/checkNodeVersion.js

@@ -16,7 +16,7 @@ async function getCurrentNodeVersion() {
 
 async function getProjectNodeVersion() {
   try {
-    const nvm = await fs.readFileSync(getProjectPath('.nvmrc'), 'utf8');
+    const nvm = await fs.promises.readFile(getProjectPath('.nvmrc'), 'utf8');
     return nvm.trim();
   } catch (err) {
     // No file, nevermind
@@ -29,7 +29,7 @@ function isValidNodeVersion(version, currentNodeVersion) {
   return semver.gte(cleanNvmString(version), currentNodeVersion, true);
 }
 
-async function checkNodeVerion() {
+async function checkNodeVersion() {
   const projectVersion = await getProjectNodeVersion();
   const currentVersion = await getCurrentNodeVersion();
 
@@ -40,4 +40,4 @@ async function checkNodeVerion() {
   }
 }
 
-module.exports = checkNodeVerion;
+module.exports = checkNodeVersion;

package/utils/ensureGitignore.js

@@ -0,0 +1,24 @@
+const fs = require('fs');
+const path = require('path');
+
+const getProjectPath = require('./getProjectPath');
+const logger = require('../logger');
+
+/**
+ * Ensures a given pattern exists in the project's .gitignore.
+ * Appends it if missing, does nothing if already present.
+ */
+module.exports = function ensureGitignore(pattern) {
+  const gitignorePath = getProjectPath('.gitignore');
+
+  if (!fs.existsSync(gitignorePath)) return;
+
+  const contents = fs.readFileSync(gitignorePath, 'utf8');
+  const lines = contents.split('\n').map((l) => l.trim());
+
+  if (lines.includes(pattern)) return;
+
+  const separator = contents.endsWith('\n') ? '' : '\n';
+  fs.writeFileSync(gitignorePath, `${contents}${separator}${pattern}\n`);
+  logger.info(`Added "${pattern}" to .gitignore`);
+};

package/utils/execSsh.js

@@ -1,8 +1,8 @@
-const ssh2 = require('ssh2');
+const { Client } = require('ssh2');
 
 async function execSsh(command, options) {
   return new Promise((resolve, reject) => {
-    const client = new ssh2.Client();
+    const client = new Client();
 
     client.connect({
       port: options.port || 22,

package/utils/git.js

@@ -11,53 +11,6 @@ async function commitAll(message = 'Commit all') {
   return commitFile('.', message);
 }
 
-async function checkoutBranch(name) {
-  await execAsync(`git checkout ${name}`, { cwd: CWD });
-}
-
-async function createBranch(name, commit) {
-  // Make sure the branch doesn't exist
-  await execAsync('git checkout master', { cwd: CWD });
-  const branchAlreadyExists = await branchExists(name);
-  if (branchAlreadyExists) {
-    await deleteBranch(name);
-  }
-  // NOTE: Commit is optional
-  await execAsync(`git checkout -b ${name} ${commit || ''}`, { cwd: CWD });
-}
-
-async function mergeBranch(to, from) {
-  await execAsync(`git checkout ${to}`, { cwd: CWD });
-  await execAsync(`git merge ${from}`, { cwd: CWD });
-}
-
-async function deleteBranch(name) {
-  try {
-    await execAsync(`git branch -d ${name}`, { cwd: CWD });
-  } catch (e) {
-    // Nevermind
-  }
-}
-
-async function resetBranchToCommit(name, commitHash) {
-  try {
-    await execAsync(`git checkout ${name}`, { cwd: CWD });
-    await execAsync(`git reset --hard ${commitHash}`, { cwd: CWD });
-  } catch (e) {
-    // Nevermind
-  }
-}
-
-async function deleteAllBranchButMaster() {
-  await execAsync('git branch | grep -v "master" | xargs git branch -D', {
-    cwd: CWD,
-  });
-}
-
-async function deleteAllTags() {
-  await execAsync('git tag | xargs git tag -d', { cwd: CWD });
-}
-
 async function discardUnstagedFiles() {
   await execAsync('git reset --hard', { cwd: CWD });
 }
@@ -66,7 +19,7 @@ async function createTag(name) {
   await execAsync(`git tag ${name}`, { cwd: CWD });
 }
 
-async function getCurrentBrachName() {
+async function getCurrentBranchName() {
   /* eslint-disable-next-line no-useless-escape */
   const branchName = await execAsync('git rev-parse --abbrev-ref HEAD', {
     cwd: CWD,
@@ -95,42 +48,20 @@ async function getChangedFiles(sha, sha2) {
   const fileList = await execAsync(`git diff --name-only ${sha} ${sha2}`, {
     cwd: CWD,
   });
-  return fileList
-    .trim()
-    .split(/\r?\n/)
-    .filter(Boolean);
+  return fileList.trim().split(/\r?\n/).filter(Boolean);
 }
 
-async function getMergeChangedFiles(ref) {
-  const fileList = await execAsync(
-    'git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD',
-    { cwd: CWD }
-  );
-  return fileList
-    .trim()
-    .split(/\r?\n/)
-    .filter(Boolean);
+async function getMergeChangedFiles() {
+  const fileList = await execAsync('git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD', {
+    cwd: CWD,
+  });
+  return fileList.trim().split(/\r?\n/).filter(Boolean);
 }
 
 async function getUnstagedFiles() {
   const fileList = await execAsync('git diff --name-only', { cwd: CWD });
-  const untrackedFileList = await execAsync(
-    'git ls-files -o --exclude-standard',
-    { cwd: CWD }
-  );
-  return fileList
-    .split(/\r?\n/)
-    .concat(untrackedFileList.split(/\r?\n/))
-    .filter(Boolean);
-}
-
-async function branchExists(name) {
-  try {
-    await execAsync(`git rev-parse --verify ${name}`, { cwd: CWD });
-    return true;
-  } catch (e) {
-    return false;
-  }
+  const untrackedFileList = await execAsync('git ls-files -o --exclude-standard', { cwd: CWD });
+  return fileList.split(/\r?\n/).concat(untrackedFileList.split(/\r?\n/)).filter(Boolean);
 }
 
 async function getRefCommitHash(ref) {
@@ -147,22 +78,14 @@ async function getRefCommitHash(ref) {
 module.exports = {
   commitFile,
   commitAll,
-  checkoutBranch,
-  createBranch,
-  mergeBranch,
-  deleteBranch,
-  resetBranchToCommit,
-  deleteAllBranchButMaster,
-  deleteAllTags,
   discardUnstagedFiles,
-  getCurrentBrachName,
+  getCurrentBranchName,
   getCommitParent,
   getCurrentCommitHash,
   getMasterCommitHash,
   getMergeChangedFiles,
   getChangedFiles,
   getUnstagedFiles,
-  branchExists,
   getRefCommitHash,
   createTag,
 };

package/utils/isReactProject.js

@@ -1,12 +1,15 @@
 const fs = require('fs');
 
 const getProjectPath = require('./getProjectPath');
+const bypassReact = process.env.BYPASS_REACT || false;
 
 // Cache the value
 let _isReactProject;
 
 // Check for react in the project deps, if it's there treat this project as headless
 function isReactProject() {
+  // Some non-headless projects want to use 'react' so let them. Pass BYPASS_REACT=true in package.json
+  if (bypassReact) return false;
   if (typeof _isReactProject === 'undefined') {
     const projectPckPath = getProjectPath('package.json');
     const pckFile = fs.readFileSync(projectPckPath);

package/utils/replaceSQL.js

@@ -7,9 +7,9 @@ const getSettings = require('../utils/projectSettings');
 
 // Taken from https://github.com/dword-design/mysqldump-search-replace-node
 function makeSerializeReplacement(match, length, value) {
-  var unescapedValue = value.replace(/(?<!\\)\\(?!\\)/g, '').replace(/\\\\/g, '\\');
-  var escapedLength = Buffer.byteLength(unescapedValue, 'utf-8');
-  return `s:${escapedLength}:\\"${value}\\";`
+  const unescapedValue = value.replace(/(?<!\\)\\(?!\\)/g, '').replace(/\\\\/g, '\\');
+  const escapedLength = Buffer.byteLength(unescapedValue, 'utf-8');
+  return `s:${escapedLength}:\\"${value}\\";`;
 }
 
 module.exports = async ({ environmentIn, environmentOut, file, override = true }) => {
@@ -21,15 +21,11 @@ module.exports = async ({ environmentIn, environmentOut, file, override = true }
 
   // Check we have both urls to replace
   if (!settings.url[environmentIn]) {
-    throw new Error(
-      `Couldn't find SQL url in settings for ${environmentIn} environment`
-    );
+    throw new Error(`Couldn't find SQL url in settings for ${environmentIn} environment`);
   }
 
   if (!settings.url[environmentOut]) {
-    throw new Error(
-      `Couldn't find SQL url in settings for ${environmentOut} environment`
-    );
+    throw new Error(`Couldn't find SQL url in settings for ${environmentOut} environment`);
   }
 
   // Handle any port number in localhost
@@ -39,7 +35,7 @@ module.exports = async ({ environmentIn, environmentOut, file, override = true }
       : settings.url[environmentIn].replace('8888', '[0-9]*');
 
   const urlRegexReplace = new RegExp(urlToReplace, 'g');
-  const serializeReplace = /s:([1-9]\d*):\\"(.*?)\\";/g
+  const serializeReplace = /s:([1-9]\d*):\\"(.*?)\\";/g;
 
   if (!override) {
     const tempFilePath = tempy.file({ extension: 'sql' });

package/utils/runProjectBuildTask.js

@@ -4,16 +4,20 @@ const ora = require('ora');
 
 const getProjectPath = require('./getProjectPath');
 
-module.exports = async environment => {
+const DEPLOY_BUILD_DIR = 'dist-deploy';
+
+module.exports = async (environment) => {
   logger.log(`Building project for ${environment}`);
   const spinner = ora();
   spinner.prefixText = logger.prefix;
 
   spinner.start();
-  await execAsync(`BUILD_ENV=${environment} npm run build`, {
+  await execAsync(`BUILD_ENV=${environment} DEPLOY_OUT_DIR=${DEPLOY_BUILD_DIR} npm run build`, {
     cwd: getProjectPath(),
   });
   spinner.stop();
 
   logger.success(`Successfully built for ${environment}`);
+
+  return DEPLOY_BUILD_DIR;
 };

package/utils/startMAMP.js

@@ -4,16 +4,16 @@ const fs = require('fs');
 const logger = require('../logger');
 const { isWindows } = require('./checkPlatform');
 
-const mamp6Path = '/Applications/MAMP/bin';
-const mamp7Path = '/Applications/MAMP/Library/bin'; //MAMP7 moved mysql path
-
-const mampPath = fs.existsSync(mamp7Path) ? mamp7Path : mamp6Path;
+const MAMP_START_SCRIPT = '/Applications/MAMP/bin/start.sh';
 
 function startMAMP() {
   if (isWindows) {
     return;
   }
-  cp.execFile(`${mampPath}/start.sh`);
+  if (!fs.existsSync(MAMP_START_SCRIPT)) {
+    return;
+  }
+  cp.execFile('/bin/sh', [MAMP_START_SCRIPT]);
   logger.info('MAMP Started');
 }
 

package/utils/tunnelSsh.js

@@ -1,11 +1,11 @@
 const net = require('net');
-const Connection = require('ssh2');
+const { Client: Connection } = require('ssh2');
 const events = require('events');
 
 const noop = () => {};
 
 function createConfig(config) {
-  var env = process.env;
+  const env = process.env;
 
   config = {
     username: env.TUNNELSSH_USER || env.USER || env.USERNAME || 'root',
@@ -33,17 +33,17 @@ function createConfig(config) {
 }
 
 function bindSSHConnection(config, netConnection) {
-  var sshConnection = new Connection();
+  const sshConnection = new Connection();
   netConnection.on('close', sshConnection.end.bind(sshConnection));
 
-  sshConnection.on('ready', function() {
+  sshConnection.on('ready', function () {
     netConnection.emit('sshConnection', sshConnection, netConnection);
     sshConnection.forwardOut(
       config.srcHost,
       config.srcPort,
       config.dstHost,
       config.dstPort,
-      function(err, sshStream) {
+      function (err, sshStream) {
         if (err) {
           // Bubble up the error => netConnection => server
           netConnection.emit('error', err);
@@ -59,19 +59,19 @@ function bindSSHConnection(config, netConnection) {
 }
 
 function createServer(config) {
-  var server;
-  var connections = [];
-  var connectionCount = 0;
+  let server;
+  const connections = [];
+  let connectionCount = 0;
 
-  server = net.createServer(function(netConnection) {
-    var sshConnection;
+  server = net.createServer(function (netConnection) {
+    let sshConnection;
     connectionCount++;
     netConnection.on('error', server.emit.bind(server, 'error'));
-    netConnection.on('close', function() {
+    netConnection.on('close', function () {
       connectionCount--;
       if (connectionCount === 0) {
         if (!config.keepAlive) {
-          setTimeout(function() {
+          setTimeout(function () {
             if (connectionCount === 0) {
               server.close();
             }
@@ -84,8 +84,8 @@ function createServer(config) {
     sshConnection = bindSSHConnection(config, netConnection);
     sshConnection.on('error', server.emit.bind(server, 'error'));
 
-    netConnection.on('sshStream', function(sshStream) {
-      sshStream.on('error', function() {
+    netConnection.on('sshStream', function (sshStream) {
+      sshStream.on('error', function () {
         server.close();
       });
     });
@@ -98,8 +98,8 @@ function createServer(config) {
     }
   });
 
-  server.on('close', function() {
-    connections.forEach(function(connection) {
+  server.on('close', function () {
+    connections.forEach(function (connection) {
       connection.end();
     });
   });
@@ -108,8 +108,8 @@ function createServer(config) {
 }
 
 function tunnel(configArgs, callback) {
-  var server;
-  var config;
+  let server;
+  let config;
 
   if (!callback) {
     callback = noop;
@@ -118,12 +118,12 @@ function tunnel(configArgs, callback) {
     config = createConfig(configArgs);
     server = createServer(config);
 
-    server.listen(config.localPort, config.localHost, function(error) {
+    server.listen(config.localPort, config.localHost, function (error) {
       callback(error, server);
     });
   } catch (e) {
     server = new events.EventEmitter();
-    setImmediate(function() {
+    setImmediate(function () {
       callback(e);
       server.emit('error', e);
     });