@navita/next-plugin 0.0.10 → 0.0.12

package/{index.js → index.cjs}

@@ -3,101 +3,7 @@
 var webpackPlugin = require('@navita/webpack-plugin');
 var NextMiniCssExtractPlugin = require('next/dist/build/webpack/plugins/mini-css-extract-plugin');
 var findPagesDir = require('next/dist/lib/find-pages-dir');
-
-const merge = (...merge)=>{
-    const result = {};
-    for (const usedIds of merge){
-        for(const key in usedIds){
-            result[key] = [
-                ...result[key] || [],
-                ...usedIds[key] || []
-            ];
-        }
-    }
-    for(const key1 in result){
-        result[key1] = [
-            ...new Set(result[key1])
-        ];
-    }
-    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));
-        }
-    }
-};
-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;
-}
+var optimizeCSSOutput = require('./optimizeCSSOutput.cjs');
 
 const MiniCssExtractPlugin = NextMiniCssExtractPlugin['default'];
 const createNavitaStylePlugin = (navitaConfig = {})=>(nextConfig)=>Object.assign({}, nextConfig, {
@@ -162,7 +68,7 @@ const createNavitaStylePlugin = (navitaConfig = {})=>(nextConfig)=>Object.assign
                 config.plugins?.push(new webpackPlugin.NavitaPlugin({
                     outputCss,
                     ...navitaConfig,
-                    optimizeCSSOutput
+                    optimizeCSSOutput: optimizeCSSOutput.optimizeCSSOutput
                 }));
                 if (typeof nextConfig.webpack === "function") {
                     return nextConfig.webpack(config, options);

package/index.mjs

@@ -3,101 +3,7 @@ const require = createRequire$1(import.meta.url);
 import { getNavitaModule, NAVITA_MODULE_TYPE, NavitaPlugin } from '@navita/webpack-plugin';
 import NextMiniCssExtractPlugin from 'next/dist/build/webpack/plugins/mini-css-extract-plugin';
 import { findPagesDir } from 'next/dist/lib/find-pages-dir';
-
-const merge = (...merge)=>{
-    const result = {};
-    for (const usedIds of merge){
-        for(const key in usedIds){
-            result[key] = [
-                ...result[key] || [],
-                ...usedIds[key] || []
-            ];
-        }
-    }
-    for(const key1 in result){
-        result[key1] = [
-            ...new Set(result[key1])
-        ];
-    }
-    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));
-        }
-    }
-};
-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;
-}
+import { optimizeCSSOutput } from './optimizeCSSOutput.mjs';
 
 const MiniCssExtractPlugin = NextMiniCssExtractPlugin['default'];
 const createNavitaStylePlugin = (navitaConfig = {})=>(nextConfig)=>Object.assign({}, nextConfig, {

package/optimizeCSSOutput.cjs

@@ -0,0 +1,98 @@
+'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 key1 in result){
+        result[key1] = [
+            ...new Set(result[key1])
+        ];
+    }
+    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));
+        }
+    }
+};
+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;
+}
+
+exports.optimizeCSSOutput = optimizeCSSOutput;

package/optimizeCSSOutput.mjs

@@ -0,0 +1,96 @@
+const merge = (...merge)=>{
+    const result = {};
+    for (const usedIds of merge){
+        for(const key in usedIds){
+            result[key] = [
+                ...result[key] || [],
+                ...usedIds[key] || []
+            ];
+        }
+    }
+    for(const key1 in result){
+        result[key1] = [
+            ...new Set(result[key1])
+        ];
+    }
+    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));
+        }
+    }
+};
+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;
+}
+
+export { optimizeCSSOutput };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navita/next-plugin",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "Next.js integration for Navita",
   "keywords": [
     "next",
@@ -14,18 +14,18 @@
   "exports": {
     ".": {
       "import": "./index.mjs",
-      "require": "./index.js",
+      "require": "./index.cjs",
       "types": "./index.d.ts"
     },
     "./fromServerLoader": {
       "import": "./fromServerLoader.mjs",
-      "require": "./fromServerLoader.js",
+      "require": "./fromServerLoader.cjs",
       "types": "./fromServerLoader.d.ts"
     }
   },
   "dependencies": {
     "browserslist": "^4.21.5",
-    "@navita/webpack-plugin": "0.0.10"
+    "@navita/webpack-plugin": "0.0.12"
   },
   "peerDependencies": {
     "next": ">=12 || >=13",