@caweb/cli 1.5.0 → 1.5.1

package/lib/cli.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-
+//const wpenv_cli = require('@wordpress/env/lib/cli');
 import path from 'path';
 import fs from 'fs';
 import { Command, Argument, Option  } from 'commander';
@@ -39,13 +39,17 @@ const envArg = new Argument('[environment]', 'Which environment to use.')
 	])
 	.default('development');
 
+	
+/**
+ * Adds commands for webpack
+ */
 function addWebpackCmds(){
   
 	// Build Command.
 	program.command('build')
-  .description('Builds the current project.')
-  .allowUnknownOption(true)
-  .action(env.webpack)
+	.description('Builds the current project.')
+	.allowUnknownOption(true)
+	.action(env.webpack)
       
     
   // Serve Command.
@@ -127,6 +131,7 @@ function addWPEnvCommands(){
 
 	// Start command.
 	program.command('start')
+		.alias('launch')
 		.description(
 			`Starts two CAWebPublishing WordPress instances\ndevelopment on port http://localhost:8888 (override with WP_ENV_PORT)\ntests on port http://localhost:8889 (override with WP_ENV_TESTS_PORT).`
 		)
@@ -174,6 +179,7 @@ function addWPEnvCommands(){
 
 	// Destroy Command.
 	program.command('destroy')
+		.alias('shutdown')
 		.description(
 			'Deletes docker containers, volumes, and networks associated with the CAWebPublishing instances and removes local files.'
 		)
@@ -255,7 +261,6 @@ function addWPEnvCommands(){
 
 export default function cli() {
 
-
 	program
 		.name('caweb')
 		.usage( '<command>' )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/cli",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "CAWebPublishing Command Line Interface.",
   "exports": "./lib/env.js",
   "type": "module",
@@ -56,9 +56,9 @@
     }
   },
   "dependencies": {
-    "@caweb/webpack": "^1.0.0",
-    "@wordpress/create-block": "^4.45.0",
-    "@wordpress/env": "^10.2.0",
+    "@caweb/webpack": "^1.0.1",
+    "@wordpress/create-block": "^4.46.0",
+    "@wordpress/env": "^10.3.0",
     "axios": "^1.7.2",
     "axios-retry": "^4.4.1",
     "chalk": "^5.3.0",

package/configs/webpack.config.js

@@ -1,192 +0,0 @@
-/**
- * WebPack Configuration for California Department of Technology
- * 
- * Utilizes WordPress Scripts Webpack configuration as base.
- * s 
- * @link https://webpack.js.org/configuration/
- */
-
-/**
- * External dependencies
- */
-import baseConfig from '@wordpress/scripts/config/webpack.config.js';
-import path from 'path';
-import fs from 'fs';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-import {HtmlWebpackSkipAssetsPlugin} from 'html-webpack-skip-assets-plugin';
-
-import CSSAuditPlugin from '../lib/webpack/plugins/css-audit/index.js';
-import A11yPlugin from '../lib/webpack/plugins/a11y/index.js';
-import JSHintPlugin from '../lib/webpack/plugins/jshint/index.js';
-
-/**
- * Internal dependencies
- */
-import {
-  projectPath,
-  appPath
-} from '../lib/index.js';
-
-
-const samplePath = path.join( appPath, 'sample');
-const srcPath = path.join( appPath, 'src');
-const dataPath = path.join( srcPath, 'data');
-
-
-// Update some of the default WordPress webpack rules.
-baseConfig.module.rules.forEach((rule, i) => {
-  const r = new RegExp(rule.test).toString();
-
-  switch(r){
-    // WordPress adds a hash to asset file names we remove that hash.
-    case new RegExp(/\.(bmp|png|jpe?g|gif|webp)$/i).toString():
-      rule.generator.filename = 'images/[name][ext]';
-      break;
-    case new RegExp(/\.(woff|woff2|eot|ttf|otf)$/i).toString():
-      rule.generator.filename = 'fonts/[name][ext]';
-      break;
-    case new RegExp(/\.svg$/).toString():
-      // we don't want SVG to be asset/inline otherwise the resource may not be available.
-      // the asset should be an asset/resource we move them to the fonts folder. 
-      if( 'asset/inline' === rule.type ){
-        rule.type = 'asset/resource';
-        rule.generator = { filename: 'fonts/[name][ext]' };
-
-        delete rule.issuer;
-      }
-      break;
-  }
-});
-
-// Our Webpack Configuration.
-let webpackConfig = {
-  ...baseConfig,
-  target: 'web',
-  cache: false,
-  output: {
-    ...baseConfig.output,
-    publicPath: `/public`,
-    clean: true
-  },
-  performance: {
-    maxAssetSize: 500000,
-    maxEntrypointSize: 500000
-  }
-};
-
-// Delete the default WP Dev Server
-delete webpackConfig.devServer;
-
-// Only add the Dev Server if the serve command is ran.
-if( 'serve' === process.argv[2] ){
-
-  // Add html rule
-  webpackConfig.module.rules = [
-    ...baseConfig.module.rules,
-    {
-      test: /\.html$/,
-      loader:'handlebars-loader'
-    }
-  ]
-
-  // we only want to display errors and warnings
-  webpackConfig.stats = 'errors-warnings';
-
-  let pageTemplate = {
-    title: path.basename(appPath),
-    minify: false,
-    meta: {
-      "Author": "CAWebPublishing",
-      "Description": "State of California",
-      "Keywords": "California,government",
-      "viewport": "width=device-width, initial-scale=1.0, minimum-scale=1.0"
-    },
-    templateParameters: {
-      "title" : path.basename(appPath)
-    },
-    skipAssets: [
-      '**/index-rtl.css', // we skip the Right-to-Left Styles
-      '**/css-audit.*', // we skip the CSSAudit Files
-      '**/a11y.*', // we skip the A11y Files
-      '**/jshint.*', // we skip the JSHint Files
-    ]
-  }
-
-  // if an favicon exists.
-  if( fs.existsSync(path.join(srcPath, 'favicon.ico')) ){
-    pageTemplate.favicon = path.join(srcPath, 'favicon.ico');
-  }
-
-  // Sample Page.
-  let sample = {
-    ...pageTemplate,
-    filename: path.join( appPath, 'public', 'index.html'),
-    template: path.join(samplePath, 'index.html')
-  }
-
-  webpackConfig.plugins.push(
-    new HtmlWebpackPlugin(sample),
-    new HtmlWebpackSkipAssetsPlugin(),
-    new JSHintPlugin(),
-    new A11yPlugin(),
-    new CSSAuditPlugin({
-      format: 'html',
-      colors: ! process.argv.includes('--no-colors'),
-      important: ! process.argv.includes('--no-important'),
-      displayNone: ! process.argv.includes('--no-display-none'),
-      selectors: ! process.argv.includes('--no-selectors'),
-      mediaQueries: ! process.argv.includes('--no-media-queries'),
-      typography: ! process.argv.includes('--no-typography'),
-      propertyValues: process.argv.includes('--no-property-values') ? false : [
-          'font-size',
-          'padding,padding-top,padding-bottom,padding-right,padding-left' ,
-          'property-values', 'margin,margin-top,marin-bottom,marin-right,marin-left',
-      ]
-    })
-  );
-
-  webpackConfig.devServer = {
-    devMiddleware: {
-      writeToDisk: true
-    },
-    headers: {
-    },
-    hot: true,
-    open: ['http://localhost:9000'],
-    //client: 'verbose',
-    allowedHosts: 'auto',
-    host: 'localhost',
-    port: 9000,
-    compress: true,
-    static: [
-      {
-        directory: path.join( appPath, 'build'),
-      },
-      {
-        directory: path.join(appPath, 'public')
-      },
-      {
-        directory: path.join(appPath, 'node_modules'),
-      },
-      {
-        directory: path.join(appPath, 'src'),
-      },
-    ],
-    proxy: [
-      {
-        context: ['/node_modules'],
-        target: 'http://localhost:9000',
-        pathRewrite: { '^/node_modules': '' },
-      },
-      {
-        context: ['/src'],
-        target: 'http://localhost:9000',
-        pathRewrite: { '^/src': '' },
-      }
-    ],
-  }
-
-
-}
-
-export default webpackConfig;