@abcnews/aunty 13.1.0 → 13.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abcnews/aunty",
-  "version": "13.1.0",
+  "version": "13.1.2",
   "description": "A toolkit for working with ABC News projects",
   "repository": "abcnews/aunty",
   "license": "MIT",
@@ -51,12 +51,10 @@
     "deepmerge": "^4.0.0",
     "del": "^6.0.0",
     "execa": "^5.0.0",
-    "file-loader": "^6.2.0",
     "fork-ts-checker-webpack-plugin": "^6.2.1",
     "ftp-deploy": "^2.3.8",
     "get-all-paths": "^1.0.1",
     "guess-root-path": "^1.0.0",
-    "html-loader": "^2.1.2",
     "i": "^0.3.6",
     "import-lazy": "^4.0.0",
     "import-local": "^3.0.2",
@@ -85,7 +83,6 @@
     "tcp-ping-sync": "^1.0.0",
     "typescript": "^4.0.2",
     "update-notifier": "^6.0.2",
-    "url-loader": "^4.1.1",
     "webpack": "^5.33.2",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-dev-server": "^4.6.0",

package/src/cli/deploy/index.js

@@ -19,8 +19,7 @@ const { dry, info, spin, warn, log, error } = require('../../utils/logging');
 const { ftp, rsync } = require('../../utils/remote');
 const { combine } = require('../../utils/structures');
 const { DEFAULTS, MESSAGES, VALID_TYPES } = require('./constants');
-const { dim, opt } = require('../../utils/color');
-const { check } = require('prettier');
+const { dim, opt, hvy, req } = require('../../utils/color');
 
 module.exports = command(
   {
@@ -103,7 +102,8 @@ module.exports = command(
             error('An FTP error ocurred');
           }
         } else {
-          warn('Destination directory exists? OK to overwrite?');
+          warn('Destination directory exists. OK to overwrite?');
+          log(`  ┗ ${hvy('dir')}: ${req(to)}`);
 
           const overwriteSelection = (
             await cliSelect({

package/src/config/webpack.js

@@ -9,7 +9,6 @@ const CopyPlugin = importLazy('copy-webpack-plugin');
 const ForkTsCheckerWebpackPlugin = importLazy('fork-ts-checker-webpack-plugin');
 const MiniCssExtractPlugin = importLazy('mini-css-extract-plugin');
 const sveltePreprocess = importLazy('svelte-preprocess');
-const TerserPlugin = importLazy('terser-webpack-plugin');
 const EnvironmentPlugin = importLazy('webpack/lib/EnvironmentPlugin');
 
 // Ours
@@ -18,7 +17,6 @@ const { getBabelConfig } = require('./babel');
 const { getBuildConfig } = require('./build');
 const { getProjectConfig } = require('./project');
 
-const URL_LOADER_LIMIT = 10000;
 const JSX_RESOLVE_EXTENSIONS = ['.jsx', '.tsx'];
 const PROJECT_TYPES_CONFIG = {
   preact: {
@@ -213,43 +211,21 @@ function createWebpackConfig({ isModernJS } = {}) {
             }
           },
           {
-            test: /\.(jpg|png|gif|mp4|m4v|flv|mp3|wav|m4a)$/,
-            loader: require.resolve('file-loader'),
-            options: {
-              name: '[name]-[contenthash].[ext]'
-            }
-          },
-          {
-            test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/,
-            loader: require.resolve('url-loader'),
-            options: {
-              limit: URL_LOADER_LIMIT,
-              mimetype: 'application/font-woff'
-            }
+            test: /\.(jpg|png|gif|mp4|m4v|flv|mp3|wav|m4a|eot|ttf|woff|woff2)$/,
+            type: 'asset'
           },
           {
-            test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
-            loader: require.resolve('url-loader'),
-            options: {
-              limit: URL_LOADER_LIMIT,
-              mimetype: 'application/octet-stream'
-            }
-          },
-          {
-            test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
-            loader: require.resolve('file-loader')
+            test: /\.svg$/,
+            resourceQuery: { not: [/raw/] },
+            type: 'asset'
           },
           {
-            test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
-            loader: require.resolve('url-loader'),
-            options: {
-              limit: URL_LOADER_LIMIT,
-              mimetype: 'image/svg+xml'
-            }
+            resourceQuery: /raw/,
+            type: 'asset/source'
           },
           {
             test: /\.html$/,
-            loader: require.resolve('html-loader')
+            type: 'asset/source'
           }
         ]
       },