@navikt/aksel 8.2.0 → 8.2.2

package/README.md

@@ -23,6 +23,20 @@ npx @navikt/aksel codemod --help
 
 ### v8
 
+#### Tokens
+
+`npx @navikt/aksel codemod v8-tokens ...`
+
+Starts interactive token migration.
+
+```diff
+-margin: var(--a-spacing-1);
++margin: var(--ax-space-4);
+
+-background-color: var(--a-surface-subtle);
++background-color: var(--ax-bg-neutral-soft);
+```
+
 #### Box
 
 `npx @navikt/aksel codemod v8-box ...`
@@ -84,24 +98,17 @@ Updates variant + data-color props based on current variant prop.
 +<Tag variant="outline" data-color="info">
 ```
 
-#### Spacing
+#### Spacing on primitives
 
 `npx @navikt/aksel codemod v8-primitive-spacing ...`
-`npx @navikt/aksel codemod v8-token-spacing ...`
-`npx @navikt/aksel codemod v8-token-spacing-js ...`
 
-Updates use of legacy `spacing` token to new `space`-token
+Updates all primitives to new `space`-tokens.
 
 ```diff
--<HStack gap="spacing-4" />
+-<HStack gap="4" />
 +<HStack gap="space-16" />
 ```
 
-```diff
--margin: var(--a-spacing-1);
-+margin: var(--ax-space-4);
-```
-
 ### v6
 
 #### Chat

package/dist/codemod/migrations.js

@@ -144,23 +144,11 @@ exports.migrations = {
             ignoredExtensions: CSS_EXTENSIONS,
         },
         {
-            description: "Updates all Primitives to use new `space`-tokens. (Works with old and new system)",
+            description: "Updates all Primitives to use new `space`-tokens.",
             value: "v8-primitive-spacing",
             path: "v8.0.0/primitives-spacing/spacing",
             ignoredExtensions: CSS_EXTENSIONS,
         },
-        {
-            description: "Updates css, scss and less-variables to use new `space`-tokens. (Works with old and new system)",
-            value: "v8-token-spacing",
-            path: "v8.0.0/token-spacing/spacing",
-            ignoredExtensions: [],
-        },
-        {
-            description: "Updates js-tokens to use new `space`-tokens. (Works with old and new system)",
-            value: "v8-token-spacing-js",
-            path: "v8.0.0/token-spacing-js/spacing",
-            ignoredExtensions: CSS_EXTENSIONS,
-        },
         {
             description: "Updates variant + data-color props on Tag based on current variant prop.",
             value: "v8-tag-variant",

package/dist/codemod/run-version-migration.js

@@ -68,6 +68,11 @@ overrideHandler) {
             console.info(chalk_1.default.yellow("\nNo migrations selected. Exiting."));
             return;
         }
+        // Hack: 'v8-tokens' needs to run last because it's interactive
+        if (selectedMigrations.includes("v8-tokens")) {
+            selectedMigrations.splice(selectedMigrations.indexOf("v8-tokens"), 1);
+            selectedMigrations.push("v8-tokens");
+        }
         console.info(chalk_1.default.gray(`\nRunning ${selectedMigrations.length} migration(s): ${selectedMigrations.join(", ")}\n`));
         (0, validation_js_1.validateGit)(options, program);
         for (const migration of selectedMigrations) {

package/dist/codemod/v8-tokens/run-tooling.js

@@ -280,7 +280,7 @@ function getNextTask(status) {
                 message: getMessage("Migrate tailwind tokens", (_k = (_j = status === null || status === void 0 ? void 0 : status.tailwind) === null || _j === void 0 ? void 0 : _j.legacy) !== null && _k !== void 0 ? _k : []),
                 name: "tailwind-tokens",
             },
-            { message: "Run all migrations", name: "run-all-migrations" },
+            { message: "Run all token migrations", name: "run-all-migrations" },
             { message: "Exit", name: "exit" },
         ];
         try {

package/dist/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel",
-  "version": "8.2.0",
+  "version": "8.2.2",
   "description": "Aksel command line interface. Codemods and other utilities for Aksel users.",
   "author": "Aksel | Nav designsystem team",
   "license": "MIT",
@@ -33,8 +33,8 @@
     "url": "https://github.com/navikt/aksel/issues"
   },
   "dependencies": {
-    "@navikt/ds-css": "^8.2.0",
-    "@navikt/ds-tokens": "^8.2.0",
+    "@navikt/ds-css": "^8.2.2",
+    "@navikt/ds-tokens": "^8.2.2",
     "chalk": "5.6.2",
     "cli-progress": "3.12.0",
     "clipboardy": "5.0.1",

package/dist/codemod/transforms/v8.0.0/token-spacing/spacing.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = transformer;
-const translate_token_1 = require("../../../utils/translate-token");
-const spacing_utils_1 = require("../spacing.utils");
-function transformer(file) {
-    let src = file.source;
-    spacing_utils_1.legacySpacingTokenMap.forEach((newVar, oldVar) => {
-        const oldCSSVar = `--a-spacing-${oldVar}`;
-        const newCSSVar = `--a-space-${newVar}`;
-        const CSSRgx = new RegExp("(" + oldCSSVar + ")", "gm");
-        const SCSSRgx = new RegExp("(\\" + (0, translate_token_1.translateToken)(oldCSSVar, "scss") + ")", "gm");
-        const LESSRgx = new RegExp("(" + (0, translate_token_1.translateToken)(oldCSSVar, "less") + ")", "gm");
-        src = src.replace(CSSRgx, newCSSVar);
-        src = src.replace(SCSSRgx, (0, translate_token_1.translateToken)(newCSSVar, "scss"));
-        src = src.replace(LESSRgx, (0, translate_token_1.translateToken)(newCSSVar, "less"));
-    });
-    return src;
-}

package/dist/codemod/transforms/v8.0.0/token-spacing-js/spacing.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = transformer;
-const ast_1 = require("../../../utils/ast");
-const lineterminator_1 = require("../../../utils/lineterminator");
-const translate_token_1 = require("../../../utils/translate-token");
-const spacing_utils_1 = require("../spacing.utils");
-function transformer(file, api) {
-    const j = api.jscodeshift;
-    let root = j(file.source);
-    spacing_utils_1.legacySpacingTokenMap.forEach((newVar, oldVar) => {
-        const oldCSSVar = (0, translate_token_1.translateToken)(`--a-spacing-${oldVar}`, "js");
-        const newCSSVar = (0, translate_token_1.translateToken)(`--a-space-${newVar}`, "js");
-        const name = (0, ast_1.findComponentImport)({
-            root,
-            j,
-            name: oldCSSVar,
-            packageType: "tokens",
-        });
-        if (!name) {
-            return;
-        }
-        let code = root.toSource((0, lineterminator_1.getLineTerminator)(file.source));
-        const rgx = new RegExp("(" + oldCSSVar + ")", "gm");
-        code = code.replace(rgx, newCSSVar);
-        root = j(code);
-    });
-    return root.toSource((0, lineterminator_1.getLineTerminator)(file.source));
-}