@navikt/aksel 7.35.3 → 7.36.0

package/dist/darkside/config/TokenStatus.js

@@ -29,6 +29,7 @@ class TokenStatus {
             js: { legacy: [], updated: [] },
             tailwind: { legacy: [], updated: [] },
             component: { legacy: [], updated: [] },
+            deprecated: { legacy: [], updated: [] },
         };
     }
     add(_a) {
@@ -50,6 +51,12 @@ class TokenStatus {
             case "tailwind":
                 this.status.tailwind[statusType].push(hit);
                 break;
+            case "component":
+                this.status.component[statusType].push(hit);
+                break;
+            case "deprecated":
+                this.status.deprecated[statusType].push(hit);
+                break;
         }
     }
     printStatusForAll() {
@@ -136,9 +143,15 @@ class TokenStatus {
         }
         const componentTokens = this.status.component.legacy.length;
         if (componentTokens > 0) {
-            console.info(chalk_1.default.underline(`COMPONENT Tokens Migration`));
-            console.info(`We no longer support component tokens. Please migrate to the new darkside tokens. using theming or other methods.`);
-            console.info(`You can read more at https://aksel.nav.no/darkside`);
+            console.info(chalk_1.default.underline(`\nCOMPONENT Tokens Migration`));
+            console.info(`${chalk_1.default.yellow("!")} Found ${componentTokens} component token definition${componentTokens > 1 ? "s" : ""} that require manual migration.`);
+            console.info(`We no longer support component tokens. Please migrate to the new darkside tokens using theming or other methods.`);
+        }
+        const deprecatedTokens = this.status.deprecated.legacy.length;
+        if (deprecatedTokens > 0) {
+            console.info(chalk_1.default.underline(`\nLEGACY TOKEN DEFINITIONS (--a-token:)`));
+            console.info(`${chalk_1.default.yellow("!")} Found ${deprecatedTokens} legacy token definition${deprecatedTokens > 1 ? "s" : ""} that require manual migration.`);
+            console.info(`These are custom property definitions using legacy tokens that need to be updated to use new darkside tokens.`);
         }
     }
 }

package/dist/darkside/tasks/status.js

@@ -39,6 +39,11 @@ function getStatus(files, action = "print") {
      * Pre-computed regex for legacy component tokens
      */
     const legacyRegex = new RegExp(`(${legacy_component_tokens_1.legacyComponentTokenList.map((t) => `${t}:`).join("|")})`, "gm");
+    /**
+     * Pre-computed regex for legacy token definitions (--a-token:)
+     * These are custom property definitions that need manual migration.
+     */
+    const legacyDefinitionRegex = /(--a-[a-zA-Z0-9-]+)(?=\s*:)/gm;
     /**
      * Process each file to find and record token usages
      */
@@ -127,6 +132,31 @@ function getStatus(files, action = "print") {
                 legacyMatch = legacyRegex.exec(fileSrc);
             }
         }
