merge main

Author: timea-solid

.babelrc

@@ -5,10 +5,10 @@ permissions:
 on:
   push:
     branches:
-      - "**"
+      - main
   pull_request:
     branches:
-      - "**"  
+      - main
   workflow_dispatch:
 
 jobs:
@@ -17,11 +17,10 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 18.x
           - 20.x
           - 22.x
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v6
         with:
@@ -32,7 +31,7 @@ jobs:
       - run: npm run doc
       - name: Save build
         if: matrix.node-version == '20.x'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: build
           path: |
@@ -45,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v7
         with:
           name: build
       - uses: peaceiris/actions-gh-pages@v4
@@ -69,18 +68,18 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v7
         with:
           name: build
       - uses: actions/setup-node@v6
         with:
           node-version: 20.x
-      - uses: rlespinasse/github-slug-action@v3.x
+      - uses: rlespinasse/github-slug-action@v4.x
       - name: Append commit hash to package version
         run: 'sed -i -E "s/(\"version\": *\"[^\"]+)/\1-${GITHUB_SHA_SHORT}/" package.json'
       - name: Disable pre- and post-publish actions
         run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
-      - uses: JS-DevTools/npm-publish@v4.1.0
+      - uses: JS-DevTools/npm-publish@v4.1.4
         if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
         with:
           token: ${{ secrets.NPM_TOKEN }}
@@ -91,15 +90,15 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v7
         with:
           name: build
       - uses: actions/setup-node@v6
         with:
           node-version: 20.x
       - name: Disable pre- and post-publish actions
         run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
-      - uses: JS-DevTools/npm-publish@v4.1.0
+      - uses: JS-DevTools/npm-publish@v4.1.4
         if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]' 
         with:
           token: ${{ secrets.NPM_TOKEN }}

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ src/versionInfo.ts
 .idea
 .vscode
 coverage
-Documentation/api
+docs/api
 examples/storybook
 .history/
-Documentation/form-examples/main.js
+docs/form-examples/solid-ui.js

.gitignore

@@ -1,10 +1,11 @@
 export default {
-  stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
+  stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
 
   addons: [
     '@storybook/addon-links',
-    '@storybook/addon-actions',
-    '@storybook/addon-essentials'
+    '@storybook/addon-essentials',
+    '@storybook/addon-mdx-gfm',
+    '@storybook/addon-webpack5-compiler-swc'
   ],
 
   framework: {
@@ -14,5 +15,28 @@ export default {
 
   docs: {
     autodocs: true
+  },
+  webpackFinal: async (config) => {
+    // For Storybook, we DON'T externalize rdflib and solid-logic
+    // Instead, we let webpack bundle them from node_modules
+
+    // Handle Node.js modules for browser
+    config.resolve.fallback = {
+      ...config.resolve.fallback,
+      path: false,
+      fs: false,
+      crypto: false,
+      stream: false,
+      util: false,
+      buffer: false
+    }
+
+    // Alias $rdf to rdflib for solid-logic compatibility
+    config.resolve.alias = {
+      ...config.resolve.alias,
+      $rdf: 'rdflib'
+    }
+
+    return config
   }
 }

.npmignore

@@ -1,3 +1,11 @@
-export const parameters = {
-  actions: { argTypesRegex: '^on[A-Z].*' },
+// For backward compatibility, provide rdflib and solid-logic as globals
+import * as rdflib from 'rdflib'
+import * as solidLogic from 'solid-logic'
+
+// Some legacy code might expect these as globals
+if (typeof window !== 'undefined') {
+  window.$rdf = rdflib
+  window.SolidLogic = solidLogic
 }
+
+export const parameters = {}

.storybook/main.js

@@ -1,4 +1,6 @@
-Copyright 2019 - present
+MIT License
+
+Copyright (c) 2019 Solid
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.