@navita/next-plugin 0.4.4 → 3.0.0-next.1

package/_virtual/_rolldown/runtime.cjs

@@ -0,0 +1,23 @@
+//#region \0rolldown/runtime.js
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+//#endregion
+exports.__toESM = __toESM;

package/fromServerLoader.cjs

@@ -1,20 +1,13 @@
-'use strict';
-
-var webpackPlugin = require('@navita/webpack-plugin');
-
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+let _navita_webpack_plugin = require("@navita/webpack-plugin");
+//#region src/fromServerLoader.ts
 function pitch() {
-    this._module.loaders = [];
-    const dependency = webpackPlugin.getNavitaDependency(this._compiler.webpack);
-    const { cssHash, issuerPath } = Object.fromEntries(new URLSearchParams(this.resourceQuery).entries());
-    this._module.addDependency(new dependency(issuerPath, cssHash));
-    // We set the layer to something other than WEBPACK_LAYERS.appPagesBrowser to
-    // not have the modules included in the next pageManifest.
-    // Our modules are empty and aren't used for anything other than for collecting information.
-    // And are not even included in the final bundle.
-    // https://github.com/vercel/next.js/blob/8c6532fa7045879feb13bb21c530bb1517378e29/packages/next/src/build/webpack/plugins/flight-manifest-plugin.ts#L404
-    // https://github.com/vercel/next.js/blob/8c6532fa7045879feb13bb21c530bb1517378e29/packages/next/src/lib/constants.ts#L146
-    this._module.layer = 'not-app-pages-browser';
-    return '';
+	this._module.loaders = [];
+	const dependency = (0, _navita_webpack_plugin.getNavitaDependency)(this._compiler.webpack);
+	const { cssHash, issuerPath } = Object.fromEntries(new URLSearchParams(this.resourceQuery).entries());
+	this._module.addDependency(new dependency(issuerPath, cssHash));
+	this._module.layer = "not-app-pages-browser";
+	return "";
 }
-
+//#endregion
 exports.pitch = pitch;

package/fromServerLoader.d.ts

@@ -1,5 +1,6 @@
-import { LoaderContext } from 'webpack';
+import { LoaderContext } from "webpack";
 
+//#region src/fromServerLoader.d.ts
 declare function pitch(this: LoaderContext<unknown>): string;
-
-export { pitch };
+//#endregion
+export { pitch };

package/index.cjs

@@ -1,142 +1,91 @@
-'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);
-
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
+const require_optimizeCSSOutput = require("./optimizeCSSOutput.cjs");
+let _navita_webpack_plugin = require("@navita/webpack-plugin");
+let node_fs = require("node:fs");
+node_fs = require_runtime.__toESM(node_fs);
+let node_path = require("node:path");
+node_path = require_runtime.__toESM(node_path);
+let next_dist_build_webpack_plugins_mini_css_extract_plugin = require("next/dist/build/webpack/plugins/mini-css-extract-plugin");
+next_dist_build_webpack_plugins_mini_css_extract_plugin = require_runtime.__toESM(next_dist_build_webpack_plugins_mini_css_extract_plugin);
+let next_dist_lib_find_pages_dir = require("next/dist/lib/find-pages-dir");
+//#region src/index.ts
 let renderer;
 let lastCache;
