neighbour-hoods · pospi · Jan 21, 2023 · Jan 24, 2023 · Jan 24, 2023 · Jan 24, 2023
diff --git a/package.json b/package.json
@@ -7,18 +7,20 @@
     "we-applet"
   ],
   "scripts": {
-    "start": "npm run network 2",
-    "network": "hc s clean && npm run build:test-happ && concurrently-repeat \"npm run start:agent\"",
+    "start": "AGENTS=1 npm run network",
+    "network": "hc s clean && npm run build:test-happ && concurrently \"npm run build:watch -w ui\" \"npm run launch:happ\"",
     "start:agent": "cross-env HC_PORT=$(port) HC_ADMIN_PORT=$(port) concurrently -k \"npm run start:happ\" \"sleep 5 && npm run start -w ui\"",
+    "launch:happ": "RUST_LOG=warn echo \"pass\" | hc launch --piped -n $AGENTS ./workdir/sensemaker-enabled/provider-sensemaker.happ -w --ui-path ui/dist network mdns",
     "test": "npm run build:happ && npm t -w tests",
     "start:happ": "concurrently \"RUST_LOG=warn echo \"pass\" | hc s --piped -f=$HC_ADMIN_PORT generate ./workdir/sensemaker-enabled/provider-sensemaker.happ --run=$HC_PORT -a provider network mdns\" \"npm run playground\"",
-    "package": "npm run build:happ && npm run package:ui -w we-applet && hc web-app pack workdir",
+    "package": "npm run build:happ && npm run build:ui && npm run package:ui -w we-applet && hc web-app pack workdir",
     "build:happ": "npm run build:dnas && hc app pack ./workdir",
     "build:test-happ": "npm run build:dnas && hc app pack ./workdir/sensemaker-enabled",
     "build:dnas": "npm run build:zomes && hc dna pack ./dna/workdir",
     "build:zomes": "CARGO_TARGET_DIR=target cargo build --release --target wasm32-unknown-unknown",
+    "build:ui": "npm run ts-build -w ui",
     "playground": "run-singleton \"holochain-playground\"",
-    "download-sensemaker": "rimraf workdir/sensemaker.dna && curl -L --output workdir/sensemaker.dna https://github.com/neighbour-hoods/sensemaker-lite/releases/download/v0.0.2-alpha/sensemaker.dna",
+    "download-sensemaker": "rimraf workdir/sensemaker.dna && curl -L --output workdir/sensemaker.dna https://github.com/neighbour-hoods/sensemaker-lite/releases/download/v0.0.3-alpha/sensemaker.dna",
     "start:ui": "npm run start -w ui"
   },
   "devDependencies": {

diff --git a/tests/package.json b/tests/package.json
@@ -20,12 +20,11 @@
     "uuidv4": "^6.2.11"
   },
   "devDependencies": {
-    "@holochain/client": "0.8.0",
-    "@holochain/tryorama": "0.7.0",
+    "@holochain/client": "0.11.9",
+    "@holochain/tryorama": "^0.10.4",
     "@types/lodash": "^4.14.158",
     "@types/node": "^14.0.14",
-    "tape-promise": "^4.0.0",
-    "@holochain-open-dev/utils": "^0.4.3"
+    "tape-promise": "^4.0.0"
   },
   "type": "module"
 }
diff --git a/tests/src/provider.ts b/tests/src/provider.ts
@@ -1,19 +1,18 @@
 
-import { DnaSource, Record, ActionHash, EntryHash } from "@holochain/client";
+import { AppBundleSource } from "@holochain/client";
 import { pause, runScenario } from "@holochain/tryorama";
 import { decode } from '@msgpack/msgpack';
 import pkg from 'tape-promise/tape';
 const { test } = pkg;
