@infomaximum/package-cli 2.0.1 → 2.1.1

package/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.1.1](https://github.com/Infomaximum/package-cli/compare/v2.1.0...v2.1.1) (2024-03-07)
+
+
+### Bug Fixes
+
+* исправлено копирование директории с ресурсами во время сборки ([e351a48](https://github.com/Infomaximum/package-cli/commit/e351a48d5bcb274b03e0ee2a97361d6a5c526ada))
+
+## [2.1.0](https://github.com/Infomaximum/package-cli/compare/v2.0.1...v2.1.0) (2024-03-05)
+
+
+### Features
+
+* добавление api_version в манифест при сборке для обратной совместимости ([7d2a9d8](https://github.com/Infomaximum/package-cli/commit/7d2a9d8ea1bf9bf6399057df89bbb8fe02fc51e7))
+* новый путь регистрации виджета ([1b2cf4a](https://github.com/Infomaximum/package-cli/commit/1b2cf4a71ba101a3e16f16d9fede3b64f3a546c8))
+* sdk_version -> manifest.json ([ee5aa42](https://github.com/Infomaximum/package-cli/commit/ee5aa42b1a71db5c3ed96b5ed6ea18b9f68c770f))
+
+
+### Bug Fixes
+
+* 10 секунд ожидание ([f829632](https://github.com/Infomaximum/package-cli/commit/f829632b7c314aa806d506a9bbcc0433c91a1104))
+* без дополнительных свойств ([8a2b08d](https://github.com/Infomaximum/package-cli/commit/8a2b08d74171ed9b5c94e43292d1032f4ed75e90))
+* типизация ([c7482c5](https://github.com/Infomaximum/package-cli/commit/c7482c50647c0f6461fb42de521bd511f87cc08a))
+
 ### [2.0.1](https://github.com/Infomaximum/package-cli/compare/v2.0.0...v2.0.1) (2024-03-05)
 
 

package/dist/utils.js

@@ -29,7 +29,7 @@ export function safeWriteFile(pathToFile, contents, options) {
 export function getLatestVersionOfLibrary(libraryName) {
     return __awaiter(this, void 0, void 0, function* () {
         const { stdout } = yield execPromise(`npm show -j -p ${libraryName} version`, {
-            timeout: 5000,
+            timeout: 10000,
         });
         return JSON.parse(stdout);
     });

package/dist/widget/configs/webpack/common.js

@@ -3,7 +3,7 @@ import { TsconfigPathsPlugin } from "tsconfig-paths-webpack-plugin";
 import CopyWebpackPlugin from "copy-webpack-plugin";
 import webpack, {} from "webpack";
 import { cssLoaders } from "./sections/loaders/cssLoaders.js";
-import { systemRequire } from "../../../utils.js";
+import { compact, systemRequire } from "../../../utils.js";
 import { MANIFEST_REG_EXP } from "../../../const.js";
 import path from "path";
 const { ProgressPlugin } = webpack;
@@ -19,7 +19,7 @@ export const getCommonWidgetConfig = (mode, PATHS) => {
             asyncChunks: false,
             clean: true,
         },
-        plugins: [
+        plugins: compact([
             new ProgressPlugin(),
             new ForkTsCheckerWebpackPlugin({
                 typescript: {
@@ -31,17 +31,18 @@ export const getCommonWidgetConfig = (mode, PATHS) => {
                 },
             }),
             PATHS.widgetResourcesPath &&
+                PATHS.widgetResourcesDirName &&
                 new CopyWebpackPlugin({
                     patterns: [
                         {
                             from: PATHS.widgetResourcesPath,
                             toType: "dir",
-                            to: path.basename(PATHS.widgetResourcesPath),
+                            to: PATHS.widgetResourcesDirName,
                             noErrorOnMissing: true,
                         },
                     ],
                 }),
-        ].filter(Boolean),
+        ]),
         module: {
             rules: [
                 {

package/dist/widget/configs/webpack/sections/plugins/modifyManifestWidget.js

@@ -1,7 +1,9 @@
 import { JsonModifyWebpackPlugin } from "@infomaximum/json-modify-webpack-plugin";
 import { DEV_POSTFIX } from "../../../../../const.js";
 import { removeServiceFieldsForDevelopment } from "../../../../../utils.js";
-export const getModifyManifestWidgetPlugin = ({ host, port, isBuildDevMode, }) => {
+import { WIDGET_SDK_VERSION_FIELD_NAME } from "../../../../const.js";
+import { getSdkVersionFromPackageJson } from "../../../../utils.js";
+export const getModifyManifestWidgetPlugin = ({ host, port, isBuildDevMode, WIDGET_PATHS, }) => {
     return new JsonModifyWebpackPlugin({
         matchers: [
             {
@@ -18,6 +20,9 @@ export const getModifyManifestWidgetPlugin = ({ host, port, isBuildDevMode, }) =
                             });
                         }
                     }
+                    const sdkVersion = getSdkVersionFromPackageJson(WIDGET_PATHS.appPackageJson);
+                    currentJsonContent[WIDGET_SDK_VERSION_FIELD_NAME] = sdkVersion;
+                    currentJsonContent["api_version"] = sdkVersion;
                     removeServiceFieldsForDevelopment(currentJsonContent);
                     return currentJsonContent;
                 },

package/dist/widget/configs/webpack/sections/plugins/zipWidget.js

@@ -2,12 +2,12 @@ import ZipPlugin from "zip-webpack-plugin";
 import { WIDGET_ARCHIVE_NAME } from "../../../../const.js";
 import { BUILD_ARCHIVE_EXT, MANIFEST_JSON_FILE_NAME, } from "../../../../../const.js";
 import { compact } from "../../../../../utils.js";
-export const getZipWidgetPlugin = ({ isOnlyManifest, widgetResourcesPath, }) => {
+export const getZipWidgetPlugin = ({ isOnlyManifest, widgetResourcesDirName, }) => {
     return new ZipPlugin({
         filename: WIDGET_ARCHIVE_NAME,
         extension: BUILD_ARCHIVE_EXT,
         include: isOnlyManifest
-            ? compact([MANIFEST_JSON_FILE_NAME, widgetResourcesPath])
+            ? compact([MANIFEST_JSON_FILE_NAME, widgetResourcesDirName])
             : undefined,
     });
 };

package/dist/widget/const.js

@@ -6,3 +6,4 @@ export const WIDGET_ARCHIVE_NAME = "widget";
 export const WIDGET_ARCHIVE_FULL_NAME = `${WIDGET_ARCHIVE_NAME}.${BUILD_ARCHIVE_EXT}`;
 export const WIDGET_DEFAULT_HOST = "localhost";
 export const WIDGET_DEFAULT_PORT = "5555";
+export const WIDGET_SDK_VERSION_FIELD_NAME = "sdk_version";

package/dist/widget/scripts/build.js

@@ -15,18 +15,19 @@ import { generatePackagePaths } from "../../package/packagePaths.js";
 import { checkLatestLibsVersion } from "../utils.js";
 export const runBuild = (args) => __awaiter(void 0, void 0, void 0, function* () {
     const mode = "production";
-    const { buildDir, host, port, dev: isBuildDevMode, packageDir, packageManifest, assetsDir, } = args;
+    const { buildDir, host, port, dev: isBuildDevMode, packageDir, packageManifest, } = args;
     const WIDGET_PATHS = generateWidgetPaths(args);
     const sections = {
         plugins: [
             getZipWidgetPlugin({
                 isOnlyManifest: isBuildDevMode,
-                widgetResourcesPath: WIDGET_PATHS.widgetResourcesPath,
+                widgetResourcesDirName: WIDGET_PATHS.widgetResourcesDirName,
             }),
             getModifyManifestWidgetPlugin({
                 isBuildDevMode,
                 host,
                 port,
+                WIDGET_PATHS,
             }),
         ],
     };

package/dist/widget/scripts/start.js

@@ -23,7 +23,7 @@ export const runDevServer = (options) => __awaiter(void 0, void 0, void 0, funct
         process.exit(1);
     }
 });
-const run = (PATHS, options) => __awaiter(void 0, void 0, void 0, function* () {
+const run = (WIDGET_PATHS, options) => __awaiter(void 0, void 0, void 0, function* () {
     const { host, port } = options;
     const mode = "development";
     const pluginsSection = {
@@ -32,12 +32,13 @@ const run = (PATHS, options) => __awaiter(void 0, void 0, void 0, function* () {
                 isBuildDevMode: true,
                 host,
                 port,
+                WIDGET_PATHS,
             }),
             getReactRefresh(),
         ],
     };
     const configWebpack = [
-        getCommonWidgetConfig(mode, PATHS),
+        getCommonWidgetConfig(mode, WIDGET_PATHS),
         pluginsSection,
         devtoolSection,
     ];

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

@@ -49,5 +49,5 @@ class CustomWidget implements IWidget<WidgetSettings> {
   }
 }
 
-window.im.defineWidget(manifest.uuid, CustomWidget);
+window.im.widget.defineWidget(manifest.uuid, CustomWidget);
 `;

package/dist/widget/templates/widgetRCConfig.js

@@ -5,8 +5,8 @@ export const WIDGET_RC_CONFIG = `\
   "$schema": "node_modules/${CUSTOM_PACKAGE_CLI_LIB_NAME}/schemas/widgetConfigSchema.json",
   "entry": "src/index.tsx",
   "widgetManifest": "${MANIFEST_JSON_FILE_NAME}",
-  "packageManifest": "package/${MANIFEST_JSON_FILE_NAME}",
   "packageDir": "package",
+  "packageManifest": "package/${MANIFEST_JSON_FILE_NAME}",
   "assetsDir": "_resources",
   "buildDir": "${DEFAULT_BUILD_DIR_NAME}",
   "port": ${+WIDGET_DEFAULT_PORT},

package/dist/widget/utils.js

@@ -1,7 +1,7 @@
 import { __awaiter } from "tslib";
 import semver from "semver";
 import chalk from "chalk";
-import { getLatestVersionOfLibrary, getLibraryVersionInProject, } from "../utils.js";
+import { getLatestVersionOfLibrary, getLibraryVersionInProject, systemRequire, } from "../utils.js";
 import { WIDGET_SDK_LIB_NAME } from "./const.js";
 import { CUSTOM_PACKAGE_CLI_LIB_NAME } from "../const.js";
 export function checkLatestVersion(libName) {
@@ -39,3 +39,20 @@ export function checkLatestLibsVersion() {
         catch (error) { }
     });
 }
+export function getSdkVersionFromPackageJson(appPackageJsonPath) {
+    var _a;
+    const packageJson = systemRequire(appPackageJsonPath);
+    let version = 0;
+    for (const field of ["dependencies", "devDependencies"]) {
+        const tempVersion = (_a = packageJson === null || packageJson === void 0 ? void 0 : packageJson[field]) === null || _a === void 0 ? void 0 : _a[WIDGET_SDK_LIB_NAME];
+        if (tempVersion && semver.valid(tempVersion)) {
+            version = semver.major(tempVersion);
+            break;
+        }
+        if (tempVersion && semver.validRange(tempVersion)) {
+            version = semver.major(semver.minVersion(tempVersion) || "0.0.0");
+            break;
+        }
+    }
+    return version;
+}

package/dist/widget/widgetPaths.js

@@ -1,8 +1,9 @@
+import path from "node:path";
 import { _resolveApp, generateGlobalPaths, generateIndexPath, } from "../paths.js";
 export function generateWidgetPaths({ entry, assetsDir, widgetManifest, buildDir, }) {
     const globalPaths = generateGlobalPaths({ buildDirPath: buildDir });
     const resolveApp = _resolveApp();
     return Object.assign(Object.assign({}, globalPaths), { get moduleIndex() {
             return generateIndexPath(entry);
-        }, widgetManifestJsonPath: resolveApp(widgetManifest), widgetResourcesPath: assetsDir ? resolveApp(assetsDir) : null, widgetBuildDirPath: resolveApp(buildDir) });
+        }, widgetManifestJsonPath: resolveApp(widgetManifest), widgetResourcesPath: assetsDir ? resolveApp(assetsDir) : null, widgetResourcesDirName: assetsDir ? path.basename(assetsDir) : null, widgetBuildDirPath: resolveApp(buildDir) });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infomaximum/package-cli",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "exports": "./dist/index.js",
   "type": "module",
   "license": "Apache-2.0",

package/schemas/widgetConfigSchema.json

@@ -1,7 +1,11 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
+  "additionalProperties": false,
   "properties": {
+    "$schema": {
+      "type": "string"
+    },
     "entry": {
       "type": "string",
       "description": "файл который является точкой входа"

package/schemas/widgetManifestSchema.json

@@ -14,9 +14,6 @@
       "pattern": "\\w+\\.js$",
       "examples": ["index.js", "main.js"]
     },
-    "api_version": {
-      "type": "integer"
-    },
     "name": {
       "type": "object",
       "title": "Локализованное имя виджета",
@@ -52,5 +49,5 @@
       }
     }
   },
-  "required": ["uuid", "entry", "api_version", "name"]
+  "required": ["uuid", "entry", "name"]
 }