[WC-1294] Charts v4 (#27)

Author: Illia Obukhau

packages/modules/charts/package.json

@@ -36,11 +36,11 @@
   "scripts": {
     "verify": "rui-verify-package-format",
     "update-changelog": "rui-update-changelog-module",
-    "build:module": "scripts/build.ts",
+    "build:module": "ts-node --project scripts/tsconfig.json scripts/build.ts",
     "create-gh-release": "rui-create-gh-release",
-    "push-update": "scripts/push-update.ts",
-    "release:module": "scripts/release.ts",
-    "start": "scripts/start.ts"
+    "push-update": "ts-node --project scripts/tsconfig.json scripts/push-update.ts",
+    "release:module": "ts-node --project scripts/tsconfig.json scripts/release.ts",
+    "start": "ts-node --project scripts/tsconfig.json scripts/start.ts"
   },
   "dependencies": {
     "datagrid-date-filter-web": "workspace:*",

packages/modules/charts/scripts/build.js

@@ -0,0 +1,59 @@
+{
+  "name": "charts-web",
+  "version": "4.0.0",
+  "description": "Chart widgets collection for data visualization",
+  "license": "Apache-2.0",
+  "private": false,
+  "copyright": "© Mendix Technology BV 2022. All rights reserved.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mendix/web-widgets.git"
+  },
+  "mxpackage": {
+    "name": "Charts",
+    "type": "widget",
+    "mpkName": "Charts.mpk",
+    "dependencies": [
+      "area-chart-web",
+      "bar-chart-web",
+      "bubble-chart-web",
+      "column-chart-web",
+      "heatmap-chart-web",
+      "line-chart-web",
+      "pie-doughnut-chart-web",
+      "time-series-chart-web"
+    ]
+  },
+  "packagePath": "com.mendix.widget.web",
+  "marketplace": {
+    "minimumMXVersion": "9.6.0.27784",
+    "appNumber": 105695,
+    "appName": "Charts"
+  },
+  "testProject": {
+    "githubUrl": "https://github.com/mendix/Charts-module",
+    "branchName": "main"
+  },
+  "scripts": {
+    "build": "ts-node --project scripts/tsconfig.json scripts/build.ts development",
+    "release": "ts-node --project scripts/tsconfig.json scripts/build.ts production",
+    "create-gh-release": "rui-create-gh-release",
+    "publish-marketplace": "rui-publish-marketplace",
+    "verify": "rui-verify-package-format",
+    "update-changelog": "rui-update-changelog-module"
+  },
+  "dependencies": {
+    "area-chart-web": "workspace:*",
+    "bar-chart-web": "workspace:*",
+    "bubble-chart-web": "workspace:*",
+    "column-chart-web": "workspace:*",
+    "heatmap-chart-web": "workspace:*",
+    "line-chart-web": "workspace:*",
+    "pie-doughnut-chart-web": "workspace:*",
+    "time-series-chart-web": "workspace:*"
+  },
+  "devDependencies": {
+    "cross-env": "^7.0.2",
+    "@mendix/release-utils-internal": "workspace:*"
+  }
+}

packages/modules/charts/src/themesource/charts/public/com.mendix.charts.json

@@ -0,0 +1,61 @@
+#!/usr/bin/env ts-node-script
+
+import { cp, mkdir, rm, unzip, zip } from "@mendix/release-utils-internal/shell";
+import { logStep, removeDist, runWidgetSteps, WidgetStepParams } from "@mendix/release-utils-internal/steps";
+import { getWidgetInfo, listPackages } from "@mendix/release-utils-internal/utils";
+import { dirname, join } from "node:path";
+
+// Charts specific steps
+
+const [, , env] = process.argv;
+const copyToProject = env !== "production" && process.env.MX_PROJECT_PATH;
+
+async function repackChartWidgets({ config }: WidgetStepParams): Promise<void> {
+    logStep("Repack chart widgets");
+    const { dependencies, paths, output } = config;
+    const packages = await listPackages(dependencies);
+    const widgets = await Promise.all(packages.map(({ path }) => getWidgetInfo(path)));
+
+    mkdir("-p", [paths.tmp, dirname(output.files.mpk)]);
+
+    console.info("Unpacking mpks and create correct file tree...");
+    for (const pkg of widgets) {
+        console.info(`Unpack ${pkg.name}@${pkg.version.format()}`);
+        const contentDir = join(paths.tmp, pkg.mxpackage.name);
+        const pkgSource = join(contentDir, "com");
+        const pkgXml = join(contentDir, "package.xml");
+        mkdir("-p", contentDir);
+        await unzip(pkg.mpk, contentDir);
+        cp("-r", pkgSource, paths.tmp);
+        rm("-rf", pkgSource);
+        rm(pkgXml);
+    }
+
+    console.log("Copying package.xml...");
+    cp(join(paths.package, "src", "package.xml"), join(paths.tmp, "package.xml"));
+    console.log("Creating mpk...");
+    await zip(paths.tmp, output.files.mpk);
+}
+
+async function main(): Promise<void> {
+    await runWidgetSteps({
+        packagePath: process.cwd(),
+        steps: [
+            removeDist,
+            repackChartWidgets,
+            async ({ config }) => {
+                if (copyToProject) {
+                    logStep("Copy widget to targetProject");
+                    const dir = join(config.paths.targetProject, "widgets");
+                    mkdir("-p", dir);
+                    cp(config.output.files.mpk, dir);
+                }
+            }
+        ]
+    });
+}
+
+main().catch(err => {
+    console.error(err);
+    process.exit(1);
+});

packages/modules/data-widgets/package.json

@@ -0,0 +1,3 @@
+{
+    "extends": "@mendix/release-utils-internal/tsconfig"
+}

packages/modules/charts/CHANGELOG.md …pluggableWidgets/charts-web/CHANGELOG.mdpackages/modules/charts/CHANGELOG.md renamed to packages/pluggableWidgets/charts-web/CHANGELOG.md packages/modules/charts/CHANGELOG.md renamed to packages/pluggableWidgets/charts-web/CHANGELOG.md

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<package xmlns="http://www.mendix.com/package/1.0/">
+    <clientModule name="Charts" version="4.0.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+        <widgetFiles>
+            <widgetFile path="AreaChart/AreaChart.xml" />
+            <widgetFile path="BarChart/BarChart.xml" />
+            <widgetFile path="BubbleChart/BubbleChart.xml" />
+            <widgetFile path="ColumnChart/ColumnChart.xml" />
+            <widgetFile path="HeatMap/HeatMap.xml" />
+            <widgetFile path="LineChart/LineChart.xml" />
+            <widgetFile path="PieChart/PieChart.xml" />
+            <widgetFile path="TimeSeries/TimeSeries.xml" />
+        </widgetFiles>
+        <files>
+            <file path="com/mendix/widget/web/areachart" />
+            <file path="com/mendix/widget/web/barchart" />
+            <file path="com/mendix/widget/web/bubblechart" />
+            <file path="com/mendix/widget/web/columnchart" />
+            <file path="com/mendix/widget/web/heatmap" />
+            <file path="com/mendix/widget/web/linechart" />
+            <file path="com/mendix/widget/web/piechart" />
+            <file path="com/mendix/widget/web/timeseries" />
+        </files>
+    </clientModule>
+</package>