-import { providerDna } from "./utils";
-import { serializeHash } from "@holochain-open-dev/utils";
+import { providerHapp } from "./utils";
 
 
 export default () => test("provider CRUD tests", async (t) => {
   await runScenario(async scenario => {
 
-    const dnas: DnaSource[] = [{ path: providerDna }];
+    const appBundleSource: AppBundleSource = { path: providerHapp };
 
-    const [alice, bob] = await scenario.addPlayersWithHapps([dnas, dnas]);
+    const [alice, bob] = await scenario.addPlayersWithApps([{ appBundleSource }, { appBundleSource }]);
 
     await scenario.shareAllAgents();
   });

diff --git a/tests/src/utils.ts b/tests/src/utils.ts
@@ -3,7 +3,7 @@ import { fileURLToPath } from "url";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-export const providerDna = path.join(__dirname, "../../dna/workdir/provider.dna");
+export const providerHapp = path.join(__dirname, "../../dna/workdir/provider.happ");
 
 
 
diff --git a/ui/index.html b/ui/index.html
@@ -23,10 +23,6 @@
 
   <body>
     <provider-app-test-harness></provider-app-test-harness>
-    <script type="module">
-      import { ProviderAppTestHarness } from './dist/provider-app-test-harness.js'
-
-      customElements.define('provider-app-test-harness', ProviderAppTestHarness);
-    </script>
+    <script type="module" src="./dist/provider-app-test-harness.js"></script>
   </body>
 </html>
diff --git a/ui/package.json b/ui/package.json
@@ -12,21 +12,19 @@
   "scripts": {
     "lint": "eslint --ext .ts,.html . --ignore-path .gitignore && prettier \"**/*.ts\" --check --ignore-path .gitignore",
     "format": "eslint --ext .ts,.html . --fix --ignore-path .gitignore && prettier \"**/*.ts\" --write --ignore-path .gitignore",
-    "build": "rimraf dist && tsc && rollup -c rollup.config.js",
+    "build": "rimraf dist && rimraf tsconfig.tsbuildinfo && tsc && rollup -c rollup.config.js",
     "ts-build": "tsc",
-    "build:watch": "run-singleton \"tsc --watch --preserveWatchOutput\"",
+    "build:watch": "rimraf dist && rimraf tsconfig.tsbuildinfo && tsc && rollup -c rollup.config.js -w",
     "start": "tsc && concurrently -r \"npm run build:watch\" \"wds\"",
     "package": "npm run build && cd dist && bestzip ../dist.zip *"
   },
   "dependencies": {
-    "@holochain-open-dev/cell-client": "^0.8.0",
-    "@holochain-open-dev/utils": "^0.5.6",
-    "@holochain/client": "^0.9.2",
+    "@holochain/client": "0.11.9",
     "@lit-labs/context": "^0.1.2",
     "@material/mwc-button": "^0.25.3",
     "@material/mwc-circular-progress": "^0.25.3",
     "@msgpack/msgpack": "^2.7.2",
-    "@neighbourhoods/sensemaker-lite-types": "0.0.3",
+    "@neighbourhoods/sensemaker-lite-types": "0.1.0",
     "@type-craft/content": "^0.0.7",
     "@type-craft/title": "^0.0.8",
     "lit": "^2.0.2"
@@ -39,6 +37,7 @@
     "@rollup/plugin-commonjs": "18.0.0",
     "@rollup/plugin-node-resolve": "^13.0.4",
     "@rollup/plugin-replace": "^3.0.0",
+    "@rollup/plugin-typescript": "^10.0.1",
     "@typescript-eslint/eslint-plugin": "^4.29.2",
     "@typescript-eslint/parser": "^4.29.2",
     "@web/dev-server": "0.1.21",

diff --git a/ui/rollup.config.js b/ui/rollup.config.js
@@ -1,83 +1,69 @@
-import nodeResolve from '@rollup/plugin-node-resolve';
-import commonjs from '@rollup/plugin-commonjs';
-import babel from '@rollup/plugin-babel';
-import html from '@web/rollup-plugin-html';
-import { importMetaAssets } from '@web/rollup-plugin-import-meta-assets';
-import { terser } from 'rollup-plugin-terser';
-import replace from '@rollup/plugin-replace';
+import nodeResolve from "@rollup/plugin-node-resolve";
+import commonjs from "@rollup/plugin-commonjs";
+import replace from "@rollup/plugin-replace";
+
+import babel from "@rollup/plugin-babel";
+import html from "@web/rollup-plugin-html";
+import { importMetaAssets } from "@web/rollup-plugin-import-meta-assets";
+import { terser } from "rollup-plugin-terser";
+import typescript from '@rollup/plugin-typescript';
+
+const production = !process.env.ROLLUP_WATCH;
 
 export default {
-  input: 'index.html',
+  input: "index.html",
   output: {
-    entryFileNames: '[hash].js',
-    chunkFileNames: '[hash].js',
-    assetFileNames: '[hash][extname]',
-    format: 'es',
-    dir: 'dist',
+    entryFileNames: "[hash].js",
+    chunkFileNames: "[hash].js",
+    assetFileNames: "[hash][extname]",
+    format: "es",
+    dir: "dist",
   },
-  preserveEntrySignatures: false,
-
   watch: {
     clearScreen: false,
   },
 
   plugins: [
     /** Enable using HTML as rollup entrypoint */
-    replace({
-      'process.env.HC_PORT': '8888',
-      delimiters: ['', ''],
-    }),
     html({
       minify: true,
-      injectServiceWorker: true,
-      serviceWorkerPath: 'dist/sw.js',
     }),
     /** Resolve bare module imports */
     nodeResolve({
       browser: true,
+      preferBuiltins: false,
+    }),
+    replace({
+      "process.env.NODE_ENV": '"production"',
+      "process.env.ENV": `"${process.env.ENV}"`,  // :TODO: this seems like a possible security issue, should we be sending this?
+      "process.env.HC_PORT": JSON.stringify(process.env.HC_PORT) || `undefined`,
+      "process.env.ADMIN_PORT": JSON.stringify(process.env.ADMIN_PORT) || `undefined`,
+    }),
+    commonjs({}),
+    typescript({
+      sourceMap: !production,
+      inlineSources: !production,
     }),
-    commonjs(),
     /** Minify JS */
     terser(),
     /** Bundle assets references via import.meta.url */
     importMetaAssets(),
     /** Compile JS to a lower language target */
     babel({
-      babelHelpers: 'bundled',
+      exclude: /node_modules/,
+
+      babelHelpers: "bundled",
       presets: [
         [
-          require.resolve('@babel/preset-env'),
+          require.resolve("@babel/preset-env"),
           {
-            targets: [
-              'last 3 Chrome major versions',
-              'last 3 Firefox major versions',
-              'last 3 Edge major versions',
-              'last 3 Safari major versions',
-            ],
+            targets: ['defaults', 'not IE 11', 'safari >13', 'not op_mini all', 'last 3 Chrome versions'],
             modules: false,
             bugfixes: true,
           },
         ],
       ],
-      plugins: [
-        [
-          require.resolve('babel-plugin-template-html-minifier'),
-          {
-            modules: {
-              lit: ['html', { name: 'css', encapsulation: 'style' }],
-            },
-            failOnError: false,
-            strictCSS: true,
-            htmlMinifier: {
-              collapseWhitespace: true,
-              conservativeCollapse: true,
-              removeComments: true,
-              caseSensitive: true,
-              minifyCSS: true,
-            },
-          },
-        ],
-      ],
+      plugins: [],
     }),
   ],
 };
diff --git a/ui/src/appletConfig.ts b/ui/src/appletConfig.ts
@@ -27,7 +27,7 @@ const totalImportanceDimension = {
 
 const taskItemResourceType: ConfigResourceType = {
     "name": "task_item",
-    "base_types": [{ "id": 0, "zome_id": 0, "visibility": { "Public": null } }],
+    "base_types": [{ "entry_index": 0, "zome_index": 0, "visibility": { "Public": null } }],
     "dimensions": [importanceDimension]
 }