From 4e6de344ed529525742bd7c5cfc54dffb8e46f3b Mon Sep 17 00:00:00 2001 From: Colin Kennedy Date: Mon, 30 Sep 2024 23:44:27 -0300 Subject: [PATCH 1/3] Remove merge artifact --- packages/vue/src/SkldrVue.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue/src/SkldrVue.ts b/packages/vue/src/SkldrVue.ts index 67180f41..af9ed0dd 100644 --- a/packages/vue/src/SkldrVue.ts +++ b/packages/vue/src/SkldrVue.ts @@ -17,7 +17,7 @@ export default class SkldrVue extends Vue { /** * Print an error message to the console. Prefixes the message with the * component name. -<<<<<<< HEAD + * * @param message */ protected error(message?: any, ...optionalParams: any[]): void { From a2276e02698bb9aa29fdc898b35feb9ea9ea7815 Mon Sep 17 00:00:00 2001 From: Colin Kennedy Date: Mon, 30 Sep 2024 23:48:40 -0300 Subject: [PATCH 2/3] Remove inherit from SkldrVue, replace `log` utils --- packages/vue/src/base-course/Viewable.ts | 29 +++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/packages/vue/src/base-course/Viewable.ts b/packages/vue/src/base-course/Viewable.ts index 5fc80526..5c8c328d 100644 --- a/packages/vue/src/base-course/Viewable.ts +++ b/packages/vue/src/base-course/Viewable.ts @@ -10,7 +10,7 @@ import SkldrVue from '../SkldrVue'; /** * Base class for card views in courses. */ -export default abstract class Viewable extends SkldrVue implements Vue { +export default abstract class Viewable extends Vue { @Prop() public data: ViewData[]; public toString(): string { this.warn('toString() not implemented'); @@ -20,6 +20,33 @@ export default abstract class Viewable extends SkldrVue implements Vue { protected MouseTrap = new MouseTrap(this.$el); public hotKeys: HotKey[] = []; + /** + * Print a message to the console. Prefixes the message with the component + * name. + */ + protected log(message?: any, ...optionalParams: any[]): void { + console.log(`[V.${this.$options.name}]: `, message, ...optionalParams); + } + + /** + * Print an error message to the console. Prefixes the message with the + * component name. + * + * @param message + */ + protected error(message?: any, ...optionalParams: any[]): void { + console.error(`[V.${this.$options.name}]: `, message, ...optionalParams); + } + + /** + * Print a warning message to the console. Prefixes the message with the + * component name. + * @param message + */ + protected warn(message?: any, ...optionalParams: any[]): void { + console.warn(`[V.${this.$options.name}]: `, message, ...optionalParams); + } + /** * Returns the time in milliseconds since the element was created */ From c0a59466a376ac81f29bd2f31b67f5fcd1500fca Mon Sep 17 00:00:00 2001 From: Colin Kennedy Date: Mon, 30 Sep 2024 23:56:16 -0300 Subject: [PATCH 3/3] Reinstate lerna bootstrap --- .github/workflows/build-vue.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-vue.yml b/.github/workflows/build-vue.yml index 7ffe92d2..012a2e99 100644 --- a/.github/workflows/build-vue.yml +++ b/.github/workflows/build-vue.yml @@ -17,6 +17,7 @@ jobs: - run: npm install -g yarn@1.22.17 # version? 1.22.17 -> 1.22.19 current - run: npm install -g lerna@3.22.1 # version? 3.22.1 -> 6.6.2 current - run: npm install -g typescript@4.5.5 # version? 4.5.5 -> 5.1.3 current + - run: lerna bootstrap - name: Build run: | printf "${{ secrets.VUE_ENV }}" > ./packages/vue/.env.production