@enhanced-dom/webpack 0.0.3 → 0.0.4

package/config.js

@@ -22,5 +22,5 @@ const loaders = __importStar(require("./loaders"));
 const plugins = __importStar(require("./plugins"));
 module.exports = {
     loaders,
-    plugins,
+    plugins
 };

package/loaders/ExposeCssSourceLoader.js

@@ -1,14 +1,21 @@
 "use strict";
-const loader_utils_1 = require("loader-utils");
 const loader = function () { };
+const styleLoader = require('style-loader');
+const uniqueId = require('lodash').uniqueId;
 loader.pitch = function pitch(remainingRequest) {
     if (this.cacheable) {
         this.cacheable();
     }
-    return `
-    var content = require(${loader_utils_1.stringifyRequest(this, `!!${remainingRequest}`)});
-    module.exports = content.locals || {};
-    module.exports._source = content.toString();
+    const result = styleLoader.pitch.call(this, remainingRequest);
+    const index = result.indexOf('var update = API(content, options)');
+    if (index <= -1)
+        return result;
+    const insertIndex = index - 1;
+    const stylesheetName = uniqueId('stylesheet-');
+    const insertAttr = `
+    options.attributes = options.attributes || {}
+    options.attributes.title = "${stylesheetName}";
   `;
+    return result.slice(0, insertIndex) + insertAttr + result.slice(insertIndex) + `export const _stylesheetName = "${stylesheetName}";`;
 };
 module.exports = loader;

package/loaders/index.d.ts

@@ -23,15 +23,13 @@ export declare const nullConfigFactory: ({ rules }?: {
 export declare const fontExtensions: string[];
 export declare const imageExtensions: string[];
 export declare const assetExtensions: (extensions?: string[]) => RegExp;
-export declare const babelConfigFactory: ({ babel, cache }?: {
+export declare const babelConfigFactory: ({ babel }: {
     babel?: any;
-    cache?: boolean | Record<string, any>;
 }) => {
     loader: string;
     options: any;
 }[];
-export declare const markdownConfigFactory: ({ babel, cache, remark, }?: {
+export declare const markdownConfigFactory: ({ babel, remark, }?: {
     babel?: any;
-    cache?: boolean | Record<string, any>;
     remark?: any[];
 }) => any[];

package/loaders/index.js

@@ -19,23 +19,28 @@ const styleConfigFactory = ({ raw = false, extract = false, sourceMap = false, t
     if (raw) {
         loaders.push({
             loader: ExposeCssSourceLoader,
+            options: {
+                attributes: {}
+            }
         });
     }
-    const finalStyleLoader = extract
-        ? {
+    else if (extract) {
+        loaders.push({
             loader: mini_css_extract_plugin_1.default.loader,
             options: {
                 publicPath: './',
-            },
-        }
-        : { loader: 'style-loader' };
-    loaders.push(finalStyleLoader);
+            }
+        });
+    }
+    else {
+        loaders.push({ loader: 'style-loader' });
+    }
     if (typedStyles) {
         loaders.push({
             loader: 'dts-css-modules-loader',
             options: {
                 namedExport: true,
-                banner: raw ? 'export const _source: string;' : undefined,
+                banner: raw ? 'export const _stylesheetName: string;' : undefined,
             },
         });
     }
@@ -112,18 +117,15 @@ exports.fontExtensions = ['ttf', 'eot', 'woff', 'woff2'];
 exports.imageExtensions = ['png', 'jpg', 'jpeg', 'gif', 'svg', 'ico'];
 const assetExtensions = (extensions = [...exports.imageExtensions, ...exports.fontExtensions]) => new RegExp(`\\.(${extensions.join('|')})(\\?.*$|$)?$`);
 exports.assetExtensions = assetExtensions;
-const babelConfigFactory = ({ babel = undefined, cache = false } = {}) => {
+const babelConfigFactory = ({ babel = undefined }) => {
     const loaders = [{ loader: 'babel-loader', options: babel }];
-    if (cache) {
-        loaders.unshift({ loader: 'cache-loader', options: { cacheDirectory: '.babelcache', ...cache } });
-    }
     return loaders;
 };
 exports.babelConfigFactory = babelConfigFactory;
-const markdownConfigFactory = ({ babel, cache, remark = [], } = {}) => {
+const markdownConfigFactory = ({ babel, remark = [], } = {}) => {
     const loaders = [];
     if (babel) {
-        loaders.push(...exports.babelConfigFactory({ babel, cache }));
+        loaders.push(...exports.babelConfigFactory({ babel }));
         loaders.push({
             loader: '@mdx-js/loader',
             options: {
@@ -132,9 +134,6 @@ const markdownConfigFactory = ({ babel, cache, remark = [], } = {}) => {
         });
     }
     else {
-        if (cache) {
-            loaders.push({ loader: 'cache-loader', options: { cacheDirectory: '.markdowncache', ...cache } });
-        }
         loaders.push({
             loader: 'html-loader',
         }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enhanced-dom/webpack",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Helpers for webpack configuration",
   "keywords": [],
   "repository": "https://github.com/enhanced-dom/webpack.git",
@@ -18,7 +18,6 @@
     "@mdx-js/loader": "^1.6.22",
     "autoprefixer": "^10.3.5",
     "babel-loader": "^8.2.2",
-    "cache-loader": "^4.1.0",
     "copyfiles": "^2.4.1",
     "css-loader": "^6.2.0",
     "cssnano-preset-advanced": "^5.1.3",
@@ -41,6 +40,7 @@
     "postcss-advanced-variables": "^3.0.1",
     "postcss-scss": "^4.0.0",
     "module-from-string": "^3.0.0",
+    "raw-loader": "^4.0.2",
     "remark-code-import": "^0.3.0",
     "remark-embed-images": "^2.0.0",
     "remark-images": "^2.0.0",
@@ -71,7 +71,8 @@
   "overrides": {
     "postcss": "^8.2.15",
     "postcss-scss": "^4.0.0",
-    "autoprefixer": "^10.3.5"
+    "autoprefixer": "^10.3.5",
+    "webpack": "^5.28.0"
   },
   "engines": {
     "node": ">=14.17.0",

package/plugins/index.d.ts

@@ -13,8 +13,7 @@ export declare const htmlConfigFactory: ({ html, embed, outputPath }?: {
     html?: Partial<HtmlWebpackPlugin.Options>;
     outputPath?: string;
 }) => WebpackPluginInstance[];
-export declare const terserConfigFactory: ({ enableSourcemaps, cachePath, terserOptions, }?: {
+export declare const terserConfigFactory: ({ enableSourcemaps, terserOptions, }?: {
     enableSourcemaps?: boolean;
-    cachePath?: string;
     terserOptions?: MinifyOptions;
 }) => TerserPlugin[];

package/plugins/index.js

@@ -68,10 +68,10 @@ const htmlConfigFactory = ({ html = {}, embed, outputPath = './dist' } = {}) =>
     return plugins;
 };
 exports.htmlConfigFactory = htmlConfigFactory;
-const terserConfigFactory = ({ enableSourcemaps = true, cachePath = './.tersercache', terserOptions = {}, } = {}) => [
+const terserConfigFactory = ({ enableSourcemaps = true, terserOptions = {}, } = {}) => [
     new terser_webpack_plugin_1.default({
         parallel: true,
-        cache: cachePath,
+        cache: true,
         sourceMap: enableSourcemaps,
         terserOptions: {
             ie8: false,