-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4291 from GordonSmith/V3_OTHER
feat: Upgrade other to v3
- Loading branch information
Showing
29 changed files
with
821 additions
and
404 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,47 @@ | ||
| { | ||
| // Use IntelliSense to learn about possible Node.js debug attributes. | ||
| // Hover to view descriptions of existing attributes. | ||
| // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "name": "Dermatology", | ||
| "type": "chrome", | ||
| "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", | ||
| "urlFilter": "*dermatology*www*index.html*", | ||
| "runtimeArgs": [ | ||
| "--allow-file-access-from-files", | ||
| "file:///${workspaceRoot}/../../demos/dermatology/www/index.html?src/other/CalendarHeatMap" | ||
| "run-script", | ||
| "test-node" | ||
| ], | ||
| "runtimeExecutable": "npm", | ||
| "skipFiles": [ | ||
| "<node_internals>/**" | ||
| ], | ||
| "outFiles": [ | ||
| "${workspaceFolder}/**/*.js", | ||
| "!**/node_modules/**" | ||
| ], | ||
| "trace": true, | ||
| "sourceMapPathOverrides": { | ||
| "../*": "${workspaceRoot}/*" | ||
| } | ||
| }, | ||
| { | ||
| "name": "Chrome Debug", | ||
| "type": "chrome", | ||
| "name": "index.html", | ||
| "request": "launch", | ||
| "url": "file:///C:/Users/gordon/git/hpcc-js/tests/test-other/test.html", | ||
| "trace": true, | ||
| "webRoot": "${workspaceRoot}", | ||
| "sourceMapPathOverrides": { | ||
| "webpack:///C:/Users/gordon/git/hpcc-js/packages/other/*": "${workspaceRoot}/*" | ||
| } | ||
| "type": "msedge", | ||
| "url": "file:///${workspaceFolder}/index.html", | ||
| "runtimeArgs": [ | ||
| "--disable-web-security" | ||
| ], | ||
| "webRoot": "${workspaceFolder}", | ||
| "outFiles": [ | ||
| "${workspaceFolder}/**/*.js", | ||
| "!**/node_modules/**" | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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), | ||
| ] | ||
| }) | ||
| ]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
|
|
||
| <head> | ||
| <title>Home</title> | ||
| <style> | ||
| body { | ||
| font-family: Arial, sans-serif; | ||
| margin: 0; | ||
| padding: 0; | ||
| background-color: #f0f0f0; | ||
| } | ||
|
|
||
| h1 { | ||
| text-align: center; | ||
| margin-top: 50px; | ||
| } | ||
|
|
||
| #placeholder { | ||
| width: 100%; | ||
| height: 500px; | ||
| background-color: #fff; | ||
| margin-top: 20px; | ||
| } | ||
| </style> | ||
| <script type="importmap"> | ||
| { | ||
| "imports": { | ||
| "@observablehq/runtime": "https://cdn.jsdelivr.net/npm/@observablehq/runtime@5.9.9/dist/runtime.js", | ||
| "@hpcc-js/util": "../util/dist/index.js", | ||
| "@hpcc-js/common": "../common/dist/index.js", | ||
| "@hpcc-js/api": "../api/dist/index.js", | ||
| "@hpcc-js/chart": "../chart/dist/index.js", | ||
| "@hpcc-js/comms": "../comms/dist/index.js", | ||
| "@hpcc-js/observablehq-compiler": "../observablehq-compiler/dist/index.js" | ||
| } | ||
| } | ||
| </script> | ||
| <link rel="stylesheet" href="../common/dist/index.css"> | ||
| <link rel="stylesheet" href="./dist/index.css"> | ||
| </head> | ||
|
|
||
| <body onresize="doResize()"> | ||
| <h1>ESM Quick Test</h1> | ||
| <div id="placeholder"></div> | ||
| <script type="module"> | ||
| import { Table } from "@hpcc-js/other"; | ||
|
|
||
| window.__widget = new Table() | ||
| .target("placeholder") | ||
| .columns(["Category", "Series-1", "Series-2"]) | ||
| .data([ | ||
| ["A", 34, 21], | ||
| ["B", 55, 34], | ||
| ["C", 54, 90], | ||
| ["D", 80, 153], | ||
| ["E", 86, 92], | ||
| ["F", 144, 233] | ||
| ]) | ||
| .tooltipValueFormat(",.0f") | ||
| .showValue(true) | ||
| .xAxisFocus(true) | ||
| .render() | ||
| ; | ||
| </script> | ||
| <script> | ||
| function doResize() { | ||
| window.__widget?.resize()?.render(); | ||
| } | ||
| </script> | ||
| </body> | ||
|
|
||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.