Fix problems in PR #76 and remerge them in, with a bump to version 1.6.4 (#79)

* Beaker vue/lib build (#76)

* Changes to allow for proper building as a library and source

* Packaging updates in index.ts files.

* Replace `@` with relative paths.

* Switch to vue-tsc for transpilation and typing fixes/updates to go along with change

* Cleanup

* Cleanup of issues for updating

* Bump version: 1.6.3 → 1.6.4

Author: mattprintz

Makefile

@@ -6,13 +6,14 @@ init:
 	make .env beaker-vue/node_modules
 
 .PHONY:build
-build:
+build:beaker_kernel/server/ui/index.html
 	make beaker_kernel/server/ui/index.html
 	hatch build
 
 .PHONY:clean
 clean:
-	rm -r build/* dist/* beaker_kernel/server/ui/*
+	rm -r beaker-ts/dist/* beaker-vue/dist/* build/* dist/* beaker_kernel/server/ui/* || true
+
 
 .PHONY:docs-up
 docs-up:
@@ -24,7 +25,7 @@ docs-down:
 	(cd docs && docker compose down)
 
 .PHONY:dev
-dev:
+dev:beaker_kernel/server/ui/index.html
 	docker compose up -d --build && \
 	(sleep 1; python -m webbrowser "http://localhost:8888/"); \
 	docker compose logs -f jupyter || true; \
@@ -36,14 +37,15 @@ dev:
 	fi
 
 beaker-vue/node_modules:beaker-vue/package*.json
-	(cd beaker-vue && npm install --dev) && \
+	(cd beaker-ts/ && npm install --include=dev && npm run build) && \
+	(cd beaker-vue && npm install --include=dev) && \
 	touch beaker-vue/node_modules
 
 beaker_kernel/server/ui/index.html:beaker-vue/node_modules beaker-vue/**
-	rm -r beaker_kernel/server/ui/* ; \
+	rm -r beaker_kernel/server/ui/* || true; \
 	(cd beaker-ts/ && npm install && npm run build) && \
 	(cd beaker-vue/ && npm run build) && \
-	cp -r beaker-vue/dist/* beaker_kernel/server/ui/
+	cp -r beaker-vue/dist/html/* beaker_kernel/server/ui/
 
 .PHONY:changed-files
 changed-files:

beaker-ts/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "beaker-kernel",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "Beaker kernel library",
   "repository": {
     "url": "https://github.com/jataware/beaker-kernel"

beaker-ts/package.json

@@ -99,7 +99,7 @@ export class BeakerRenderer {
         return mimetypes;
     }
 
-    public render(mimeType: MimetypeString, data: PartialJSONObject, metadata?: PartialJSONObject) {
+    public render(mimeType: MimetypeString, data: PartialJSONObject, metadata?: PartialJSONObject): any {
         const renderer = this._renderers[mimeType];
         if (renderer) {
             return renderer.render(mimeType, data, metadata);

beaker-ts/src/render.ts

@@ -9,9 +9,11 @@ module.exports = {
     '@vue/typescript/recommended'
   ],
   parserOptions: {
+    warnOnUnsupportedTypeScriptVersion: false,
     ecmaVersion: 2020
   },
   rules: {
+    '@typescript-eslint/no-duplicate-enum-values': 'off',
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
   }

beaker-vue/.eslintrc.js

@@ -1,5 +1,8 @@
 module.exports = {
   presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
+    '@vue/cli-plugin-babel/preset',
+  ],
+  ignore: [
+    /node_modules/,
+  ],
 }