@navikt/aksel 2.9.1 → 2.9.3-beta.1

package/dist/css-imports/index.js

@@ -1,3 +1,4 @@
+"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -7,19 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { StyleMappings } from "@navikt/ds-css/config/_mappings.js";
-import { generateImportOutput } from "./generate-output.js";
-import { ComponentPrefix } from "./config.js";
-import { inquiry } from "./inquiry.js";
-import { exec } from "child_process";
-import { fileURLToPath } from "url";
-import { dirname } from "path";
-import { getAllVersions } from "./get-version.js";
-import chalk from "chalk";
-import { getDirectories } from "./get-directories.js";
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-export function cssImportsCommand() {
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cssImportsCommand = void 0;
+const _mappings_1 = require("@navikt/ds-css/config/_mappings");
+const generate_output_1 = require("./generate-output");
+const config_1 = require("./config");
+const inquiry_1 = require("./inquiry");
+const child_process_1 = require("child_process");
+const chalk_1 = __importDefault(require("chalk"));
+const get_directories_1 = require("./get-directories");
+const get_version_1 = require("./get-version");
+function cssImportsCommand() {
     return __awaiter(this, void 0, void 0, function* () {
         let answers = {
             "config-type": "regular",
@@ -32,7 +34,7 @@ export function cssImportsCommand() {
             imports: null,
             output: "print-clipboard",
         };
-        yield inquiry(answers, [
+        yield (0, inquiry_1.inquiry)(answers, [
             {
                 type: "select",
                 name: "config-type",
@@ -44,7 +46,7 @@ export function cssImportsCommand() {
                     { message: "Full control (global + components)", name: "advanced" },
                 ],
                 footer() {
-                    return chalk.grey(`${chalk.cyan(`\n  Documentation:`)}\n  Regular: https://aksel.nav.no/grunnleggende/kode/css-import
+                    return chalk_1.default.grey(`${chalk_1.default.cyan(`\n  Documentation:`)}\n  Regular: https://aksel.nav.no/grunnleggende/kode/css-import
   Partial: https://aksel.nav.no/grunnleggende/kode/css-import#h64650b1a4ad6
   Full: https://aksel.nav.no/grunnleggende/kode/css-import#h4037598416ef\n`);
                 },
@@ -61,7 +63,7 @@ export function cssImportsCommand() {
             },
         ]);
         if ((answers === null || answers === void 0 ? void 0 : answers.cdn) === "no") {
-            yield inquiry(answers, [
+            yield (0, inquiry_1.inquiry)(answers, [
                 {
                     type: "select",
                     name: "tailwind",
@@ -85,10 +87,10 @@ export function cssImportsCommand() {
             ]);
         }
         else {
-            let versions = (yield getAllVersions()).filter((x) => !x.includes("-"));
+            let versions = (yield (0, get_version_1.getAllVersions)()).filter((x) => !x.includes("-"));
             const index = versions.findIndex((x) => x.startsWith("2.9.0"));
             versions = versions.slice(index).reverse();
-            yield inquiry(answers, [
+            yield (0, inquiry_1.inquiry)(answers, [
                 {
                     type: "autocomplete",
                     name: "version",
@@ -97,17 +99,17 @@ export function cssImportsCommand() {
                     initial: 0,
                     choices: versions,
                     footer() {
-                        return chalk.grey('Remember to match version with @navikt/ds-react!\nNote: CDN was introduced in v2.9.0, older versions not available.\nUse "static" import instead.');
+                        return chalk_1.default.grey('Remember to match version with @navikt/ds-react!\nNote: CDN was introduced in v2.9.0, older versions not available.\nUse "static" import instead.');
                     },
                 },
             ]);
         }
         if (answers["config-type"] === "regular") {
-            yield generateImportOutput(answers);
+            yield (0, generate_output_1.generateImportOutput)(answers);
             return;
         }
         answers["config-type"] === "advanced" &&
-            (yield inquiry(answers, [
+            (yield (0, inquiry_1.inquiry)(answers, [
                 {
                     type: "select",
                     name: "autoscan",
@@ -120,44 +122,44 @@ export function cssImportsCommand() {
                 },
             ]));
         answers.autoscan === "yes" &&
-            (yield inquiry(answers, [
+            (yield (0, inquiry_1.inquiry)(answers, [
                 {
                     type: "autocomplete",
                     name: "scandir",
                     message: `Directory to scan`,
                     limit: 6,
                     initial: 0,
-                    choices: getDirectories(),
+                    choices: (0, get_directories_1.getDirectories)(),
                     footer() {
-                        return chalk.grey("filtered out: node_moduels, dist, build, lib, .* (dotfiles)");
+                        return chalk_1.default.grey("filtered out: node_moduels, dist, build, lib, .* (dotfiles)");
                     },
                 },
             ]));
         let foundComponents = [];
         if (answers["autoscan"] === "yes") {
             foundComponents = yield new Promise((resolve) => {
-                exec(`node ${__dirname}/scan-code.js ${answers.scandir}`, (_, stdout) => {
+                (0, child_process_1.exec)(`node ${__dirname}/scan-code.js ${answers.scandir}`, (_, stdout) => {
                     resolve(stdout ? JSON.parse(stdout.trim().split("\n").slice(1).join("")) : []);
                 });
             });
         }
-        yield inquiry(answers, [
+        yield (0, inquiry_1.inquiry)(answers, [
             {
                 type: "multiselect",
                 name: "imports",
                 message: "Imports",
                 initial: [
-                    ...StyleMappings.baseline.map((x) => x.main.replace(".css", "")),
-                    ...StyleMappings.components
+                    ..._mappings_1.StyleMappings.baseline.map((x) => x.main.replace(".css", "")),
+                    ..._mappings_1.StyleMappings.components
                         .filter((x) => foundComponents.includes(x.component))
-                        .map((x) => `${ComponentPrefix}${x.component}`),
+                        .map((x) => `${config_1.ComponentPrefix}${x.component}`),
                 ],
                 choices: [
                     {
                         message: "Default-imports",
                         name: "default",
                         choices: [
-                            ...StyleMappings.baseline.map((x) => ({
+                            ..._mappings_1.StyleMappings.baseline.map((x) => ({
                                 message: `${x.main.replace(".css", "")}${x.optional ? "" : " (required)"}`,
                                 name: x.main.replace(".css", ""),
                             })),
@@ -169,9 +171,9 @@ export function cssImportsCommand() {
                                 message: "Components",
                                 name: "components",
                                 choices: [
-                                    ...StyleMappings.components.map((x) => ({
+                                    ..._mappings_1.StyleMappings.components.map((x) => ({
                                         message: x.component,
-                                        name: `${ComponentPrefix}${x.component}`,
+                                        name: `${config_1.ComponentPrefix}${x.component}`,
                                     })),
                                 ],
                             },
@@ -180,6 +182,7 @@ export function cssImportsCommand() {
                 ],
             },
         ]);
-        yield generateImportOutput(answers);
+        yield (0, generate_output_1.generateImportOutput)(answers);
     });
 }
+exports.cssImportsCommand = cssImportsCommand;

package/dist/css-imports/inquiry.js

@@ -1,3 +1,4 @@
+"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -7,11 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import Enquirer from "enquirer";
-import chalk from "chalk";
-export function inquiry(answers, questions) {
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.inquiry = void 0;
+const enquirer_1 = __importDefault(require("enquirer"));
+const chalk_1 = __importDefault(require("chalk"));
+function inquiry(answers, questions) {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield Enquirer.prompt(questions.map((x) => (Object.assign(Object.assign({}, x), { cancel: () => process.exit(1), header: `\n${chalk.gray("Command 'css-imports' will not edit your files directly!")}\n` }))))
+        return yield enquirer_1.default.prompt(questions.map((x) => (Object.assign(Object.assign({}, x), { cancel: () => process.exit(1), header: `\n${chalk_1.default.gray("Command 'css-imports' will not edit your files directly!")}\n` }))))
             .then((a) => {
             Object.entries(a).forEach(([key, value]) => {
                 answers[key] = value;
@@ -27,3 +33,4 @@ export function inquiry(answers, questions) {
         });
     });
 }
+exports.inquiry = inquiry;

package/dist/css-imports/scan-code.js

@@ -1,3 +1,4 @@
+"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -7,8 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import path from "path";
-import scanner from "react-scanner";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const react_scanner_1 = __importDefault(require("react-scanner"));
 run();
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -21,13 +26,13 @@ function scanCode() {
         const cwd = process.cwd();
         const config = {
             rootDir: cwd,
-            crawlFrom: `${(_a = process.argv[2]) !== null && _a !== void 0 ? _a : ""}`.replace(path.basename(cwd), "."),
+            crawlFrom: `${(_a = process.argv[2]) !== null && _a !== void 0 ? _a : ""}`.replace(path_1.default.basename(cwd), "."),
             globs: ["**/!(*.test|*.spec|*.stories|*.story).@(jsx|tsx)"],
             exclude: (dirname) => dirname === "node_modules",
-            getComponentName: ({ imported, moduleName, }) => imported || path.basename(moduleName),
+            getComponentName: ({ imported, moduleName, }) => imported || path_1.default.basename(moduleName),
         };
         let result = null;
-        yield scanner
+        yield react_scanner_1.default
             .run(Object.assign(Object.assign({}, config), { importedFrom: /@navikt\/ds-react/, processors: [
                 "count-components",
                 ({ report }) => {

package/dist/help.js

@@ -1,15 +1,26 @@
-import chalk from "chalk";
-export function helpCommand() {
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.helpCommand = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+const figlet_1 = __importDefault(require("figlet"));
+function helpCommand() {
+    console.log(figlet_1.default.textSync("Aksel CLI"));
     console.log(`
-✨ Aksel client-tool
-
 📝 Documentation
-   - ${chalk.blueBright("https://aksel.nav.no/grunnleggende/kode/kommandolinje")}
+   - ${chalk_1.default.blueBright("https://aksel.nav.no/grunnleggende/kode/kommandolinje")}
 
 💻 Commands:
-   - ${chalk.cyan(`npx @navikt/aksel ${chalk.green("css-imports")}`)}
+   - ${chalk_1.default.cyan(`npx @navikt/aksel ${chalk_1.default.green("css-imports")}`)}
    ✔︎ Helps with CSS imports for all Aksel components
    ✔︎ Supports Static and CDN-imports
    ✔︎ Handles cascading, tailwind and @layer rules
+
+   - ${chalk_1.default.cyan(`npx @navikt/aksel ${chalk_1.default.green("codemod")} ${chalk_1.default.gray("<migration>")}`)}
+   ✔︎ Code-transformations for breaking changes when updating Aksel
+   ✔︎ Run with ${chalk_1.default.cyan(`${chalk_1.default.green("--help")}`)} to get started!
 `);
 }
+exports.helpCommand = helpCommand;

package/dist/index.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,22 +9,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import chalk from "chalk";
-import { helpCommand } from "./help.js";
-import { cssImportsCommand } from "./css-imports/index.js";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const chalk_1 = __importDefault(require("chalk"));
+const help_1 = require("./help");
+const index_1 = require("./css-imports/index");
+const index_2 = require("./codemod/index");
+const fs_1 = __importDefault(require("fs"));
 run();
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
         if (!process.argv[2] || process.argv[2] === "help") {
-            helpCommand();
+            (0, help_1.helpCommand)();
             return;
         }
         else if (process.argv[2] === "css-imports") {
-            yield cssImportsCommand();
+            yield (0, index_1.cssImportsCommand)();
+            return;
+        }
+        else if (process.argv[2] === "codemod") {
+            (0, index_2.codemodCommand)();
+            return;
+        }
+        else if (process.argv[2] === "-v" || process.argv[2] === "--version") {
+            const pkg = JSON.parse(fs_1.default.readFileSync("./package.json").toString()).version;
+            console.log(pkg);
             return;
         }
         else {
-            console.log(chalk.red(`Unknown command: ${process.argv[2]}.\nRun ${chalk.cyan("npx @navikt/aksel help")} for all available commands.`));
+            console.log(chalk_1.default.red(`Unknown command: ${process.argv[2]}.\nRun ${chalk_1.default.cyan("npx @navikt/aksel help")} for all available commands.`));
         }
     });
 }

package/package.json

@@ -1,23 +1,25 @@
 {
   "name": "@navikt/aksel",
-  "version": "2.9.1",
-  "description": "Aksel command line interface. Handles css-imports, codemods (planned) and more",
+  "version": "2.9.3-beta.1",
+  "description": "Aksel commandline interface. Handles css-imports, codemods and more",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
   "keywords": [
-    "react",
-    "command-line",
+    "Commandline",
     "CLI",
-    "css",
-    "CDN"
+    "CDN",
+    "Codemods"
   ],
   "files": [
-    "dist"
+    "dist",
+    "!dist/**/tests"
   ],
   "scripts": {
     "clean": "rimraf dist",
     "build": "yarn clean && tsc -p tsconfig.json",
-    "dev": "tsc --watch -p tsconfig.json"
+    "dev": "tsc --watch -p tsconfig.json",
+    "test": "yarn build && jest",
+    "test:watch": "jest --watch"
   },
   "bin": "./dist/index.js",
   "repository": {
@@ -25,21 +27,28 @@
     "url": "git+https://github.com/navikt/aksel.git",
     "directory": "@navikt/aksel"
   },
-  "type": "module",
   "homepage": "https://aksel.nav.no/grunnleggende/kode/kommandolinje",
   "dependencies": {
-    "@navikt/ds-css": "2.9.1",
+    "@navikt/ds-css": "2.9.3",
     "axios": "1.3.6",
     "chalk": "4.1.0",
-    "clipboardy": "^3.0.0",
+    "clipboardy": "^2.3.0",
+    "commander": "10.0.1",
     "enquirer": "^2.3.6",
     "fast-glob": "3.2.11",
+    "figlet": "1.6.0",
+    "is-git-clean": "1.1.0",
+    "jscodeshift": "0.13.1",
+    "jscodeshift-add-imports": "1.0.10",
     "lodash": "4.17.21",
     "react-scanner": "^1.1.0"
   },
   "devDependencies": {
     "@types/inquirer": "^9.0.3",
+    "@types/jest": "^29.0.0",
+    "jest": "^29.0.0",
     "rimraf": "3.0.2",
+    "ts-jest": "^29.0.0",
     "typescript": "^4.8.0"
   },
   "sideEffects": false,
@@ -47,7 +56,6 @@
     "node": ">=16.0.0"
   },
   "publishConfig": {
-    "access": "public",
-    "provenance": true
+    "access": "public"
   }
 }