weboptimizer 4.0.4 → 4.0.5

package/browser.d.ts

@@ -1,6 +1,7 @@
 import { Browser, InitializedBrowser } from './type';
+import { Logger } from 'clientnode';
 export declare const browser: Browser;
-export declare const log: any;
+export declare const log: Logger;
 /**
  * Provides a generic browser api in node or web contexts.
  * @param replaceWindow - Indicates whether a potential existing window object

package/configurator.d.ts

@@ -1,8 +1,9 @@
 import type { ResolvedConfiguration } from './type';
+import { Logger } from 'clientnode';
 export declare const require: NodeJS.Require;
 export declare const optionalRequire: <T = unknown>(id: string) => null | T;
 export declare let loadedConfiguration: null | ResolvedConfiguration;
-export declare const log: any;
+export declare const log: Logger;
 /**
  * Main entry point to determine current configuration.
  * @param context - Location from where to build current application.

package/configurator.js

@@ -296,7 +296,7 @@ environment = eval('process.env')) => {
       file: resolvedConfiguration.extensions.file.internal
     }, resolvedConfiguration.path.context,
     /*
-        NOTE: We doesn't use
+        NOTE: We don't use
         "resolvedConfiguration.path.source.asset.base" because we
         already have resolved all module ids.
     */
@@ -320,7 +320,7 @@ environment = eval('process.env')) => {
   }
   resolvedConfiguration.module.aliases.webOptimizerDefaultTemplateFilePath = resolvedConfiguration.files.defaultHTML.template.filePath;
   // endregion
-  // region apply html webpack plugin workarounds
+  // region apply HTML webpack plugin workarounds
   /*
       NOTE: Provides a workaround to handle a bug with chained loader
       configurations.
@@ -342,7 +342,7 @@ environment = eval('process.env')) => {
  * @returns Nothing.
  */
 export const get = async () => {
-  if (loadedConfiguration) return loadedConfiguration;
-  return await load();
+  if (!loadedConfiguration) loadedConfiguration = await load();
+  return loadedConfiguration;
 };
 export default get;

package/ejsLoader.d.ts

@@ -2,6 +2,7 @@ import type { Encoding, Mapping } from 'clientnode';
 import type { Options, TemplateFunction as EJSTemplateFunction } from 'ejs';
 import type { LoaderContext } from 'webpack';
 import type { Extensions, Replacements } from './type';
+import { Logger } from 'clientnode';
 export type TemplateFunction = EJSTemplateFunction;
 export type CompilerOptions = Options & {
     encoding: Encoding;
@@ -24,7 +25,7 @@ export type LoaderConfiguration = Mapping<unknown> & {
         replacements: Replacements;
     };
 };
-export declare const log: any;
+export declare const log: Logger;
 /**
  * Main transformation function.
  * @param source - Input string to transform.

package/helper.d.ts

@@ -1,7 +1,8 @@
 import type { Encoding, Mapping } from 'clientnode';
 import type { BuildConfiguration, Extensions, GivenInjection, GivenInjectionConfiguration, NormalizedGivenInjection, PathConfiguration, PackageDescriptor, Replacements, ResolvedBuildConfiguration, SpecificExtensions } from './type';
+import { Logger } from 'clientnode';
 export declare const KNOWN_FILE_EXTENSIONS: Array<string>;
-export declare const log: any;
+export declare const log: Logger;
 /**
  * Determines whether given file path is within given list of file locations.
  * @param filePath - Path to file to check.

package/index.d.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env babel-node
-export declare const log: any;
+import { Logger } from 'clientnode';
+export declare const log: Logger;
 /**
  * Main entry point.
  * @param context - Location from where to build current application.

package/index.js

@@ -27,7 +27,7 @@ import { exec as execChildProcess, spawn as spawnChildProcess } from 'child_proc
 import { CLOSE_EVENT_NAMES, copyDirectoryRecursiveSync, copyFileSync, evaluate, getProcessCloseHandler, handleChildProcess, importsPromise, isDirectory, isDirectorySync, isFile, isFileSync, isPlainObject, Logger, MAXIMAL_NUMBER_OF_ITERATIONS, NOOP, parseEncodedObject, walkDirectoryRecursively } from 'clientnode';
 import { chmodSync, unlinkSync } from 'fs';
 import { writeFile, unlink } from 'fs/promises';
-import globAll from 'glob-all';
+import { sync as globAllSync } from 'glob-all';
 import path, { join, resolve } from 'path';
 import { rimraf as removeDirectoryRecursively, sync as removeDirectoryRecursivelySync } from 'rimraf';
 import { load as loadConfiguration } from "./configurator.js";
@@ -105,7 +105,7 @@ environment = eval('process.env')) => {
       // endregion
       // region handle clear
       /*
-          NOTE: Some tasks could depend on previously created artefacts
+          NOTE: Some tasks could depend on previously created artifacts
           packages so a preceding clear should not be performed in that
           cases.
           NOTE: If we have a dependency cycle we need to preserve files
@@ -133,14 +133,12 @@ environment = eval('process.env')) => {
             }
           });
           for (const file of await walkDirectoryRecursively(configuration.path.target.base, () => false, configuration.encoding)) if (file.name.startsWith('npm-debug')) await unlink(file.path);
-        } else {
-          await removeDirectoryRecursively(configuration.path.target.base);
-        }
+        } else await removeDirectoryRecursively(configuration.path.target.base);
         if (await isDirectory(configuration.path.apiDocumentation)) await removeDirectoryRecursively(configuration.path.apiDocumentation);
         for (const filePath of configuration.path.tidyUpOnClear) if (filePath) if (isFileSync(filePath))
           // NOTE: Close handler have to be synchronous.
           unlinkSync(filePath);else if (isDirectorySync(filePath)) removeDirectoryRecursivelySync(filePath);
-        removeDirectoryRecursivelySync(globAll.sync(configuration.path.tidyUpOnClearGlobs));
+        removeDirectoryRecursivelySync(globAllSync(configuration.path.tidyUpOnClearGlobs));
       }
       // endregion
       // region handle build
@@ -174,7 +172,7 @@ environment = eval('process.env')) => {
           for (const filePath of configuration.path.tidyUp) if (filePath) if (isFileSync(filePath))
             // NOTE: Close handler have to be synchronous.
             unlinkSync(filePath);else if (isDirectorySync(filePath)) removeDirectoryRecursivelySync(filePath);
-          removeDirectoryRecursivelySync(globAll.sync(configuration.path.tidyUpGlobs));
+          removeDirectoryRecursivelySync(globAllSync(configuration.path.tidyUpGlobs));
         };
         closeEventHandlers.push(tidyUp);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -95,7 +95,7 @@
     "babel-plugin-polyfill-corejs3": "^1.0.0",
     "babel-plugin-transform-rewrite-imports": "^1.5.4",
     "babel-preset-minify": "^0.5.2",
-    "clientnode": "4.0.1430",
+    "clientnode": "4.0.1432",
     "core-js": "^3.49.0",
     "ejs": "^6.0.1",
     "exports-loader": "^5.0.0",

package/webpackConfigurator.d.ts

@@ -1,4 +1,5 @@
 import type { WebpackConfiguration } from './type';
-export declare const log: any;
+import { Logger } from 'clientnode';
+export declare const log: Logger;
 export declare let webpackConfiguration: WebpackConfiguration;
 export default webpackConfiguration;