hpcc-systemsGH-4093 Bump ObservableHQ Versions

Fixes hpcc-systems#4093

Signed-off-by: Gordon Smith <[email protected]>

packages/observable-md/README.md

@@ -1,5 +1,8 @@
 # @hpcc-js/observable-md
 
+> **Warning**
+> Deprectated in favor of @hpcc-js/observable-compiler
+
 _An interpreted version of the [Observable HQ](https://observablehq.com) runtime._
 
 * [Installing](#installing)

packages/observable-md/package.json

@@ -9,8 +9,8 @@
         "repl"
     ],
     "main": "dist/index.node.js",
-    "module": "dist/index.es6",
-    "module-node": "dist/index.node.es6",
+    "module": "dist/index.es6.js",
+    "module-node": "dist/index.node.es6.js",
     "browser": "dist/index.js",
     "unpkg": "dist/index.min.js",
     "jsdelivr": "dist/index.min.js",
@@ -57,7 +57,7 @@
     },
     "devDependencies": {
         "@hpcc-js/bundle": "^2.11.3",
-        "@observablehq/runtime": "4.28.0",
+        "@observablehq/runtime": "5.7.4",
         "d3-require": "^1",
         "tslib": "2.4.1"
     },
@@ -72,4 +72,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization"
-}
+}

packages/observable-md/rollup.config.js

@@ -51,7 +51,7 @@ export default [{
         globals: globals,
         name: pkg.name
     }, {
-        file: pkg.main.split(".node.").join(".node.es6"),
+        file: pkg.main.split(".node.").join(".node.es6."),
         format: "es",
         sourcemap: true,
         globals: globals

packages/observablehq-compiler/package.json

@@ -62,7 +62,7 @@
     },
     "devDependencies": {
         "@hpcc-js/bundle": "^2.11.3",
-        "@observablehq/runtime": "4.28.0",
+        "@observablehq/runtime": "5.7.4",
         "tslib": "2.4.1"
     },
     "repository": {
@@ -76,4 +76,4 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization/tree/trunk/packages/observablehq-compiler"
-}
+}

tests/test-data/src/coreTests.ts

@@ -23,7 +23,7 @@ export function classDef<T extends Class>(module: string, WidgetClass: { new():
     });
 }
 
-function createPlaceholder<T extends HTMLWidget | SVGWidget>(widget: T, title: string, width: number = 640, height: number = 480, scale: number = 0.5) {
+export function createPlaceholder<T extends HTMLWidget | SVGWidget>(widget: T, title: string, width: number = 640, height: number = 480, scale: number = 0.5) {
     const div = document.createElement("DIV");
     div.setAttribute("id", widget.classID());
     div.setAttribute("class", `${widget.classID()} widgetTest`);

tests/test-observable-md/.vscode/launch.json → tests/test-observablehq-compiler/.vscode/launch.json

@@ -30,6 +30,18 @@
                 "${workspaceRoot}/build/**/*"
             ]
         },
+        {
+            "name": "Edge Debug",
+            "type": "msedge",
+            "request": "launch",
+            "url": "file:///${workspaceRoot}/test.html",
+            "trace": true,
+            "webRoot": "${workspaceRoot}/",
+            "sourceMapPathOverrides": {
+                "webpack:///./*": "${workspaceRoot}/*",
+                "webpack:///*": "/*"
+            }
+        },
         {
             "name": "Chrome Debug",
             "type": "chrome",

tests/test-observablehq-compiler/karma.config.js

@@ -0,0 +1,59 @@
+/* eslint-disable no-undef */
+// Karma configuration
+// Generated on Mon Apr 11 2022 12:03:14 GMT+0100 (Irish Standard Time)
+
+module.exports = function (config) {
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: ".",
+
+    // frameworks to use
+    // available frameworks: https://www.npmjs.com/search?q=keywords:karma-adapter
+    frameworks: ["mocha"],
+
+    // list of files / patterns to load in the browser
+    files: [
+      "lib-es6/test-observable-md/src/index.spec.js"
+    ],
+
+    // list of files / patterns to exclude
+    exclude: [
+    ],
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://www.npmjs.com/search?q=keywords:karma-preprocessor
+    preprocessors: {
+    },
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://www.npmjs.com/search?q=keywords:karma-reporter
+    reporters: ["progress"],
+
+    // web server port
+    port: 9876,
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+    // start these browsers
+    // available browser launchers: https://www.npmjs.com/search?q=keywords:karma-launcher
+    browsers: ["Chrome"],
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: false,
+
+    // Concurrency level
+    // how many browser instances should be started simultaneously
+    concurrency: Infinity
+  });
+};

tests/test-observable-md/package.json → tests/test-observablehq-compiler/package.json

@@ -1,9 +1,10 @@
 {
     "private": true,
-    "name": "@hpcc-js/test-observable-md",
+    "name": "@hpcc-js/test-observablehq-compiler",
     "dependencies": {
         "@hpcc-js/common": "^2.71.8",
-        "@hpcc-js/observable-md": "^2.54.9",
+        "@hpcc-js/observablehq-compiler": "^1.2.6",
+        "@observablehq/runtime": "5.7.4",
         "es6-promise": "4.2.8",
         "simulate-event": "1.4.0"
     },

tests/test-observablehq-compiler/src/index.spec.ts

@@ -0,0 +1 @@
+import "./observable.spec";