@helsenorge/library-build 37.1.0 → 38.0.2

package/{copy.js → lib/copy.js}

@@ -1,29 +1,22 @@
-import { createRequire } from 'node:module';
 import path from 'path';
 import copyfiles from 'copyfiles';
 import { rimraf } from 'rimraf';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-const require = createRequire(import.meta.url);
-import { createPackageJsonFile } from './files.js';
-const { root, include, utils, rm } = yargs(hideBin(process.argv))
+const { outDir, root, include, utils, rm } = yargs(hideBin(process.argv))
     .options({
+    outDir: { describe: 'Output directory', type: 'string', default: 'lib' },
     root: { describe: 'Files to copy to root directory', type: 'array', default: [] },
     include: { describe: 'Files to copy from src to lib, replacing "src" with "lib"', type: 'array', default: [] },
     utils: { describe: 'Files to copy to lib/utils', type: 'array', default: [] },
     rm: { describe: 'Files to delete', type: 'array', default: [] },
 })
     .parse();
-const originalPackageJson = path.resolve(process.cwd(), 'package.json');
-const { name: packageName, publishConfig: { directory: outputDirectory }, } = require(originalPackageJson);
-const outputPath = path.resolve(process.cwd(), outputDirectory);
-const newPackageJson = path.resolve(outputPath, 'package.json');
+const outputPath = path.resolve(process.cwd(), outDir);
 Promise.all([
     new Promise((resolve, reject) => root.length > 0 ? copyfiles([...root, outputPath], { error: true }, e => (e ? reject(e) : resolve())) : resolve()),
     new Promise((resolve, reject) => include.length > 0 ? copyfiles([...include, outputPath], { up: 1, error: true }, e => (e ? reject(e) : resolve())) : resolve()),
     new Promise((resolve, reject) => utils.length > 0
         ? copyfiles([...utils, path.resolve(outputPath, 'utils')], { up: true, error: true }, e => (e ? reject(e) : resolve()))
         : resolve()),
-])
-    .then(() => (rm ? rimraf(rm, { glob: true }) : Promise.resolve(true)))
-    .then(() => createPackageJsonFile(packageName, originalPackageJson, newPackageJson));
+]).then(() => (rm ? rimraf(rm, { glob: true }) : Promise.resolve(true)));

package/lib/exports.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=exports.d.ts.map

package/lib/exports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../src/exports.ts"],"names":[],"mappings":""}

package/lib/exports.js