+        /**
+         * Detect legacy token definitions (--a-token:)
+         * These are custom property definitions using legacy tokens
+         * that need manual intervention from the user.
+         */
+        legacyDefinitionRegex.lastIndex = 0;
+        let definitionMatch = legacyDefinitionRegex.exec(fileSrc);
+        while (definitionMatch !== null) {
+            const tokenKey = definitionMatch[1].replace("--a-", "");
+            /* Only report if it's a known legacy token */
+            if (legacy_tokens_1.legacyTokenConfig[tokenKey]) {
+                const { row, column } = getCharacterPositionInFile(definitionMatch.index, getLineStartsLazy());
+                StatusStore.add({
+                    isLegacy: true,
+                    type: "deprecated",
+                    columnNumber: column,
+                    lineNumber: row,
+                    canAutoMigrate: false,
+                    fileName,
+                    name: definitionMatch[1],
+                    comment: "Legacy token definition - requires manual migration to new darkside tokens",
+                });
+            }
+            definitionMatch = legacyDefinitionRegex.exec(fileSrc);
+        }
         for (const [newTokenName, config] of Object.entries(darkside_tokens_1.darksideTokenConfig)) {
             const terms = darksideSearchTerms.get(newTokenName);
             /* Optimization: Check if any of the search terms exist in the file words set */

package/dist/darkside/transforms/darkside-tokens-css.js

@@ -5,22 +5,11 @@ const legacy_tokens_1 = require("../config/legacy.tokens");
 function transformer(file) {
     let src = file.source;
     /*
-      1. Replace definitions: --a-token: -> --aksel-legacy__a-token:
-      Matches "--a-token" followed by optional whitespace and a colon.
-      Uses negative lookbehind to ensure we don't match "--not-a-token".
-    */
-    src = src.replace(/(?<![\w-])(--a-[\w-]+)(\s*:)/g, (match, tokenName, suffix) => {
-        const key = tokenName.replace("--a-", "");
-        if (legacy_tokens_1.legacyTokenConfig[key]) {
-            return `--aksel-legacy${tokenName.replace("--", "__")}${suffix}`;
-        }
-        return match;
-    });
-    /*
-      2. Replace usages: --a-token -> --ax-replacement
+      Replace usages: --a-token -> --ax-replacement
       Matches "--a-token" with word boundaries.
+      Uses negative lookahead to skip definitions (--a-token:)
     */
-    src = src.replace(/(?<![\w-])(--a-[\w-]+)(?![\w-])/g, (match, tokenName) => {
+    src = src.replace(/(?<![\w-])(--a-[\w-]+)(?![\w-])(?!\s*:)/g, (match, tokenName) => {
         const key = tokenName.replace("--a-", "");
         const config = legacy_tokens_1.legacyTokenConfig[key];
         if (config === null || config === void 0 ? void 0 : config.replacement) {

package/dist/index.js

@@ -15,16 +15,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
 const commander_1 = require("commander");
-const node_fs_1 = __importDefault(require("node:fs"));
 const index_1 = require("./codemod/index");
 const darkside_1 = require("./darkside");
 const help_1 = require("./help");
+const version_1 = require("./version");
 run();
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
-        const pkg = JSON.parse(node_fs_1.default.readFileSync("./package.json").toString()).version;
         const program = new commander_1.Command();
-        program.version(pkg, "-v, --version");
+        program.version(version_1.VERSION, "-v, --version");
         program.allowUnknownOption().helpOption(false);
         program.parse();
         const args = program.args;

package/dist/version.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VERSION = void 0;
+exports.VERSION = "7.36.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel",
-  "version": "7.35.3",
+  "version": "7.36.0",
   "description": "Aksel command line interface. Codemods and other utilities for Aksel users.",
   "author": "Aksel | Nav designsystem team",
   "license": "MIT",
@@ -16,8 +16,9 @@
   ],
   "scripts": {
     "clean": "rimraf dist",
-    "build": "yarn clean && tsc -p tsconfig.json",
-    "dev": "tsc --watch -p tsconfig.json",
+    "generate-version": "node -e \"const fs=require('fs');const v=require('./package.json').version;fs.writeFileSync('src/version.ts','export const VERSION = \\\"'+v+'\\\";\\n')\"",
+    "build": "yarn clean && yarn generate-version && tsc -p tsconfig.json",
+    "dev": "yarn generate-version && tsc --watch -p tsconfig.json",
     "test": "vitest run",
     "test:watch": "vitest watch"
   },
@@ -32,9 +33,8 @@
     "url": "https://github.com/navikt/aksel/issues"
   },
   "dependencies": {
-    "@navikt/ds-css": "^7.35.3",
-    "@navikt/ds-tokens": "^7.35.3",
-    "axios": "1.13.2",
+    "@navikt/ds-css": "^7.36.0",
+    "@navikt/ds-tokens": "^7.36.0",
     "chalk": "5.6.2",
     "cli-progress": "3.12.0",
     "clipboardy": "5.0.1",