@infomaximum/package-cli 1.4.0-rc4 → 1.4.0-rc6

package/dist/arguments.js

@@ -1,6 +1,8 @@
 import { runBuild } from "./scripts/widget/build.js";
 import { runDevServer } from "./scripts/widget/start.js";
 import { runInitWidget } from "./scripts/widget/init/init.js";
+import { systemRequire } from "./utils.js";
+const packageJson = systemRequire("../package.json");
 const registerWidgetCommands = (cli) => {
     const widgetCommand = cli.command("widget");
     const widgetBuildCommand = widgetCommand.command("build");
@@ -15,15 +17,16 @@ const registerWidgetCommands = (cli) => {
         .option("-p, --port <port>", "Порт на котором будет доступен виджет", "5555")
         .option("--host <host>", "host на котором будет доступен виджет", "0.0.0.0")
         .action((options) => runDevServer(options));
-    const widgetInitCommand = widgetCommand.command("init <path>");
+    const widgetInitCommand = widgetCommand.command("init <project-directory>");
     widgetInitCommand
         .description("Создание виджета")
-        .action((initPath) => {
-        runInitWidget(initPath);
+        .action((dirName) => {
+        runInitWidget(dirName);
     });
 };
 export const registerCommands = (cli) => {
     cli.helpOption("-h", "Отображает помощь по командам");
     cli.name("im-package-cli");
+    cli.version(packageJson.version, "-v, --version", "Текущая версия библиотеки");
     registerWidgetCommands(cli);
 };

package/dist/configs/webpack/buildPa/321/201kage.js

@@ -4,7 +4,7 @@ import { archiveExt, buildWidgetConfigName, widgetArchiveName, } from "./common.
 import path from "path";
 import { JsonModifyWebpackPlugin } from "@infomaximum/json-modify-webpack-plugin";
 import { systemRequire } from "../../utils.js";
-const packageFilename = "main";
+const packageFilename = "main.js";
 export const getPackageConfig = (mode, PATHS) => {
     const widgetVersion = systemRequire(PATHS.appPackageJson).version;
     const manifestPackageName = systemRequire(PATHS.packageManifest).name;

package/dist/const.js

@@ -0,0 +1 @@
+export const CUSTOM_WIDGET_LIB_NAME = "@infomaximum/custom-widget";

package/dist/scripts/widget/build.js

@@ -3,8 +3,11 @@ import webpack, {} from "webpack";
 import { generatePaths } from "../../paths.js";
 import { getCommonWidgetConfig } from "../../configs/webpack/common.js";
 import { getPackageConfig } from "../../configs/webpack/buildPaсkage.js";
+import { checkLatestVersion } from "../../utils.js";
+import { CUSTOM_WIDGET_LIB_NAME } from "../../const.js";
 export const runBuild = (args) => __awaiter(void 0, void 0, void 0, function* () {
     const mode = "production";
+    yield checkLatestVersion(CUSTOM_WIDGET_LIB_NAME);
     const PATHS = generatePaths({
         entryPath: args.entry,
     });

package/dist/scripts/widget/init/actions.js

@@ -1,6 +1,6 @@
 import { __awaiter } from "tslib";
 import path from "node:path";
-import { getLatestVersionOfLibrary, writeFile } from "../../../utils.js";
+import { getLatestVersionOfLibrary, safeWriteFile } from "../../../utils.js";
 import { PACKAGE_MANIFEST_TEMPLATE } from "../../../templates/package/packageManifest.js";
 import { PACKAGE_ICON_TEMPLATE } from "../../../templates/package/packageIcon.js";
 import { WIDGET_MANIFEST_TEMPLATE } from "../../../templates/widget/widgetManifest.js";
@@ -9,12 +9,13 @@ import { WIDGET_INDEX_TEMPLATE } from "../../../templates/widget/src/widgetIndex
 import { APP_D_TS_TEMPLATE } from "../../../templates/widget/src/widgetAppDTs.js";
 import { WIDGET_INDEX_CSS_TEMPLATE } from "../../../templates/widget/src/widgetIndexCSS.js";
 import { WIDGET_PACKAGE_JSON_TEMPLATE } from "../../../templates/widget/widgetPackageJson.js";
+import { CUSTOM_WIDGET_LIB_NAME } from "../../../const.js";
 const addIconActionName = "addIcon";
 const addInitActions = (basePath, plop) => {
     plop.setActionType(addIconActionName, function (answers, config, plop) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield writeFile(path.resolve(basePath, config.path), config.template, {
+                yield safeWriteFile(path.resolve(basePath, config.path), config.template, {
                     encoding: "base64",
                 });
                 return config.path;
@@ -104,7 +105,7 @@ const getInitWidgetActions = (basePath, plop) => __awaiter(void 0, void 0, void
     addInitActions(basePath, plop);
     const [packageCliVersion, customWidgetVersion] = yield Promise.all([
         getLatestVersionOfLibrary("@infomaximum/package-cli"),
-        getLatestVersionOfLibrary("@infomaximum/custom-widget"),
+        getLatestVersionOfLibrary(CUSTOM_WIDGET_LIB_NAME),
     ]);
     return (data) => actions(Object.assign(Object.assign({}, data), { packageCliVersion,
         customWidgetVersion }));

package/dist/scripts/widget/init/init.js

@@ -3,17 +3,18 @@ import path from "node:path";
 import nodePlop from "node-plop";
 import { getInitWidgetGenerator } from "./generators.js";
 import { spawnCommand } from "../../../utils.js";
-const runInitWidget = (initPath) => __awaiter(void 0, void 0, void 0, function* () {
-    const createPath = path.resolve(process.cwd(), initPath);
+const runInitWidget = (dirName) => __awaiter(void 0, void 0, void 0, function* () {
+    const createPath = path.join(process.cwd(), dirName);
     const plop = yield nodePlop(undefined, {
         destBasePath: createPath,
         force: false,
     });
     const initGenerator = yield getInitWidgetGenerator(createPath, plop);
-    const answers = yield initGenerator.runPrompts();
+    const answers = (yield initGenerator.runPrompts());
     yield initGenerator.runActions(answers);
+    const packageManager = answers.packageManager;
     try {
-        yield spawnCommand("npm install", {
+        yield spawnCommand(packageManager, ["install"], {
             cwd: createPath,
         });
     }
@@ -21,7 +22,7 @@ const runInitWidget = (initPath) => __awaiter(void 0, void 0, void 0, function*
         console.error(error);
     }
     try {
-        yield spawnCommand("git init", {
+        yield spawnCommand("git", ["init"], {
             cwd: createPath,
         });
     }

package/dist/scripts/widget/init/prompts.js

@@ -1,22 +1,38 @@
 const notEmptyValidator = (input) => !!input;
 const prompts = [
     {
-        message: "Введите название пакета: ",
+        message: "Enter the name of the package: ",
         type: "input",
         name: "packageName",
         validate: notEmptyValidator,
     },
     {
-        message: "Введите описание для пакета: ",
+        message: "Enter a description for the package: ",
         type: "input",
         name: "packageDescription",
         default: "",
     },
     {
-        message: "Имя автора пакета: ",
+        message: "Enter the name of the package author: ",
         type: "input",
         name: "author",
         validate: notEmptyValidator,
     },
+    {
+        message: "Select the package manager: ",
+        type: "list",
+        name: "packageManager",
+        default: "yarn",
+        choices: [
+            {
+                name: "npm",
+                value: "npm",
+            },
+            {
+                name: "yarn",
+                value: "yarn",
+            },
+        ],
+    },
 ];
 export { prompts };

package/dist/scripts/widget/start.js

@@ -5,11 +5,14 @@ import WebpackDevServer from "webpack-dev-server";
 import { getDevServerConfig } from "../../configs/webpack/devServer.js";
 import { merge } from "webpack-merge";
 import { getCommonWidgetConfig } from "../../configs/webpack/common.js";
+import { checkLatestVersion } from "../../utils.js";
+import { CUSTOM_WIDGET_LIB_NAME } from "../../const.js";
 const { webpack } = _webpack;
 export const runDevServer = (options) => __awaiter(void 0, void 0, void 0, function* () {
     const PATHS = generatePaths({
         entryPath: options.entry,
     });
+    yield checkLatestVersion(CUSTOM_WIDGET_LIB_NAME);
     try {
         yield run(PATHS, options);
     }

package/dist/templates/widget/src/widgetIndexCSS.js

@@ -1,11 +1,11 @@
 export const WIDGET_INDEX_CSS_TEMPLATE = `\
 body {
-    margin: 0;
-    overflow: hidden;
-    font-family: -apple-system, BlinkMacSystemFont, "Montserrat Segoe UI",
-      "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans",
-      "Helvetica Neue", sans-serif;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
+  margin: 0;
+  overflow: hidden;
+  font-family: -apple-system, BlinkMacSystemFont, "Montserrat Segoe UI",
+    "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans",
+    "Helvetica Neue", sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
 `;

package/dist/templates/widget/widgetConfigs.js

@@ -1,26 +1,26 @@
 export const WIDGET_TSCONFIG_JSON = `\
 {
-    "compilerOptions": {
-      "baseUrl": "./src",
-      "target": "ES2015",
-      "lib": ["dom", "dom.iterable", "esnext"],
-      "allowJs": true,
-      "skipLibCheck": true,
-      "esModuleInterop": true,
-      "allowSyntheticDefaultImports": true,
-      "strict": true,
-      "forceConsistentCasingInFileNames": true,
-      "noFallthroughCasesInSwitch": true,
-      "module": "esnext",
-      "moduleResolution": "node",
-      "resolveJsonModule": true,
-      "isolatedModules": true,
-      "verbatimModuleSyntax": true,
-      "noEmit": true,
-      "jsx": "react-jsx"
-    },
-    "include": ["src"]
-  }
+  "compilerOptions": {
+    "baseUrl": "./src",
+    "target": "ES2015",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "noEmit": true,
+    "jsx": "react-jsx"
+  },
+  "include": ["src"]
+}
 `;
 export const WIDGET_BABEL_CONFIG = `\
 module.exports = {

package/dist/templates/widget/widgetManifest.js

@@ -2,18 +2,18 @@ import { randomUUID } from "node:crypto";
 import { capitalizeHelperName } from "../../scripts/widget/init/helpers.js";
 export const WIDGET_MANIFEST_TEMPLATE = `\
 {
-    "uuid": "${randomUUID()}",
-    "entry": "index.js",
-    "api_version": 1,
-    "name": {
-      "en": "{{${capitalizeHelperName} packageName}}",
-      "ru": "{{${capitalizeHelperName} packageName}}"
-    },
-    "default_size_percentage": {
-      "width": 60,
-      "height": 20,
-      "min_width": 8,
-      "min_height": 4
-    }
+  "uuid": "${randomUUID()}",
+  "entry": "index.js",
+  "api_version": 1,
+  "name": {
+    "en": "{{${capitalizeHelperName} packageName}}",
+    "ru": "{{${capitalizeHelperName} packageName}}"
+  },
+  "default_size_percentage": {
+    "width": 60,
+    "height": 20,
+    "min_width": 8,
+    "min_height": 4
   }
+}
 `;

package/dist/templates/widget/widgetPackageJson.js

@@ -1,43 +1,43 @@
 export const WIDGET_PACKAGE_JSON_TEMPLATE = `\
 {
-    "name": "template_widget",
-    "version": "1.0.0",
-    "private": true,
-    "main": "src/index.tsx",
-    "scripts": {
-      "build": "im-package-cli widget build --entry ./src/index.tsx",
-      "start": "im-package-cli widget start --entry ./src/index.tsx",
-      "lint": "tsc --noEmit && eslint src/ --ext .ts,.tsx --quiet",
-      "test": "jest --passWithNoTests"
-    },
-    "dependencies": {
-      "react": "18.2.0",
-      "react-dom": "18.2.0",
-      "@infomaximum/custom-widget": "^{{customWidgetVersion}}"
-    },
-    "devDependencies": {
-      "@babel/core": "7.23.3",
-      "@babel/preset-env": "7.23.3",
-      "@babel/preset-react": "7.23.3",
-      "@babel/preset-typescript": "7.23.3",
-      "@infomaximum/package-cli": "^{{packageCliVersion}}",
-      "@types/jest": "29.5.10",
-      "@types/react": "18.2.39",
-      "@types/react-dom": "18.2.17",
-      "@typescript-eslint/eslint-plugin": "6.13.0",
-      "@typescript-eslint/parser": "6.13.0",
-      "eslint": "8.54.0",
-      "eslint-plugin-react": "7.33.2",
-      "eslint-plugin-react-hooks": "4.6.0",
-      "jest": "29.7.0",
-      "jest-canvas-mock": "2.5.2",
-      "jest-environment-jsdom": "29.7.0",
-      "jest-environment-jsdom-global": "4.0.0",
-      "prettier": "3.1.0",
-      "typescript": "~5.3.2"
-    },
-    "browserslist": [
-      "defaults and supports es6-module"
-    ]
-  }
+  "name": "template_widget",
+  "version": "1.0.0",
+  "private": true,
+  "main": "src/index.tsx",
+  "scripts": {
+    "build": "im-package-cli widget build --entry ./src/index.tsx",
+    "start": "im-package-cli widget start --entry ./src/index.tsx",
+    "lint": "tsc --noEmit && eslint src/ --ext .ts,.tsx --quiet",
+    "test": "jest --passWithNoTests"
+  },
+  "dependencies": {
+    "@infomaximum/custom-widget": "^{{customWidgetVersion}}",
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
+  },
+  "devDependencies": {
+    "@babel/core": "7.23.3",
+    "@babel/preset-env": "7.23.3",
+    "@babel/preset-react": "7.23.3",
+    "@babel/preset-typescript": "7.23.3",
+    "@infomaximum/package-cli": "^{{packageCliVersion}}",
+    "@types/jest": "29.5.10",
+    "@types/react": "18.2.39",
+    "@types/react-dom": "18.2.17",
+    "@typescript-eslint/eslint-plugin": "6.13.0",
+    "@typescript-eslint/parser": "6.13.0",
+    "eslint": "8.54.0",
+    "eslint-plugin-react": "7.33.2",
+    "eslint-plugin-react-hooks": "4.6.0",
+    "jest": "29.7.0",
+    "jest-canvas-mock": "2.5.2",
+    "jest-environment-jsdom": "29.7.0",
+    "jest-environment-jsdom-global": "4.0.0",
+    "prettier": "3.1.0",
+    "typescript": "~5.3.2"
+  },
+  "browserslist": [
+    "defaults and supports es6-module"
+  ]
+}
 `;

package/dist/utils.js

@@ -1,43 +1,38 @@
 import { __awaiter } from "tslib";
 import fs from "node:fs/promises";
 import path from "node:path";
-import https from "node:https";
-import { spawn } from "node:child_process";
+import { spawn, exec } from "node:child_process";
+import util from "node:util";
 import Module from "node:module";
+import semver from "semver";
+import chalk from "chalk";
+const execPromise = util.promisify(exec);
 export const systemRequire = Module.createRequire(import.meta.url);
 export function capitalizeFirstLetter(str = "") {
     return str.charAt(0).toUpperCase() + str.slice(1);
 }
-export function writeFile(pathToFile, contents, options) {
+export function safeWriteFile(pathToFile, contents, options) {
     return __awaiter(this, void 0, void 0, function* () {
         yield fs.mkdir(path.dirname(pathToFile), { recursive: true });
         yield fs.writeFile(pathToFile, contents, options);
     });
 }
 export function getLatestVersionOfLibrary(libraryName) {
-    return new Promise((resolve, reject) => {
-        https
-            .get(`https://registry.npmjs.org/-/package/${libraryName}/dist-tags`, (res) => {
-            if (res.statusCode === 200) {
-                let body = "";
-                res.on("data", (data) => (body += data));
-                res.on("end", () => {
-                    resolve(JSON.parse(body).latest);
-                });
-            }
-            else {
-                reject();
-            }
-        })
-            .on("error", () => {
-            reject();
-        });
+    return __awaiter(this, void 0, void 0, function* () {
+        const { stdout } = yield execPromise(`npm show -j -p ${libraryName} version`);
+        return JSON.parse(stdout);
     });
 }
-export function spawnCommand(command, options) {
+export function getLibraryVersionInProject(libraryName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { stdout } = yield execPromise(`npm ls -j -p ${libraryName} version`);
+        return JSON.parse(stdout);
+    });
+}
+export function spawnCommand(command, args, options) {
     const didSucceed = (code) => `${code}` === "0";
     return new Promise((resolve, reject) => {
-        const childProcess = spawn(command, Object.assign({ shell: true, stdio: "inherit" }, options));
+        const childProcess = spawn(command, args, Object.assign({ shell: true, stdio: "inherit" }, options));
         childProcess.on("close", (code) => {
             if (didSucceed(code)) {
                 resolve();
@@ -48,3 +43,23 @@ export function spawnCommand(command, options) {
         });
     });
 }
+export function checkLatestVersion(libName) {
+    var _a, _b, _c;
+    return __awaiter(this, void 0, void 0, function* () {
+        const libVersionInProject = yield getLibraryVersionInProject(libName);
+        const libVersionFromProject = (_c = (((_a = libVersionInProject === null || libVersionInProject === void 0 ? void 0 : libVersionInProject.dependencies) === null || _a === void 0 ? void 0 : _a[libName]) ||
+            ((_b = libVersionInProject === null || libVersionInProject === void 0 ? void 0 : libVersionInProject.devDependencies) === null || _b === void 0 ? void 0 : _b[libName]))) === null || _c === void 0 ? void 0 : _c.version;
+        if (!libVersionFromProject)
+            return;
+        const latestVersion = yield getLatestVersionOfLibrary(libName);
+        const isOldVersion = semver.gt(latestVersion, libVersionFromProject);
+        if (isOldVersion) {
+            console.error(chalk.yellow(`A new version of the ${chalk.underline(`${libName}@${latestVersion}`)} library has been released,\n` +
+                `old version ${libVersionFromProject} is used in the project, it is recommended to ` +
+                `update to the latest version \n` +
+                chalk.green.bold(chalk.underline(`npm i --save ${libName}@${latestVersion}`) +
+                    " or " +
+                    chalk.underline(`yarn upgrade ${libName}@${latestVersion}\n\n`))));
+        }
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infomaximum/package-cli",
-  "version": "1.4.0-rc4",
+  "version": "1.4.0-rc6",
   "exports": "./dist/index.js",
   "type": "module",
   "license": "Apache-2.0",
@@ -27,24 +27,27 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
     "@svgr/webpack": "^8.1.0",
     "@types/node": "^20.9.0",
+    "@types/semver": "^7.5.6",
     "@types/zip-webpack-plugin": "^3.0.6",
     "autoprefixer": "^10.4.16",
     "babel-loader": "^9.1.3",
     "babel-plugin-inline-json-import": "^0.3.2",
+    "chalk": "^5.3.0",
     "commander": "^11.1.0",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
-    "node-plop": "^0.32.0",
     "less": "^4.2.0",
     "less-loader": "^11.1.3",
+    "node-plop": "^0.32.0",
     "postcss": "^8.4.31",
     "postcss-loader": "^7.3.3",
     "postcss-preset-env": "^9.3.0",
     "react-refresh": "^0.14.0",
     "sass": "^1.69.5",
     "sass-loader": "^13.3.2",
+    "semver": "^7.5.4",
     "standard-version": "^9.5.0",
     "style-loader": "^3.3.3",
     "terser-webpack-plugin": "^5.3.9",