wp-blank-scripts 4.0.0-dev-8 → 4.0.0-dev-10

package/README.md

@@ -34,7 +34,7 @@ sass-migrator division **/*.scss
 │   │   ├── admin
 │   │   ├── css
 │   │   ├── fonts
-│   │   ├── img
+│   │   ├── images
 │   │   └── js
 │   ├── functions.php
 │   ├── inc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wp-blank-scripts",
-  "version": "4.0.0-dev-8",
+  "version": "4.0.0-dev-10",
   "description": "Personal Wordpress Scripts",
   "main": "index.js",
   "bin": {

package/utils/getSqlPath.js

@@ -1,3 +1,9 @@
+const fs = require('fs');
 const { isWindows } = require('./checkPlatform');
 
-module.exports.sqlPath = isWindows ? 'C:/MAMP/bin/mysql/bin' : '/Applications/MAMP/library/bin';
+const mamp6SqlPath = '/Applications/MAMP/Library/bin/mysql';
+const sqlPath = '/Applications/MAMP/Library/bin/mysql80/bin'; //MAMP7 moved mysql path
+
+const mysqlPath = fs.existsSync(mamp6SqlPath) ? mamp6SqlPath : sqlPath;
+
+module.exports.sqlPath = isWindows ? 'C:/MAMP/bin/mysql/bin' : mysqlPath;

package/webpack.base.config.js

@@ -47,18 +47,18 @@ function makeBaseConfig(options) {
     },
     { from: path.join(sourceDir, 'style.css'), to: themePath },
     {
-      from: path.join(sourceDir, 'assets', 'img'),
-      to: path.join(themePath, 'assets', 'img'),
+      from: path.join(sourceDir, 'assets', 'images'),
+      to: path.join(themePath, 'assets', 'images'),
       globOptions: { ignore: ['.DS_Store'] },
     },
     ...(fs.existsSync(fontsDir)
       ? [
-          {
-            from: fontsDir,
-            to: path.join(themePath, 'assets', 'fonts'),
-            globOptions: { ignore: ['.DS_Store'] },
-          },
-        ]
+        {
+          from: fontsDir,
+          to: path.join(themePath, 'assets', 'fonts'),
+          globOptions: { ignore: ['.DS_Store'] },
+        },
+      ]
       : []),
     {
       from: path.join(sourceDir, 'templates'),

package/webpack.react.config.js

@@ -147,7 +147,7 @@ function makeReactWebpackConfig(options) {
           test: /\.(gif|png|svg|jpe?g)$/i,
           type: 'asset/resource',
           generator: {
-            filename: `${path.join(themeDir, 'assets', 'img')}/[contenthash][ext][query]`,
+            filename: `${path.join(themeDir, 'assets', 'images')}/[contenthash][ext][query]`,
           },
         },
         {