-const MiniCssExtractPlugin = NextMiniCssExtractPluginDefault['default'];
-const createNavitaStylePlugin = (navitaConfig = {})=>(nextConfig)=>Object.assign({}, nextConfig, {
-            webpack (config, options) {
-                const { dir, dev } = options;
-                config.plugins?.push({
-                    apply (compiler) {
-                        // We call the getNavitaModule function here
-                        // so that NavitaModule is created with what's required for the next.js rsc to client entry promotion:
-                        webpackPlugin.getNavitaModule(compiler.webpack, ({ cssHash, issuerPath })=>({
-                                // The resourceResolveData is used by next.js to promote server and ssr entries to client entries:
-                                // https://github.com/vercel/next.js/blob/f3132354285fb18c290bf9aad7f8dc7e0550105d/packages/next/src/build/webpack/plugins/flight-client-entry-plugin.ts#L590
-                                resourceResolveData: {
-                                    path: '',
-                                    query: '?' + new URLSearchParams({
-                                        cssHash,
-                                        issuerPath
-                                    }).toString()
-                                },
-                                // We set the resource to ".css"
-                                // to trick next.js into thinking this is a css module:
-                                // https://github.com/vercel/next.js/blob/f3132354285fb18c290bf9aad7f8dc7e0550105d/packages/next/src/build/webpack/loaders/utils.ts#L24
-                                resource: '.css'
-                            }));
-                    }
-                });
-                // This loader promotes the server and ssr entries to client entries:
-                config.module?.rules.unshift({
-                    resourceQuery: [
-                        /cssHash/,
-                        /issuerPath/
-                    ],
-                    loader: require.resolve("@navita/next-plugin/fromServerLoader")
-                });
-                const findPagesDirResult = findPagesDir.findPagesDir(dir);
-                const hasAppDir = !!(findPagesDirResult && findPagesDirResult.appDir);
-                const isServer = options.isServer && !(options.nextRuntime === 'edge');
-                const outputCss = !isServer || hasAppDir;
-                if (!hasAppDir && !isServer) {
-                    const filename = dev ? 'static/css/[name].css' : 'static/css/[contenthash].css';
-                    // https://github.com/vercel/next.js/blob/930db5c1afbe541a0b2357c26123c2b365b56624/packages/next/src/build/webpack/config/blocks/css/index.ts#L595
-                    config.plugins.push(new MiniCssExtractPlugin({
-                        filename,
-                        chunkFilename: filename,
-                        ignoreOrder: true
-                    }));
-                }
-                if (navitaConfig?.singleCssFile) {
-                    config.optimization.splitChunks = {
-                        ...config.optimization.splitChunks || {},
-                        cacheGroups: {
-                            ...config.optimization.splitChunks['cacheGroups'] || {},
-                            navita: {
-                                chunks: 'all',
-                                enforce: true,
-                                name: 'navita',
-                                type: webpackPlugin.NAVITA_MODULE_TYPE
-                            }
-                        }
-                    };
-                }
-                // 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") {
-                    return nextConfig.webpack(config, options);
-                }
-                return config;
-            }
-        });
-
+const MiniCssExtractPlugin = next_dist_build_webpack_plugins_mini_css_extract_plugin.default["default"];
+const createNavitaStylePlugin = (navitaConfig = {}) => (nextConfig) => Object.assign({}, nextConfig, { webpack(config, options) {
+	const { dir, dev } = options;
+	config.plugins?.push({ apply(compiler) {
+		(0, _navita_webpack_plugin.getNavitaModule)(compiler.webpack, ({ cssHash, issuerPath }) => ({
+			resourceResolveData: {
+				path: "",
+				query: "?" + new URLSearchParams({
+					cssHash,
+					issuerPath
+				}).toString()
+			},
+			resource: ".css"
+		}));
+	} });
+	config.module?.rules.unshift({
+		resourceQuery: [/cssHash/, /issuerPath/],
+		loader: require.resolve("@navita/next-plugin/fromServerLoader")
+	});
+	const findPagesDirResult = (0, next_dist_lib_find_pages_dir.findPagesDir)(dir);
+	const hasAppDir = !!(findPagesDirResult && findPagesDirResult.appDir);
+	const isServer = options.isServer && !(options.nextRuntime === "edge");
+	const outputCss = !isServer || hasAppDir;
+	if (!hasAppDir && !isServer) {
+		const filename = dev ? "static/css/[name].css" : "static/css/[contenthash].css";
+		config.plugins.push(new MiniCssExtractPlugin({
+			filename,
+			chunkFilename: filename,
+			ignoreOrder: true
+		}));
+	}
+	if (navitaConfig?.singleCssFile) config.optimization.splitChunks = {
+		...config.optimization.splitChunks || {},
+		cacheGroups: {
+			...config.optimization.splitChunks["cacheGroups"] || {},
+			navita: {
+				chunks: "all",
+				enforce: true,
+				name: "navita",
+				type: _navita_webpack_plugin.NAVITA_MODULE_TYPE
+			}
+		}
+	};
+	const { cache, mode } = config;
+	const cacheDirectory = typeof cache !== "boolean" && cache.type === "filesystem" ? node_path.default.resolve(cache.cacheDirectory, `navita-${mode}`) : void 0;
+	const cacheDestination = cacheDirectory ? node_path.default.resolve(cacheDirectory, "data.txt") : void 0;
+	const onRenderInitialized = async (createdRenderer) => {
+		renderer = createdRenderer;
+		if (cacheDirectory && cacheDestination) try {
+			await node_fs.promises.mkdir(cacheDirectory, { recursive: true });
+			const content = await node_fs.promises.readFile(cacheDestination, "utf-8");
+			await renderer.engine.deserialize(content);
+			lastCache = renderer.engine.serialize();
+		} catch {}
+		return navitaConfig.onRenderInitialized?.(renderer);
+	};
+	config.plugins?.push({ apply(compiler) {
+		compiler.hooks.afterEmit.tapPromise(`${_navita_webpack_plugin.NavitaPlugin.pluginName}-nextjs-custom-cache`, async () => {
+			if (!renderer || !cacheDestination) return;
+			const newCache = renderer.engine.serialize();
+			if (newCache === lastCache) return;
+			lastCache = newCache;
+			await node_fs.promises.writeFile(cacheDestination, newCache);
+		});
+	} });
+	config.plugins?.push(new _navita_webpack_plugin.NavitaPlugin({
+		useWebpackCache: false,
+		outputCss,
+		...navitaConfig,
+		onRenderInitialized,
+		optimizeCSSOutput: require_optimizeCSSOutput.optimizeCSSOutput
+	}));
+	if (typeof nextConfig.webpack === "function") return nextConfig.webpack(config, options);
+	return config;
+} });
+//#endregion
 exports.createNavitaStylePlugin = createNavitaStylePlugin;

