Merge pull request #84 from mbland/use-rollup-plugin-handlebars-preco…

…mpiler-npm Use rollup-plugin-handlebars-precompiler npm
mbland · Jan 11, 2024 · 218d2f7 · 218d2f7
2 parents b0f1709 + 5cbb490
commit 218d2f7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 193 deletions.
diff --git a/strcalc/src/main/frontend/package.json b/strcalc/src/main/frontend/package.json
@@ -44,6 +44,7 @@
     "handlebars": "^4.7.8",
     "jsdoc-cli-wrapper": "^1.0.4",
     "jsdom": "^23.1.0",
+    "rollup-plugin-handlebars-precompiler": "^1.0.0",
     "test-page-opener": "^1.0.3",
     "vite": "^5.0.11",
     "vitest": "^1.1.3",

diff --git a/strcalc/src/main/frontend/plugins/rollup-plugin-handlebars-precompiler.js b/strcalc/src/main/frontend/plugins/rollup-plugin-handlebars-precompiler.js
diff --git a/strcalc/src/main/frontend/pnpm-lock.yaml b/strcalc/src/main/frontend/pnpm-lock.yaml
diff --git a/strcalc/src/main/frontend/vite.config.js b/strcalc/src/main/frontend/vite.config.js
@@ -1,7 +1,5 @@
-import handlebarsPrecompiler from
-  './plugins/rollup-plugin-handlebars-precompiler.js'
+import HandlebarsPrecompiler from 'rollup-plugin-handlebars-precompiler'
 import { defineConfig } from 'vite'
-import { configDefaults } from 'vitest/config'
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path/posix'
@@ -69,7 +67,7 @@ function getProviderOptions(){
 export default defineConfig({
   base: '/strcalc/',
   plugins: [
-    handlebarsPrecompiler({ helpers: ['components/helpers.js'] })
+    HandlebarsPrecompiler({ helpers: ['components/helpers.js'] })
   ],
   define: {
     STRCALC_BACKEND: JSON.stringify(process.env.STRCALC_BACKEND)
@@ -84,10 +82,7 @@ export default defineConfig({
   test: {
     outputFile: buildDir('test-results/test-frontend/TESTS-TestSuites.xml'),
     coverage: {
-      reportsDirectory: buildDir('reports/frontend/coverage'),
-      // Remove 'exclude:' once rollup-plugin-handlebars-precompile
-      // and bin/jsdoc-cli-wrapper.js move into their own repositories.
-      exclude: [ ...configDefaults.coverage.exclude, 'plugins/*', 'bin/*' ]
+      reportsDirectory: buildDir('reports/frontend/coverage')
     },
     server: {
       deps: {