wp-blank-scripts 3.1.16 → 3.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wp-blank-scripts",
-  "version": "3.1.16",
+  "version": "3.1.18",
   "description": "Personal Wordpress Scripts",
   "main": "index.js",
   "bin": {
@@ -69,9 +69,8 @@
     "replace-in-file": "^7.0.1",
     "rimraf": "^5.0.5",
     "rsync": "^0.6.1",
-    "sass": "^1.63.4",
-    "sass-loader": "^13.3.2",
-    "sass-resources-loader": "^2.2.5",
+    "sass": "^1.97.3",
+    "sass-loader": "16.0.7",
     "semver": "^7.5.2",
     "slugify": "^1.6.6",
     "ssh2": "0.8.9",

package/utils/startMAMP.js

@@ -1,13 +1,19 @@
 const cp = require('child_process');
+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;
+
 function startMAMP() {
   if (isWindows) {
     return;
   }
-  cp.execFile('/Applications/MAMP/bin/start.sh');
+  cp.execFile(`${mampPath}/start.sh`);
   logger.info('MAMP Started');
 }
 

package/webpack.base.config.js

@@ -236,6 +236,7 @@ function makeBaseConfig(options) {
               options: {
                 sourceMap: !isProd,
                 additionalData: sassVariables,
+                api: 'modern',
               },
             },
           ],

package/webpack.react.config.js

@@ -19,6 +19,9 @@ function makeReactWebpackConfig(options) {
   const sourcePath = path.join(process.cwd(), sourceDir);
   const entryPath = [path.join(sourcePath, 'index.js')];
   const globalVariablesPath = path.join(sourcePath, 'variables.scss');
+  const globalVariables = fs.existsSync(globalVariablesPath)
+    ? fs.readFileSync(globalVariablesPath, 'utf8') + '\n'
+    : '';
 
   const settings = getSettings();
   const themeDir = path.join('wp-content', 'themes', settings.project);
@@ -133,12 +136,8 @@ function makeReactWebpackConfig(options) {
               loader: 'sass-loader',
               options: {
                 sourceMap: !isProd,
-              },
-            },
-            {
-              loader: 'sass-resources-loader',
-              options: {
-                resources: globalVariablesPath,
+                api: 'modern',
+                additionalData: globalVariables || undefined,
               },
             },
           ],