package/index.d.ts

@@ -1,10 +1,10 @@
-import { Options } from '@navita/webpack-plugin';
-export { Renderer } from '@navita/webpack-plugin';
-import { NextConfig } from 'next';
+import { Options, Renderer } from "@navita/webpack-plugin";
+import { NextConfig } from "next";
 
-interface Config extends Omit<Options, 'useWebpackCache'> {
-    singleCssFile?: boolean;
+//#region src/index.d.ts
+interface Config extends Omit<Options, "useWebpackCache"> {
+  singleCssFile?: boolean;
 }
 declare const createNavitaStylePlugin: (navitaConfig?: Config) => (nextConfig: NextConfig) => NextConfig;
-
-export { createNavitaStylePlugin };
+//#endregion
+export { type Renderer, createNavitaStylePlugin };

package/optimizeCSSOutput.cjs

@@ -1,98 +1,60 @@
-'use strict';
-
-const merge = (...merge)=>{
-    const result = {};
-    for (const usedIds of merge){
-        for(const key in usedIds){
-            result[key] = [
-                ...result[key] || [],
-                ...usedIds[key] || []
-            ];
-        }
-    }
-    for(const key in result){
-        result[key] = [
-            ...new Set(result[key])
-        ];
-    }
-    return result;
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/optimizeCSSOutput.ts
+const merge = (...merge) => {
+	const result = {};
+	for (const usedIds of merge) for (const key in usedIds) result[key] = [...result[key] || [], ...usedIds[key] || []];
+	for (const key in result) result[key] = [...new Set(result[key])];
+	return result;
 };
-const intersect = (...intersect)=>{
-    const result = {};
-    for (const usedIds of intersect){
-        for(const key in usedIds){
-            result[key] = result[key] ? result[key].filter((id)=>usedIds[key].includes(id)) : usedIds[key];
-        }
-    }
-    return result;
+const intersect = (...intersect) => {
+	const result = {};
+	for (const usedIds of intersect) for (const key in usedIds) result[key] = result[key] ? result[key].filter((id) => usedIds[key].includes(id)) : usedIds[key];
+	return result;
 };
-// structuredClone would be better, but since Next.js version 13 is at node 16.14.0,
-// we can't use it.
-const copy = (source)=>JSON.parse(JSON.stringify(source));
-const removeParentFromCurrent = (usedIds, parentUsedIds)=>{
-    for(const key in parentUsedIds){
-        if (usedIds[key] && parentUsedIds[key]) {
-            usedIds[key] = usedIds[key].filter((id)=>!parentUsedIds[key].includes(id));
-        }
-    }
+const copy = (source) => JSON.parse(JSON.stringify(source));
+const removeParentFromCurrent = (usedIds, parentUsedIds) => {
+	for (const key in parentUsedIds) if (usedIds[key] && parentUsedIds[key]) usedIds[key] = usedIds[key].filter((id) => !parentUsedIds[key].includes(id));
 };
 function optimizeCSSOutput(output) {
-    const nameToChunk = Object.fromEntries(Array.from(output.keys()).filter((x)=>x.name).map((x)=>[
-            x.name,
-            x
-        ]));
-    const getAllParentUsedIds = (chunk)=>{
-        const { name: route } = chunk;
-        if (!route) {
-            // If we don't have a name, it's a dynamic chunk.
-            const value = output.get(chunk);
-            if (value.parents.length === 0) {
-                return [];
-            }
-            return [
-                intersect(...value.parents.map((parent)=>merge(...getAllParentUsedIds(parent), output.get(parent).usedIds)))
-            ];
-        }
-        if (route.startsWith('pages/')) {
-            const routes = [
-                'pages/_document',
-                'pages/_app',
-                route
-            ];
-            const currentRouteIndex = routes.indexOf(route);
-            return routes.filter((_, index)=>currentRouteIndex > index).map((x)=>output.get(nameToChunk[x])).filter(Boolean).map((x)=>copy(x.usedIds));
-        }
-        const parts = route.split('/');
-        const parents = [];
-        let currentPart = '';
-        for (const part of parts){
-            currentPart = [
-                currentPart,
-                part
-            ].filter(Boolean).join('/');
-            const possibleParent = `${currentPart}/layout`;
-            if (route === possibleParent) {
-                continue;
-            }
-            const parentChunk = nameToChunk[possibleParent];
-            if (output.has(parentChunk)) {
-                parents.push(copy(output.get(parentChunk).usedIds));
-            }
-        }
-        return parents;
-    };
-    const newOutput = new Map();
-    for (const chunk of output.keys()){
-        const currentUsedIds = copy(output.get(chunk).usedIds);
-        for (const parent of getAllParentUsedIds(chunk)){
-            removeParentFromCurrent(currentUsedIds, parent);
-        }
-        newOutput.set(chunk, {
-            ...output.get(chunk),
-            usedIds: currentUsedIds
-        });
-    }
-    return newOutput;
+	const nameToChunk = Object.fromEntries(Array.from(output.keys()).filter((x) => x.name).map((x) => [x.name, x]));
+	const getAllParentUsedIds = (chunk) => {
+		const { name: route } = chunk;
+		if (!route) {
+			const value = output.get(chunk);
+			if (value.parents.length === 0) return [];
+			return [intersect(...value.parents.map((parent) => merge(...getAllParentUsedIds(parent), output.get(parent).usedIds)))];
+		}
+		if (route.startsWith("pages/")) {
+			const routes = [
+				"pages/_document",
+				"pages/_app",
+				route
+			];
+			const currentRouteIndex = routes.indexOf(route);
+			return routes.filter((_, index) => currentRouteIndex > index).map((x) => output.get(nameToChunk[x])).filter(Boolean).map((x) => copy(x.usedIds));
+		}
+		const parts = route.split("/");
+		const parents = [];
+		let currentPart = "";
+		for (const part of parts) {
+			currentPart = [currentPart, part].filter(Boolean).join("/");
+			const possibleParent = `${currentPart}/layout`;
+			if (route === possibleParent) continue;
+			const parentChunk = nameToChunk[possibleParent];
+			if (output.has(parentChunk)) parents.push(copy(output.get(parentChunk).usedIds));
+		}
+		return parents;
+	};
+	const newOutput = /* @__PURE__ */ new Map();
+	for (const chunk of output.keys()) {
+		const currentUsedIds = copy(output.get(chunk).usedIds);
+		for (const parent of getAllParentUsedIds(chunk)) removeParentFromCurrent(currentUsedIds, parent);
+		newOutput.set(chunk, {
+			...output.get(chunk),
+			usedIds: currentUsedIds
+		});
+	}
+	return newOutput;
 }
-
+//#endregion
 exports.optimizeCSSOutput = optimizeCSSOutput;

package/package.json

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