chore: merge origin and fix conflicts

.circleci/config.yml

@@ -4,6 +4,42 @@ orbs:
   node: circleci/[email protected]
 
 jobs:
+  install_tests:
+    docker:
+      - image: cimg/node:17.2.0
+    steps:
+      - checkout
+      - restore_cache:
+          name: Restoring Modules Cache
+          keys:
+            - v1-modules-cache-{{ checksum "package-lock.json" }}
+      - node/install-packages:
+          pkg-manager: npm
+      - run:
+          command: |
+            cd ./example-site/
+            node ./../src/cli.js install
+          name: Run test - install projects
+      - run:
+          command: |
+            cd ./example-site/
+            node ./../src/cli.js install -- --package-lock-only
+          name: Run test - install projects with npm args
+      - run:
+          command: |
+            cd ./example-site/
+            node ./../src/cli.js ci
+          name: Run test - ci install projects
+      - save_cache:
+          name: Saving Modules Cache
+          key: v1-modules-cache-{{ checksum "package-lock.json" }}
+          paths:
+            - ./node_modules
+            - /home/circleci/.cache
+      - persist_to_workspace:
+          root: ~/project
+          paths:
+            - .
   notify_slack:
     docker:
       - image: cimg/node:17.2.0
@@ -64,6 +100,11 @@ jobs:
             cd ./example-site/
             node ./../src/cli.js ci
           name: Run test - ci install projects
+      - run:
+          command: |
+            cd ./example-site/
+            node ./../src/cli.js ci
+          name: Run test - ci install projects
       - run:
           command: |
             cd ./example-site/
@@ -84,7 +125,10 @@ jobs:
           paths:
             - .
 workflows:
-  test_build_tools:
+  test_install:
+    jobs:
+      - install_tests
+  test_build:
     jobs:
       - install_tests
       - self_test

example-site/client-mu-plugins/test-client-plugin/package.json

@@ -1,3 +1,3 @@
 {
     "name": "test-client-plugin"
-}
+}

example-site/plugins/test-plugin/package.json

@@ -1,3 +1,3 @@
 {
     "name": "test-plugin"
-}
+}

example-site/plugins/test-plugin/src/entrypoints/frontend.js

@@ -0,0 +1 @@
+console.log('test frontend');

example-site/themes/test-theme/package.json

@@ -1,3 +1,3 @@
 {
     "name": "test-theme"
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigbite/build-tools",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Provides configuration for the Big Bite Build Tools.",
   "author": "Paul Taylor <[email protected]> (https://github.com/ampersarnie)",
   "keywords": [

src/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 const yargs = require('yargs');
+const globalVars = require('./globals');
 
 yargs.scriptName('build-tools');
 yargs.usage('Usage: build-tools <command>');

src/commands/build.js

@@ -59,7 +59,6 @@ exports.handler = async ({
   const mode = production ? 'production' : 'development';
   // Use env variables if working on Webpack >=5.
   const projectsList = projects.split(',').filter((item) => item.length > 0);
-  const targetDirs = ['client-mu-plugins', 'plugins', 'themes'];
   const hasTargetDirs = dirsExist(targetDirs);
   const isAllProjects = (site || hasTargetDirs) && !projects;
 
@@ -95,10 +94,8 @@ exports.handler = async ({
   }
 
   terminal('Processing the following projects:\n');
-  packages.forEach((item) => {
-    const regexDirs = targetDirs.join('|');
-    const packagePath = item.packagePath.match(`((${regexDirs})\/)?([^\/]+)\/package.json$`);
-    terminal.defaultColor(` * %s `, item.packageName).dim(`[%s]\n`, packagePath[0]);
+  packages.forEach((package) => {
+    terminal.defaultColor(` * %s `, package.name).dim(`[%s]\n`, package.relativePath);
   });
   terminal('\n');
 
@@ -111,8 +108,8 @@ exports.handler = async ({
      * to build them, use what is here.
      */
     const PROJECT_CONFIG = {
-      name: packageObject.packageName,
-      version: packageObject.package.version,
+      name: packageObject.name,
+      version: packageObject.json.version,
       paths: {
         project: path.resolve(packageObject.path),
         config: path.resolve(`${__dirname}/configs`),
@@ -131,18 +128,18 @@ exports.handler = async ({
     };
 
     let customWebpackConfig = {
-      extends: true
+      extends: true,
     };
     let config = webpackConfig(PROJECT_CONFIG, mode);
 
     try {
       customWebpackConfig = {
         ...customWebpackConfig,
-        ...require(PROJECT_CONFIG.paths.project + '/webpack.config.js')
-      }
-    } catch(e) {}
+        ...require(PROJECT_CONFIG.paths.project + '/webpack.config.js'),
+      };
+    } catch (e) {}
 
-    if(!customWebpackConfig?.extends) {
+    if (!customWebpackConfig?.extends) {
       config = customWebpackConfig;
     } else if (customWebpackConfig) {
       config = {

src/commands/ci.js

@@ -0,0 +1,9 @@
+const installer = require('./installer/installer');
+
+exports.command = 'ci';
+exports.desc = 'Run an npm ci install process.';
+exports.builder = (yargs) => {};
+
+exports.handler = async ({}) => {
+  installer(exports.command);
+};

src/commands/install.js

@@ -0,0 +1,9 @@
+const installer = require('./installer/installer');
+
+exports.command = 'install';
+exports.desc = 'Run an npm install process.';
+exports.builder = (yargs) => {};
+
+exports.handler = async ({}) => {
+  installer(exports.command);
+};

src/commands/installer/installer.js

@@ -0,0 +1,48 @@
+const { terminal } = require('terminal-kit');
+const { execSync } = require('child_process');
+const yargs = require('yargs');
+const args = yargs.argv._;
+
+const { findAllProjectPaths } = require('./../../utils/projectpaths');
+const { getPackage } = require('./../../utils/get-package');
+const dirsExist = require('./../../utils/dirs-exist');
+
+module.exports = (commandType) => {
+  if (!['ci', 'install'].includes(commandType)) {
+    throw new Error('Not a valid comment type.');
+  }
+
+  const hasTargetDirs = dirsExist(targetDirs);
+
+  if (!hasTargetDirs) {
+    throw new Error('Recursive install only works from the site root directory.');
+  }
+
+  let paths = findAllProjectPaths(targetDirs);
+
+  let packages = [];
+
+  try {
+    packages = paths.map((item) => getPackage(item, false)).filter((item) => item);
+  } catch (e) {
+    terminal.red(e);
+    process.exit(1);
+  }
+
+  terminal('Installing packages for the following projects:\n');
+  packages.forEach((package) => {
+    terminal.defaultColor(` * %s `, package.name).dim(`[%s]\n`, package.relativePath);
+  });
+  terminal('\n');
+
+  const gluedArgs = args.join(' ');
+
+  packages.forEach((package) => {
+    terminal
+      .defaultColor(`Installing packages for `)
+      .bold(`%s`, package.name)
+      .dim(` [%s]\n`, package.relativePath);
+    execSync(`npm ${gluedArgs}`, { cwd: package.path, stdio: 'inherit' });
+    terminal.defaultColor('\n\n----------------------\n\n');
+  });
+};

src/globals.js

@@ -0,0 +1,2 @@
+global.targetDirs = ['client-mu-plugins', 'plugins', 'themes'];
+global.packageList = {};