@eventcatalog/core 2.2.5 → 2.2.6

package/.github/workflows/verify-build.yml

@@ -11,7 +11,10 @@ jobs:
   build:
     name: Verify Build
     timeout-minutes: 30
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -19,9 +22,5 @@ jobs:
           node-version: '20.x'
       - name: Installation
         run: npm i
-      - name: Log
-        run: ls
-      - name: Log2
-        run: pwd
       - name: Build
         run: npm run verify-build:catalog

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @eventcatalog/core
 
+## 2.2.6
+
+### Patch Changes
+
+- 50a43e0: core(fix): removed forward slash before # to prevent double trailing slash
+- 8104078: chore(core): added windows tests and fixed watcher to work with changelogs files on windows
+
 ## 2.2.5
 
 ### Patch Changes

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eventcatalog/core",
   "type": "module",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "publishConfig": {
     "access": "public"
   },
@@ -16,7 +16,7 @@
     "test": "jest --config=$(pwd)/../../jest.config.js",
     "start": "astro dev",
     "build": "npm run scripts:hydrate-content && astro check --minimumSeverity error && astro build",
-    "build:cd": "node scripts/build-ci.js && astro check --minimumSeverity error && astro build",
+    "build:cd": "node scripts/build-ci.js",
     "preview": "astro preview",
     "astro": "astro",
     "scripts:hydrate-content": "node scripts/catalog-to-astro-content-directory.js",

package/scripts/build-ci.js

@@ -16,7 +16,7 @@ fs.copyFileSync(join(projectDIR, 'eventcatalog.config.js'), join(catalogDir, 'ev
 
 fs.copyFileSync(join(projectDIR, 'eventcatalog.styles.css'), join(catalogDir, 'eventcatalog.styles.css'));
 
-execSync(`cross-env NODE_ENV=CI PROJECT_DIR=${projectDIR} CATALOG_DIR=${catalogDir} npm run scripts:hydrate-content`, {
+execSync(`cross-env NODE_ENV=CI PROJECT_DIR=${projectDIR} CATALOG_DIR=${catalogDir} npm run build`, {
   cwd: catalogDir,
   stdio: 'inherit',
 });

package/scripts/catalog-to-astro-content-directory.js

@@ -40,17 +40,19 @@ const copyFiles = async ({ source, target, catalogFilesDir, pathToMarkdownFiles,
 
   // Copy markdown files into the astro content (collection) folder
   for (const file of markdownFiles) {
-    const targetPath = getTargetPath(source, target, type, file);
+    let fileTarget = target;
+
+    // If they are change logs they need to go into their own content folder
+    if (file.includes('changelog.md')) {
+      fileTarget = path.join(target, 'changelogs');
+    }
+
+    const targetPath = getTargetPath(source, fileTarget, type, file);
 
     //ensure the directory exists
     ensureDirSync(path.dirname(targetPath));
 
-    if (file.includes('changelog.md')) {
-      const target = targetPath.replace('/content', '/content/changelogs');
-      fs.cpSync(file, target.replace('changelog.md', 'changelog.mdx'));
-    } else {
-      fs.cpSync(file, targetPath.replace('index.md', 'index.mdx').replace('changelog.md', 'changelog.mdx'));
-    }
+    fs.cpSync(file, targetPath.replace('index.md', 'index.mdx').replace('changelog.md', 'changelog.mdx'));
   }
 
   // Copy all other files (non markdown) files into catalog-files directory (non collection)

package/scripts/watcher.js

@@ -35,6 +35,10 @@ for (let item of [...verifiedWatchList]) {
       // Check if changlogs, they need to go into their own content folder
       if (file.includes('changelog.md')) {
         newPath = newPath.replace('src/content', 'src/content/changelogs');
+
+        if (os.platform() == 'win32') {
+          newPath = newPath.replace('src\\content', 'src\\content\\changelogs');
+        }
       }
 
       // If config files have changes

package/src/components/DocsNavigation.astro

@@ -95,7 +95,7 @@ const currentPath = Astro.url.pathname;
                   {item.items.map((heading: any) => {
                     return (
                       <li class="text-xs">
-                        <a href={`${item.href}/#${heading.slug}`}>{heading.text}</a>
+                        <a href={`${item.href}#${heading.slug}`}>{heading.text}</a>
                       </li>
                     );
                   })}

package/src/pages/docs/[type]/[id]/[version]/index.astro

@@ -133,7 +133,7 @@ const badges = [
       <div>
         <!-- @ts-ignore -->
         <SchemaViewer id={props.data.id} catalog={props.catalog}  />
-        <NodeGraph id={props.data.id} collection={props.collection} version={props.data.version} mode="simple" href={{ label: 'Open in Visualiser', url: `/visualiser/${props.collection}/${props.data.id}/${props.data.version}`}} />
+        <NodeGraph id={props.data.id} collection={props.collection} version={props.data.version} mode="simple" href={{ label: 'Open in Visualiser', url: buildUrl(`/visualiser/${props.collection}/${props.data.id}/${props.data.version}`)}} />
       </div>
       <Footer />
     </main>