wp-blank-scripts 3.1.7 → 3.1.9

package/cli/pull.js

@@ -1,5 +1,6 @@
 const chalk = require('chalk');
 const path = require('path');
+const ora = require('ora');
 
 const pullSQL = require('../lib/pullSQL');
 const getSettings = require('../utils/projectSettings');
@@ -8,14 +9,16 @@ const exitWithError = require('../utils/exitWithError');
 const logger = require('../logger');
 const { DEPLOY_OPTIONS } = require('../constants');
 
-function handleError(err) {
+function handleError(err, spinner) {
   // Show error
+  spinner.stop();
   logger.error('Dang! Something went wrong');
   exitWithError(err);
 }
 
-function handleFinish(sqlFilePath) {
+function handleFinish(sqlFilePath, spinner) {
   const fileName = path.basename(sqlFilePath);
+  spinner.stop();
   logger.success(`Exported ${chalk.yellow(fileName)} successfully!`);
 }
 
@@ -32,7 +35,7 @@ module.exports = async () => {
       },
       {
         name: 'serverPassword',
-        message: answers => {
+        message: (answers) => {
           const user = settings.server[answers.environment].user;
           const host = settings.server[answers.environment].host;
           return chalk.cyan(
@@ -43,25 +46,22 @@ module.exports = async () => {
       },
       {
         name: 'serverPrivateKey',
-        message: answers => {
+        message: (answers) => {
           const user = settings.server[answers.environment].user;
           const host = settings.server[answers.environment].host;
-          return chalk.cyan(
-            `Enter the path to your private key for user ${user} on host ${host}`
-          );
+          return chalk.cyan(`Enter the path to your private key for user ${user} on host ${host}`);
         },
         default: '~/.ssh/id_rsa',
         type: 'input',
-        when: answers => !answers.serverPassword,
+        when: (answers) => !answers.serverPassword,
       },
     ]);
 
-    logger.log('Starting pull...');
+    const spinner = ora('Starting pull...').start();
 
     const sqlFilePath = await pullSQL(options);
 
-    handleFinish(sqlFilePath);
-
+    handleFinish(sqlFilePath, spinner);
   } catch (err) {
     handleError(err);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wp-blank-scripts",
-  "version": "3.1.7",
+  "version": "3.1.9",
   "description": "Personal Wordpress Scripts",
   "main": "index.js",
   "bin": {
@@ -50,7 +50,6 @@
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.32.2",
-    "file-loader": "^6.2.0",
     "get-port": "5.1.1",
     "glob": "^10.2.7",
     "html-webpack-plugin": "^5.5.3",

package/webpack.base.config.js

@@ -238,15 +238,11 @@ function makeBaseConfig(options) {
           ...loaderOverrides.css,
         },
         {
-          test: /\.(eot|ttf|woff|woff2)$/,
-          include: [sourcePath],
-          use: [
-            {
-              loader: 'file-loader',
-              options: { name: 'fonts/[name].[ext]' },
-            },
-          ],
-          ...loaderOverrides.fonts,
+          test: /\.(woff|woff2|eot|ttf|otf)$/i,
+          type: 'asset/resource',
+          generator: {
+            filename: `${path.join(themeDir, 'assets', 'fonts')}/[name].[ext]`,
+          },
         },
         {
           test: /\.(jpe?g|png|gif|svg)$/i,

package/webpack.react.config.js

@@ -144,17 +144,11 @@ function makeReactWebpackConfig(options) {
           ],
         },
         {
-          test: /.*\.(gif|png|svg|jpe?g)$/i,
-          include: [sourcePath],
-          use: [
-            {
-              loader: 'file-loader',
-              options: {
-                name: '[contenthash].[ext]',
-                outputPath: path.join(themeDir, 'assets', 'img'),
-              },
-            },
-          ],
+          test: /\.(gif|png|svg|jpe?g)$/i,
+          type: 'asset/resource',
+          generator: {
+            filename: `${path.join(themeDir, 'assets', 'img')}/[contenthash][ext][query]`,
+          },
         },
         {
           test: /\.(woff|woff2|eot|ttf|otf)$/i,