@@ -0,0 +1,108 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { globSync } from 'glob';
+// 1. CONFIGURATION
+const PACKAGE_JSON_PATH = 'package.json';
+// Directories that should be "flattened" in exports.
+// e.g. lib/foo.js -> ./foo (instead of ./lib/foo)
+const FLATTEN_DIRS = new Set(['lib', 'dist']);
+const IGNORE_PATTERNS = [
+    '**/*.map',
+    '**/*.test.js',
+    '**/*.spec.js',
+    '**/__tests__/**',
+    '**/*.scss.d.ts',
+    '**/package.json',
+    '**/*.tsbuildinfo',
+];
+function run() {
+    const cwd = process.cwd();
+    const pkgPath = path.resolve(cwd, PACKAGE_JSON_PATH);
+    if (!fs.existsSync(pkgPath)) {
+        console.error(`❌ package.json not found in ${cwd}`);
+        process.exit(1);
+    }
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+    // Default to 'lib' if "files" is missing, but usually it respects package.json
+    const dirsToScan = pkg.files || ['lib'];
+    // Start with standard package.json export
+    const exportMap = {
+        './package.json': './package.json',
+    };
+    let totalFilesFound = 0;
+    dirsToScan.forEach(dirEntry => {
+        const dirPath = path.resolve(cwd, dirEntry);
+        // Only process directories (skip root files like README.md in the files array)
+        if (!fs.existsSync(dirPath) || !fs.statSync(dirPath).isDirectory()) {
+            return;
+        }
+        // Determine if we strip this directory from the export key
+        // lib/foo.js -> ./foo (Flattened)
+        // config/foo.json -> ./config/foo.json (Not flattened)
+        const shouldFlatten = FLATTEN_DIRS.has(dirEntry);
+        // Scan the directory
+        const files = globSync('**/*.{js,d.ts,json}', {
+            cwd: dirPath,
+            ignore: IGNORE_PATTERNS,
+            posix: true,
+        });
+        const jsFileSet = new Set(files.filter(f => f.endsWith('.js')));
+        files.forEach(file => {
+            // "file" is relative to "dirEntry" (e.g. "utils/date.js")
+            const fullPath = `./${dirEntry}/${file}`;
+            // Calculate the base path for the export key
+            // If flat: "utils/date.js"
+            // If not flat: "config/utils/date.js"
+            const pathForExport = shouldFlatten ? file : `${dirEntry}/${file}`;
+            let exportKey = '';
+            // --- CASE 1: JavaScript ---
+            if (file.endsWith('.js')) {
+                if (pathForExport.endsWith('index.js')) {
+                    // lib/components/index.js -> ./components
+                    // config/index.js -> ./config
+                    const dirName = path.dirname(pathForExport);
+                    exportKey = dirName === '.' ? '.' : `./${dirName}`;
+                }
+                else {
+                    // lib/utils.js -> ./utils
+                    const baseName = pathForExport.substring(0, pathForExport.length - 3);
+                    exportKey = `./${baseName}`;
+                }
+                exportMap[exportKey] = fullPath;
+            }
+            // --- CASE 2: JSON ---
+            else if (file.endsWith('.json')) {
+                // Always keep extension for JSON
+                exportKey = `./${pathForExport}`;
+                exportMap[exportKey] = fullPath;
+            }
+            // --- CASE 3: Type Definitions (Orphans) ---
+            else if (file.endsWith('.d.ts')) {
+                const jsSibling = file.replace(/\.d\.ts$/, '.js');
+                // Skip if JS sibling exists (TS finds it automatically)
+                if (jsFileSet.has(jsSibling)) {
+                    return;
+                }
+                // Export standalone type
+                const baseName = pathForExport.substring(0, pathForExport.length - 5);
+                exportKey = `./${baseName}`;
+                exportMap[exportKey] = fullPath;
+            }
+            totalFilesFound++;
+        });
+    });
+    // SORTING
+    const sortedExports = Object.keys(exportMap)
+        .sort()
+        .reduce((obj, key) => {
+        obj[key] = exportMap[key];
+        return obj;
+    }, {});
+    // WRITE
+    pkg.exports = sortedExports;
+    delete pkg.typesVersions; // Clean up legacy field
+    fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
+    console.log(`✅ Scanned [${dirsToScan.join(', ')}]`);
+    console.log(`✅ Generated ${Object.keys(sortedExports).length} exports in package.json`);
+}
+run();

package/lib/library-scripts.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+export {};
+//# sourceMappingURL=library-scripts.d.ts.map

package/{library-scripts.js → lib/library-scripts.js}

@@ -1,4 +1,4 @@
-#! /usr/bin/env node
+#!/usr/bin/env node
 import { spawnSync } from 'node:child_process';
 import { createRequire } from 'node:module';
 import yargs from 'yargs';
