@navita/next-plugin 0.2.0 → 0.4.0

package/index.cjs

@@ -1,10 +1,33 @@
 'use strict';
 
+var fs = require('node:fs');
+var path = require('node:path');
 var webpackPlugin = require('@navita/webpack-plugin');
 var NextMiniCssExtractPluginDefault = require('next/dist/build/webpack/plugins/mini-css-extract-plugin');
 var findPagesDir = require('next/dist/lib/find-pages-dir');
 var optimizeCSSOutput = require('./optimizeCSSOutput.cjs');
 
+function _interopNamespaceDefault(e) {
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+
+var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
+
+let renderer;
+let lastCache;
 const MiniCssExtractPlugin = NextMiniCssExtractPluginDefault['default'];
 const createNavitaStylePlugin = (navitaConfig = {})=>(nextConfig)=>Object.assign({}, nextConfig, {
             webpack (config, options) {
@@ -65,9 +88,48 @@ const createNavitaStylePlugin = (navitaConfig = {})=>(nextConfig)=>Object.assign
                         }
                     };
                 }
+                // Next.js creates at least three webpack instances. We can't rely on the webpack cache.
+                const { cache , mode  } = config;
+                const cacheDirectory = typeof cache !== "boolean" && cache.type === "filesystem" ? path.resolve(cache.cacheDirectory, `navita-${mode}`) : undefined;
+                const cacheDestination = path.resolve(cacheDirectory, 'data.txt');
+                const onRenderInitialized = async (createdRenderer)=>{
+                    renderer = createdRenderer;
+                    try {
+                        // Ensure the cache directory exists:
+                        await fs__namespace.promises.mkdir(cacheDirectory, {
+                            recursive: true
+                        });
+                        const content = await fs__namespace.promises.readFile(cacheDestination, 'utf-8');
+                        await renderer.engine.deserialize(content);
+                        lastCache = renderer.engine.serialize();
+                    } catch  {
+                    // This will happen if the user doesn't have write access to the cache directory.
+                    // But the same should happen with the webpack cache.
+                    }
+                    // If the user has provided their own onRenderInitialized function,
+                    // we'll do it after the cache is loaded.
+                    return navitaConfig.onRenderInitialized?.(renderer);
+                };
+                config.plugins?.push({
+                    apply (compiler) {
+                        compiler.hooks.afterEmit.tapPromise(`${webpackPlugin.NavitaPlugin.pluginName}-nextjs-custom-cache`, async ()=>{
+                            if (!renderer) {
+                                return;
+                            }
+                            const newCache = renderer.engine.serialize();
+                            if (newCache === lastCache) {
+                                return;
+                            }
+                            lastCache = newCache;
+                            await fs__namespace.promises.writeFile(cacheDestination, newCache);
+                        });
+                    }
+                });
                 config.plugins?.push(new webpackPlugin.NavitaPlugin({
+                    useWebpackCache: false,
                     outputCss,
                     ...navitaConfig,
+                    onRenderInitialized,
                     optimizeCSSOutput: optimizeCSSOutput.optimizeCSSOutput
                 }));
                 if (typeof nextConfig.webpack === "function") {

package/index.d.ts

@@ -1,8 +1,8 @@
 import { Options } from '@navita/webpack-plugin';
+export { Renderer } from '@navita/webpack-plugin';
 import { NextConfig } from 'next';
 
-type WebpackOptions = Options;
-interface Config extends WebpackOptions {
+interface Config extends Omit<Options, 'useWebpackCache'> {
     singleCssFile?: boolean;
 }
 declare const createNavitaStylePlugin: (navitaConfig?: Config) => (nextConfig: NextConfig) => NextConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navita/next-plugin",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Next.js integration for Navita",
   "keywords": [
     "next",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "browserslist": "^4.21.5",
-    "@navita/webpack-plugin": "0.2.0"
+    "@navita/webpack-plugin": "0.4.0"
   },
   "peerDependencies": {
     "next": ">=12 || >=13",