Merge pull request #4288 from GordonSmith/V3_LAYOUT

feat: Upgrade layout to v3
hpcc-systems · Nov 12, 2024 · 38248ea · 38248ea
2 parents ea6f502 + cbc463a
commit 38248ea
Show file tree

Hide file tree

Showing 43 changed files with 1,083 additions and 334 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "xpackages/form",
     "packages/graph",
     "packages/html",
-    "xpackages/layout",
+    "packages/layout",
     "xpackages/leaflet-shim",
     "xpackages/loader",
     "xpackages/map",

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -7,7 +7,8 @@
         ".": {
             "types": "./types/index.d.ts",
             "default": "./dist/index.js"
-        }
+        },
+        "./dist/*": "./dist/*"
     },
     "module": "./dist/index.js",
     "browser": "./dist/index.js",

diff --git a/packages/chart/package.json b/packages/chart/package.json
@@ -7,7 +7,8 @@
         ".": {
             "types": "./types/index.d.ts",
             "default": "./dist/index.js"
-        }
+        },
+        "./dist/*": "./dist/*"
     },
     "module": "./dist/index.js",
     "browser": "./dist/index.js",

diff --git a/packages/codemirror-shim/package.json b/packages/codemirror-shim/package.json
@@ -7,7 +7,8 @@
         ".": {
             "types": "./types/index.d.ts",
             "default": "./dist/index.js"
-        }
+        },
+        "./dist/*": "./dist/*"
     },
     "module": "./dist/index.js",
     "browser": "./dist/index.js",

diff --git a/packages/codemirror/package.json b/packages/codemirror/package.json
@@ -7,7 +7,8 @@
         ".": {
             "types": "./types/index.d.ts",
             "default": "./dist/index.js"
-        }
+        },
+        "./dist/*": "./dist/*"
     },
     "module": "./dist/index.js",
     "browser": "./dist/index.js",

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -8,9 +8,8 @@
             "types": "./types/index.d.ts",
             "default": "./dist/index.js"
         },
-        "./font-awesome": {
-            "*": "./font-awesome/*"
-        }
+        "./dist/*": "./dist/*",
+        "./font-awesome/*": "./font-awesome/*"
     },
     "module": "./dist/index.js",
     "browser": "./dist/index.js",

diff --git a/packages/dataflow/package.json b/packages/dataflow/package.json
@@ -7,7 +7,8 @@
         ".": {
             "types": "./types/index.d.ts",
             "default": "./dist/index.js"
-        }
+        },
+        "./dist/*": "./dist/*"
     },
     "main": "./dist/index.js",
     "types": "./types/index.d.ts",

diff --git a/packages/dgrid/package.json b/packages/dgrid/package.json
@@ -7,7 +7,8 @@
         ".": {
             "types": "./types/index.d.ts",
             "default": "./dist/index.js"
-        }
+        },
+        "./dist/*": "./dist/*"
     },
     "module": "./dist/index.js",
     "browser": "./dist/index.js",

diff --git a/packages/dgrid2/package.json b/packages/dgrid2/package.json
@@ -7,7 +7,8 @@
         ".": {
             "types": "./types/index.d.ts",
             "default": "./dist/index.js"
-        }
+        },
+        "./dist/*": "./dist/*"
     },
     "module": "./dist/index.js",
     "browser": "./dist/index.js",

diff --git a/packages/graph/package.json b/packages/graph/package.json
@@ -7,7 +7,8 @@
         ".": {
             "types": "./types/index.d.ts",
             "default": "./dist/index.js"
-        }
+        },
+        "./dist/*": "./dist/*"
     },
     "module": "./dist/index.js",
     "browser": "./dist/index.js",

diff --git a/packages/html/package.json b/packages/html/package.json
@@ -7,7 +7,8 @@
         ".": {
             "types": "./types/index.d.ts",
             "default": "./dist/index.js"
-        }
+        },
+        "./dist/*": "./dist/*"
     },
     "module": "./dist/index.js",
     "browser": "./dist/index.js",

diff --git a/packages/layout/.vscode/launch.json b/packages/layout/.vscode/launch.json
@@ -0,0 +1,47 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "test-browser",
+            "type": "msedge",
+            "request": "launch",
+            "url": "http://localhost:8888",
+            "webRoot": "${workspaceFolder}",
+            "outFiles": [
+                "${workspaceFolder}/**/*.js",
+                "!**/node_modules/**"
+            ],
+        },
+        {
+            "name": "test-node",
+            "type": "node",
+            "request": "launch",
+            "runtimeArgs": [
+                "run-script",
+                "test-node"
+            ],
+            "runtimeExecutable": "npm",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "outFiles": [
+                "${workspaceFolder}/**/*.js",
+                "!**/node_modules/**"
+            ],
+        },
+        {
+            "name": "index.html",
+            "request": "launch",
+            "type": "msedge",
+            "url": "file:///${workspaceFolder}/index.html",
+            "runtimeArgs": [
+                "--disable-web-security"
+            ],
+            "webRoot": "${workspaceFolder}",
+            "outFiles": [
+                "${workspaceFolder}/**/*.js",
+                "!**/node_modules/**"
+            ]
+        }
+    ]
+}
diff --git a/packages/layout/.vscode/tasks.json b/packages/layout/.vscode/tasks.json
@@ -1,20 +1,36 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
     "version": "2.0.0",
     "tasks": [
         {
+            "label": "gen-types-watch",
             "type": "npm",
-            "script": "compile-umd-watch",
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
+            "script": "gen-types-watch",
             "problemMatcher": [
                 "$tsc-watch"
             ],
-            "label": "npm: compile-umd-watch",
-            "detail": "tsc --module umd --outDir ./lib-umd --watch"
+            "presentation": {
+                "group": "group-build"
+            }
+        },
+        {
+            "label": "bundle-watch",
+            "type": "npm",
+            "script": "bundle-watch",
+            "problemMatcher": [],
+            "presentation": {
+                "group": "group-build"
+            }
+        },
+        {
+            "label": "build",
+            "dependsOn": [
+                "gen-types-watch",
+                "bundle-watch",
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
         }
     ]
 }
diff --git a/packages/layout/esbuild.js b/packages/layout/esbuild.js
@@ -0,0 +1,29 @@
+import { browserTpl } from "@hpcc-js/esbuild-plugins";
+import pkg from "./package.json" with { type: "json" };
+
+//  config  ---
+await Promise.all([
+    browserTpl("src/index.ts", "dist/index", {
+        keepNames: true,
+        alias: {
+            "d3-array": "@hpcc-js/common",
+            "d3-brush": "@hpcc-js/common",
+            "d3-collection": "@hpcc-js/common",
+            "d3-color": "@hpcc-js/common",
+            "d3-dispatch": "@hpcc-js/common",
+            "d3-drag": "@hpcc-js/common",
+            "d3-dsv": "@hpcc-js/common",
+            "d3-ease": "@hpcc-js/common",
+            "d3-format": "@hpcc-js/common",
+            "d3-interpolate": "@hpcc-js/common",
+            "d3-scale": "@hpcc-js/common",
+            "d3-selection": "@hpcc-js/common",
+            "d3-time-format": "@hpcc-js/common",
+            "d3-transition": "@hpcc-js/common",
+            "d3-zoom": "@hpcc-js/common"
+        },
+        external: [
+            ...Object.keys(pkg.dependencies),
+        ]
+    })
+]);