wp-blank-scripts 3.0.0-beta.0 → 3.1.0-beta.2

package/README.md

@@ -290,21 +290,13 @@ exports.copyFiles = (paths) => {
     },
     {
       // Copy files inside a directory the the theme
-      from: path.join(sourceDir, 'new-directory', '**', '*'),
+      from: path.join(sourceDir, 'new-directory'),
       to: themePath,
-      transformPath(targetPath) {
-        // Need to fix the path
-        return targetPath.replace(path.join(sourceDir, 'new-directory'), '');
-      },
     },
     {
       // Copy file from a directory to the root directory
       from: path.join(sourceDir, 'directory-file-was-in', 'file.txt'),
       to: '',
-      transformPath(targetPath) {
-        // Need to fix the path again, otherwise it will stay in the directory
-        return targetPath.replace('directory-file-was-in', '');
-      },
     },
     {
       // Copy all files from vendor (except vivo-digital & johnpbloch) to the theme/inc/vendor

package/config/lint-staged.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-  '*.{js,jsx,scss,css,php}': ['prettier --write', 'git add'],
+  '*.{js,jsx,scss,css,php}': ['prettier --write'],
 };

package/lib/buildProject.js

@@ -88,12 +88,22 @@ module.exports = async (envConfig = {}, buildOptions, failOnError = false) => {
     const settings = getSettings();
     const url = settings.url[options.environment];
 
-    const compiler = webpack(config, (err, stats) => {
-      if (err || stats.hasErrors()) {
+    const compiler = webpack(config, (err) => {
+      if (err) {
         logger.error(err.stack || err);
+
+        if (err.details) {
+          logger.error(err.details);
+        }
+
+        if (failOnError) {
+          exitWithError();
+        }
+
         return;
       }
     });
+
     const devMiddleware = webpackDevMiddleware(compiler, {
       publicPath: config.output.publicPath,
       stats: {
@@ -103,6 +113,7 @@ module.exports = async (envConfig = {}, buildOptions, failOnError = false) => {
       },
       writeToDisk: true,
     });
+
     const hotMiddleware = webpackHotMiddleware(compiler);
 
     browserSync({
@@ -149,11 +160,11 @@ module.exports = async (envConfig = {}, buildOptions, failOnError = false) => {
     const info = stats.toJson();
 
     if (stats.hasWarnings()) {
-      info.warnings.forEach(warning => logger.warn(warning));
+      info.warnings.forEach((warning) => logger.warn(warning));
     }
 
     if (stats.hasErrors()) {
-      info.errors.forEach(error => {
+      info.errors.forEach((error) => {
         logger.error(chalk.red(error));
       });
 

package/overridable/checkProjectDependencies.js

@@ -3,16 +3,17 @@ const chalk = require('chalk');
 
 const logger = require('../logger');
 const getProjectPath = require('../utils/getProjectPath');
+const execAsync = require('../utils/execAsync');
 
 const BABEL = ['@babel/polyfill', '@babel/runtime', 'babel-polyfill', 'babel-runtime'];
 
-function checkProjectDependencies() {
+async function checkProjectDependencies() {
   const projectPackage = getProjectPath('package.json');
   const pck = JSON.parse(fs.readFileSync(projectPackage, 'utf8'));
   const { dependencies, devDependencies } = pck;
 
   // Babel polyfill/runtime check
-  if (BABEL.some(name => dependencies[name])) {
+  if (BABEL.some((name) => dependencies[name])) {
     logger.warn(
       `${chalk.bold('babel polyfill or runtimeyfi')} is no longer required with >=0.4.0.
        Please remove it from your project devDependencies: ${chalk.yellow(
@@ -45,6 +46,29 @@ function checkProjectDependencies() {
     // Warn if fx-classes < v2 is being used
     logger.warn('You are using an old version of fx-classes, please upgrade to at least v2.');
   }
+
+  // Husky pre-commit hooks activation and migration from v4 to v8
+  const huskyDirectory = getProjectPath('.husky');
+  const oldHuskyConfig = getProjectPath('.huskyrc.js');
+
+  // Delete old config if it exists
+  if (fs.existsSync(oldHuskyConfig)) {
+    try {
+      fs.unlinkSync(oldHuskyConfig);
+      logger.info('Old Husky config deleted');
+    } catch (err) {
+      console.warn('Error while deleting old Husky config:', err);
+    }
+  }
+
+  if (!fs.existsSync(huskyDirectory)) {
+    // Husky now requires a "one-time" explicit git hook activation
+    await execAsync('yarn husky install');
+    logger.info('Upgrading Husky git hooks config');
+    execAsync(`npx husky add .husky/pre-commit 'lint-staged'`);
+    execAsync(`npx husky add .husky/post-merge 'wp-scripts hooks --type="post-merge"'`);
+    logger.success('Husky upgrade successful!');
+  }
 }
 
 module.exports = checkProjectDependencies;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wp-blank-scripts",
-  "version": "3.0.0-beta.0",
+  "version": "3.1.0-beta.2",
   "description": "Personal Wordpress Scripts",
   "main": "index.js",
   "bin": {

package/utils/checkNodeVersion.js

@@ -34,7 +34,9 @@ async function checkNodeVerion() {
   const currentVersion = await getCurrentNodeVersion();
 
   if (projectVersion && !isValidNodeVersion(projectVersion, currentVersion)) {
-    logger.warn(`Your node version (v${currentVersion}) is not valid. This project require node ${projectVersion}.`);
+    logger.warn(
+      `Your node version (v${currentVersion}) is not valid. This project requires node ${projectVersion}.`
+    );
   }
 }
 

package/webpack.base.config.js

@@ -197,11 +197,11 @@ function makeBaseConfig(options) {
               loader: 'postcss-loader',
               options: {
                 postcssOptions: {
-                  postcssOptions: {
-                    plugins: [
-                      postcssPresetEnv({ browsers: 'last 2 versions' }),
-                      ...(isProd ? [postcssPresetEnv(), cssnano()] : []),
-                    ],
+                  plugins() {
+                    if (isProd) {
+                      return [postcssPresetEnv(), cssnano()];
+                    }
+                    return [postcssPresetEnv({ browsers: 'last 2 versions' })];
                   },
                 },
                 sourceMap: !isProd,
@@ -211,7 +211,7 @@ function makeBaseConfig(options) {
               loader: 'sass-loader',
               options: {
                 sourceMap: !isProd,
-                prependData: sassVariables,
+                additionalData: sassVariables,
               },
             },
           ],

package/config/.huskyrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  hooks: {
-    'pre-commit': 'lint-staged',
-    'post-merge': 'wp-scripts hooks --type="post-merge"',
-  },
-};