@@ -7,9 +7,9 @@ const require = createRequire(import.meta.url);
 const args = hideBin(process.argv);
 yargs(args)
     .command({
-    command: 'build',
+    command: 'exports',
     handler: () => {
-        const result = spawnSync('node', [require.resolve('./build'), ...args.slice(1)], {
+        const result = spawnSync('node', [require.resolve('./exports'), ...args.slice(1)], {
             stdio: 'inherit',
         });
         if (result.status) {

package/lib/setupTests.vite.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setupTests.vite.d.ts","sourceRoot":"","sources":["../src/setupTests.vite.ts"],"names":[],"mappings":"AACA,OAAO,kCAAkC,CAAC;AAE1C,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC7B;CACF"}

package/lib/setupTests.vite.js

@@ -0,0 +1,34 @@
+import { vi } from 'vitest';
+import '@testing-library/jest-dom/vitest';
+window.HN = {
+    Page: {},
+    Rest: {},
+    User: {},
+    Commands: {},
+    PortalCommands: {},
+};
+const MatchMediaMock = vi.fn((query) => ({
+    matches: query !== '(prefers-reduced-motion)',
+    addListener: vi.fn(),
+    addEventListener: vi.fn(),
+    removeEventListener: vi.fn(),
+}));
+vi.stubGlobal('matchMedia', MatchMediaMock);
+const IntersectionObserverMock = vi.fn(class {
+    observe = vi.fn();
+    unobserve = vi.fn();
+    disconnect = vi.fn();
+});
+vi.stubGlobal('IntersectionObserver', IntersectionObserverMock);
+const ResizeObserverMock = vi.fn(class {
+    observe = vi.fn();
+    unobserve = vi.fn();
+    disconnect = vi.fn();
+});
+vi.stubGlobal('ResizeObserver', ResizeObserverMock);
+const MutationObserverMock = vi.fn(class {
+    observe = vi.fn();
+    disconnect = vi.fn();
+});
+vi.stubGlobal('MutationObserver', MutationObserverMock);
+window.HTMLElement.prototype.scrollIntoView = vi.fn();

package/lib/vitest.config.d.ts

@@ -0,0 +1,5 @@
+import { type ViteUserConfigFn } from 'vitest/config';
+export declare const getConfig: ViteUserConfigFn;
+declare const _default: import("vitest/config").ViteUserConfigExport;
+export default _default;
+//# sourceMappingURL=vitest.config.d.ts.map

package/{vitest.config.d.ts.map → lib/vitest.config.d.ts.map}

@@ -1 +1 @@
-{"version":3,"file":"vitest.config.d.ts","sourceRoot":"","sources":["../src/vitest.config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAwC,MAAM,eAAe,CAAC;AAExF,eAAO,MAAM,SAAS,EAAE,YAmCvB,CAAC;;AAEF,wBAAmD"}
+{"version":3,"file":"vitest.config.d.ts","sourceRoot":"","sources":["../src/vitest.config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,gBAAgB,EAAwC,MAAM,eAAe,CAAC;AAE5F,eAAO,MAAM,SAAS,EAAE,gBAmCvB,CAAC;;AAEF,wBAAmD"}

package/{vitest.config.js → lib/vitest.config.js}

@@ -13,7 +13,7 @@ export const getConfig = () => {
                     url: 'http://tjenester.helsenorge.utvikling',
                 },
             },
-            setupFiles: ['node_modules/@helsenorge/library-build/setupTests.vite'],
+            setupFiles: ['@helsenorge/library-build/setupTests.vite'],
             css: {
                 modules: {
                     classNameStrategy: 'non-scoped',
@@ -31,7 +31,7 @@ export const getConfig = () => {
             },
             server: {
                 deps: {
-                    inline: ['@helsenorge/designsystem-react', '@helsenorge/datepicker', '@helsenorge/lightbox', '@portabletext/react'],
+                    inline: [/@helsenorge/, '@portabletext/react'],
                 },
             },
         },

package/package.json

@@ -1,46 +1,91 @@
 {
   "name": "@helsenorge/library-build",
+  "version": "38.0.2",
+  "publishConfig": {
+    "access": "public"
+  },
   "author": "Norsk helsenett SF",
-  "version": "37.1.0",
-  "type": "module",
-  "sideEffects": false,
+  "maintainers": [
+    "ROX"
+  ],
+  "description": "Bygg og test av komponentbibliotek",
+  "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/helsenorge/core-frontend-packages"
+    "url": "git+https://github.com/helsenorge/core-frontend-packages.git"
   },
   "bin": {
-    "library-scripts": "./library-scripts.js"
+    "library-scripts": "./lib/library-scripts.js"
+  },
+  "files": [
+    "config",
+    "lib"
+  ],
+  "exports": {
+    "./config/tsconfig.global.json": "./config/tsconfig.global.json",
+    "./config/tsconfig.node.json": "./config/tsconfig.node.json",
+    "./config/tsconfig.vite.json": "./config/tsconfig.vite.json",
+    "./copy": "./lib/copy.js",
+    "./exports": "./lib/exports.js",
+    "./library-scripts": "./lib/library-scripts.js",
+    "./package.json": "./package.json",
+    "./setupTests.vite": "./lib/setupTests.vite.js",
+    "./vite.config": "./lib/vite.config.js",
+    "./vitest.config": "./lib/vitest.config.js"
+  },
+  "type": "module",
+  "sideEffects": false,
+  "scripts": {
+    "clean": "rimraf lib",
+    "prebuild": "npm run clean",
+    "build": "tsc",
+    "postbuild": "npm-run-all chmod exports",
+    "chmod": "chmod +x lib/library-scripts.js",
+    "exports": "node ./lib/library-scripts.js exports",
+    "watch": "tsc --watch",
+    "eslint": "eslint src/**/*.{js,jsx,ts,tsx}",
+    "eslint:fix": "npm run eslint -- --fix",
+    "prettier": "prettier --check \"src/**/*.{ts,tsx,js,jsx,css,scss,md,json}\"",
+    "prettier:fix": "npm run prettier -- --write",
+    "pretypecheck": "tsc -v",
+    "typecheck": "tsc --noEmit"
   },
-  "license": "MIT",
   "peerDependencies": {
-    "react": "^18.0.0 || ^19.0.0",
-    "react-dom": "^18.0.0 || ^19.0.0"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^24.12.0",
+    "@types/yargs": "^17.0.35",
+    "npm-run-all2": "^8.0.4",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4"
   },
   "dependencies": {
-    "@helsenorge/eslint-config": "^37.1.0",
-    "@helsenorge/typed-scss-modules": "^9.0.7",
+    "@helsenorge/eslint-config": "^38.0.2",
+    "@helsenorge/typed-scss-modules": "^9.0.9",
     "@testing-library/jest-dom": "^6.9.1",
-    "@testing-library/react": "^16.3.0",
+    "@testing-library/react": "^16.3.2",
     "@testing-library/user-event": "^14.6.1",
     "@types/copyfiles": "^2.4.4",
-    "@types/react": "^19.2.6",
+    "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^5.1.1",
-    "@vitest/coverage-v8": "^3.2.4",
+    "@vitejs/plugin-react": "^5.1.4",
+    "@vitest/coverage-v8": "^4.0.18",
     "copyfiles": "^2.4.1",
-    "esbuild": "~0.27.0",
     "jsdom": "^26.1.0",
-    "node-fetch": "^3.3.2",
-    "rimraf": "^6.1.2",
-    "sass": "^1.94.2",
-    "sass-embedded": "^1.93.3",
+    "rimraf": "^6.1.3",
+    "sass": "^1.98.0",
+    "sass-embedded": "^1.98.0",
     "typescript": "~5.9.3",
-    "vite": "^7.2.4",
-    "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.2.4",
+    "vite": "^7.3.1",
+    "vite-tsconfig-paths": "^6.1.1",
+    "vitest": "^4.0.18",
     "yargs": "^18.0.0"
   },
-  "publishConfig": {
-    "access": "public"
+  "engineStrict": true,
+  "engines": {
+    "node": "^22.0.0 || ^24.0.0",
+    "npm": ">=10.0.0"
   }
-}
+}

package/build.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=build.d.ts.map

package/build.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":""}

package/build.js

@@ -1,24 +0,0 @@
-import { existsSync, mkdirSync } from 'fs';
-import esbuild from 'esbuild';
-import yargs from 'yargs';
-import { hideBin } from 'yargs/helpers';
-(async () => {
-    const { entry, outDir, tsconfig } = await yargs(hideBin(process.argv))
-        .options({
-        entry: { type: 'string', default: 'src/__devonly__/index.tsx' },
-        outDir: { type: 'string', default: 'dist' },
-        tsconfig: { type: 'string', default: 'tsconfig.json' },
-    })
-        .parse();
-    if (!existsSync(outDir)) {
-        mkdirSync(outDir);
-    }
-    await esbuild.build({
-        format: 'esm',
-        entryPoints: [entry],
-        outdir: outDir,
-        tsconfig: tsconfig,
-        bundle: true,
-        external: ['*'],
-    });
-})();

package/files.d.ts

@@ -1,6 +0,0 @@
-/**
- * Function used to create the package.json file under /lib
- * @param packageName - the name field in package.json (for example: @helsenorge/step')
- */
-export declare function createPackageJsonFile(packageName: string, inputPath: string, outputPath: string): Promise<string>;
-//# sourceMappingURL=files.d.ts.map

package/files.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../src/files.ts"],"names":[],"mappings":"AAkBA;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA2CjH"}

package/files.js

@@ -1,47 +0,0 @@
-import { readFile, writeFile } from 'fs';
-/**
- * Function used to create the package.json file under /lib
- * @param packageName - the name field in package.json (for example: @helsenorge/step')
- */
-export function createPackageJsonFile(packageName, inputPath, outputPath) {
-    return new Promise((resolve) => {
-        readFile(inputPath, 'utf8', (err, data) => {
-            if (err) {
-                throw err;
-            }
-            resolve(data);
-        });
-    })
-        .then((data) => JSON.parse(data))
-        .then((packageData) => {
-        const { author, version, main, sideEffects, repository, bin, peerDependencies, license, dependencies, publishConfig } = packageData;
-        const minimalPackage = {
-            name: packageName,
-            author,
-            version,
-            main,
-            type: ['@helsenorge/core-build', '@helsenorge/library-build'].includes(packageName) ? 'module' : undefined,
-            sideEffects,
-            repository,
-            bin,
-            license,
-            peerDependencies,
-            dependencies,
-        };
-        if (publishConfig?.access) {
-            minimalPackage.publishConfig = {
-                access: publishConfig.access,
-            };
-        }
-        return new Promise(resolve => {
-            const data = JSON.stringify(minimalPackage, null, 2);
-            writeFile(outputPath, data, err => {
-                if (err)
-                    throw err;
-                // eslint-disable-next-line no-console
-                console.log(`Created package.json in ${outputPath}`);
-                resolve(outputPath);
-            });
-        });
-    });
-}

package/library-scripts.d.ts

@@ -1,3 +0,0 @@
-#! /usr/bin/env node
-export {};
-//# sourceMappingURL=library-scripts.d.ts.map

package/setupTests.vite.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"setupTests.vite.d.ts","sourceRoot":"","sources":["../src/setupTests.vite.ts"],"names":[],"mappings":"AAEA,OAAO,kCAAkC,CAAC;AAe1C,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC7B;CACF"}

package/setupTests.vite.js

@@ -1,47 +0,0 @@
-import fetchPolyfill, { Request as RequestPolyfill } from 'node-fetch';
-import { vi } from 'vitest';
-import '@testing-library/jest-dom/vitest';
-// @todo: Fjern etter oppdatering til vitest 4, fjern da også dependency til node-fetch
-// https://github.com/reduxjs/redux-toolkit/issues/4966#issuecomment-3115230061
-Object.defineProperty(global, 'fetch', {
-    // MSW will overwrite this to intercept requests
-    writable: true,
-    value: fetchPolyfill,
-});
-Object.defineProperty(global, 'Request', {
-    writable: false,
-    value: RequestPolyfill,
-});
-window.HN = {
-    Page: {},
-    Rest: {},
-    User: {},
-    Commands: {},
-    PortalCommands: {},
-};
-const MatchMediaMock = vi.fn((query) => ({
-    // @todo Her burde vi finne ut i hvilke tilfeller den skal være true, og bare sette den til true i de tilfellene
-    matches: query !== '(prefers-reduced-motion)',
-    addListener: vi.fn(),
-    addEventListener: vi.fn(),
-    removeEventListener: vi.fn(),
-}));
-vi.stubGlobal('matchMedia', MatchMediaMock);
-const IntersectionObserverMock = vi.fn(() => ({
-    observe: vi.fn(),
-    unobserve: vi.fn(),
-    disconnect: vi.fn(),
-}));
-vi.stubGlobal('IntersectionObserver', IntersectionObserverMock);
-const ResizeObserverMock = vi.fn(() => ({
-    observe: vi.fn(),
-    unobserve: vi.fn(),
-    disconnect: vi.fn(),
-}));
-vi.stubGlobal('ResizeObserver', ResizeObserverMock);
-const MutationObserverMock = vi.fn(() => ({
-    observe: vi.fn(),
-    disconnect: vi.fn(),
-}));
-vi.stubGlobal('MutationObserver', MutationObserverMock);
-window.HTMLElement.prototype.scrollIntoView = vi.fn();

package/vitest.config.d.ts

@@ -1,5 +0,0 @@
-import { type UserConfigFn } from 'vitest/config';
-export declare const getConfig: UserConfigFn;
-declare const _default: import("vitest/config").UserConfigExport;
-export default _default;
-//# sourceMappingURL=vitest.config.d.ts.map