SolidOS · bourgeoa · Mar 25, 2022 · Mar 18, 2022 · Mar 18, 2022 · Mar 18, 2022
diff --git a/.storybook/main.js b/.storybook/main.js
@@ -1,23 +1,10 @@
 module.exports = {
-  stories: [
-    "../src/**/*.stories.@(js|jsx|ts|tsx|mdx)"
-  ],
+  stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
   addons: [
     "@storybook/addon-links",
     "@storybook/addon-essentials"
   ],
-  webpackFinal: async (config) => {
-    config.externals = {
-      'fs': 'null',
-      'node-uuid': 'null',
-      'node-fetch': 'fetch',
-      'isomorphic-fetch': 'fetch',
-      'xmldom': 'window',
-      'text-encoding': 'TextEncoder',
-      'whatwg-url': 'window',
-      '@trust/webcrypto': 'crypto'
-    }
-    // Return the altered config
-    return config;
-  },
-};
+  core: {
+    builder: "webpack5"
+  }
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "lint-fix": "eslint \"src/**/*.js\" \"src/**/*.ts\" --fix",
     "jest": "jest",
     "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --watch",
-    "test": "npm run build && npm run lint && npm run jest",
+    "test": "npm run build-version && npm run lint && npm run jest",
     "doc": "typedoc --out ./Documentation/api/ ./src/ --excludeInternal",
     "prepublishOnly": "npm test && npm run build",
     "postpublish": "git push origin main --follow-tags",
@@ -53,65 +53,63 @@
   },
   "homepage": "https://github.com/solid/solid-ui",
   "dependencies": {
-    "@babel/runtime": "^7.16.5",
-    "@storybook/addon-docs": "^6.4.18",
-    "crypto-browserify": "^3.12.0",
     "escape-html": "^1.0.3",
     "jss": "^10.9.0",
     "jss-preset-default": "^10.9.0",
-    "mime-types": "^2.1.34",
+    "mime-types": "^2.1.35",
     "pane-registry": "^2.4.7",
-    "path-browserify": "^1.0.1",
-    "rdflib": "^2.2.17",
+    "rdflib": "^2.2.18",
     "solid-logic": "^1.3.14",
     "solid-namespace": "^0.5.2",
-    "stream-browserify": "^3.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.0",
-    "@babel/core": "^7.16.5",
-    "@babel/plugin-proposal-class-properties": "^7.16.5",
-    "@babel/plugin-proposal-optional-chaining": "^7.16.5",
-    "@babel/plugin-transform-async-to-generator": "^7.16.5",
-    "@babel/plugin-transform-runtime": "^7.16.5",
-    "@babel/preset-env": "^7.16.5",
-    "@babel/preset-typescript": "^7.16.5",
-    "@storybook/addon-actions": "^6.4.9",
-    "@storybook/addon-essentials": "^6.4.9",
-    "@storybook/addon-links": "^6.4.9",
-    "@storybook/html": "^6.4.9",
-    "@testing-library/dom": "^8.11.1",
+    "@babel/cli": "^7.17.6",
+    "@babel/core": "^7.17.7",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+    "@babel/plugin-transform-async-to-generator": "^7.16.8",
+    "@babel/plugin-transform-runtime": "^7.17.0",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/preset-typescript": "^7.16.7",
+    "@babel/runtime": "^7.17.7",
+    "@storybook/addon-docs": "^6.4.19",
+    "@storybook/addon-essentials": "^6.4.19",
+    "@storybook/addon-links": "^6.4.19",
+    "@storybook/builder-webpack5": "^6.4.19",
+    "@storybook/html": "^6.4.19",
+    "@storybook/manager-webpack5": "^6.4.19",
+    "@testing-library/dom": "^8.11.3",
     "@testing-library/user-event": "^13.5.0",
-    "@types/jest": "^27.0.3",
+    "@types/jest": "^27.4.1",
     "@types/jsdom": "^16.2.14",
-    "@types/node": "^17.0.5",
-    "@typescript-eslint/eslint-plugin": "^5.8.0",
-    "@typescript-eslint/parser": "^5.8.0",
+    "@types/node": "^17.0.21",
+    "@types/react": "^17.0.40",
+    "@typescript-eslint/eslint-plugin": "^5.15.0",
+    "@typescript-eslint/parser": "^5.15.0",
     "babel-loader": "^8.2.3",
-    "eslint": "^7.32.0",
-    "eslint-config-standard": "^16.0.3",
+    "eslint": "^8.11.0",
+    "eslint-config-standard": "^17.0.0-1",
     "eslint-import-resolver-typescript": "^2.5.0",
     "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jest": "^25.3.0",
+    "eslint-plugin-jest": "^26.1.1",
+    "eslint-plugin-n": "^15.0.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "html-webpack-plugin": "^4.5.2",
+    "html-webpack-plugin": "^5.5.0",
     "husky": "^7.0.4",
-    "jest": "^27.4.5",
+    "jest": "^27.5.1",
     "jsdom": "^19.0.0",
-    "lint-staged": "^12.1.4",
-    "nock": "^13.2.1",
-    "raw-loader": "^4.0.2",
+    "lint-staged": "^12.3.7",
+    "nock": "^13.2.4",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-is": "^17.0.2",
-    "standard": "^16.0.4",
-    "ts-jest": "^27.1.2",
-    "typedoc": "^0.22.10",
-    "typescript": "^4.5.4",
-    "webpack": "^4.46.0",
-    "webpack-cli": "^3.3.12"
+    "ts-jest": "^27.1.3",
+    "typedoc": "^0.22.13",
+    "typescript": "^4.6.2",
+    "webpack": "^5.70.0",
+    "webpack-cli": "^4.9.2"
   },
   "husky": {
     "hooks": {

diff --git a/src/acl/access-groups.ts b/src/acl/access-groups.ts
@@ -250,7 +250,7 @@ function findAgent (uri, kb): PartialAgentTriple | null {
   // An Origin URI is one like https://fred.github.io eith no trailing slash
   if (uri.startsWith('http') && uri.split('/').length === 3) {
     // there is no third slash
-    return { pred: 'origin', obj: obj } // The only way to know an origin alas
+    return { pred: 'origin', obj } // The only way to know an origin alas
   }
   // @@ This is an almighty kludge needed because drag and drop adds extra slashes to origins
   if (
@@ -263,18 +263,18 @@ function findAgent (uri, kb): PartialAgentTriple | null {
     return { pred: 'origin', obj: sym(uri.slice(0, -1)) } // Fix a URI where the drag and drop system has added a spurious slash
   }
 
-  if (ns.vcard('WebID').uri in types) return { pred: 'agent', obj: obj }
+  if (ns.vcard('WebID').uri in types) return { pred: 'agent', obj }
 
   if (ns.vcard('Group').uri in types) {
-    return { pred: 'agentGroup', obj: obj } // @@ note vcard membership not RDFs
+    return { pred: 'agentGroup', obj } // @@ note vcard membership not RDFs
   }
   if (
     obj.sameTerm(ns.foaf('Agent')) ||
     obj.sameTerm(ns.acl('AuthenticatedAgent')) || // AuthenticatedAgent
     obj.sameTerm(ns.rdf('Resource')) ||
     obj.sameTerm(ns.owl('Thing'))
   ) {
-    return { pred: 'agentClass', obj: obj }
+    return { pred: 'agentClass', obj }
   }
   if (
     ns.vcard('Individual').uri in types ||
@@ -283,13 +283,13 @@ function findAgent (uri, kb): PartialAgentTriple | null {
   ) {
     const pref = kb.any(obj, ns.foaf('preferredURI'))
     if (pref) return { pred: 'agent', obj: sym(pref) }
-    return { pred: 'agent', obj: obj }
+    return { pred: 'agent', obj }
   }
   if (ns.solid('AppProvider').uri in types) {
-    return { pred: 'origin', obj: obj }
+    return { pred: 'origin', obj }
   }
   if (ns.solid('AppProviderClass').uri in types) {
-    return { pred: 'originClass', obj: obj }
+    return { pred: 'originClass', obj }
   }
   debug.log('    Triage fails for ' + uri)
   return null

diff --git a/src/chat/message.js b/src/chat/message.js
@@ -447,7 +447,7 @@ export function renderMessageEditor (channelObject, messageTable, userContext, o
   // messageEditor.appendChild(dom.createElement('br'))
 
   let field, sendButton
-  const context = { div: middle, dom: dom }
+  const context = { div: middle, dom }
 
   ensureLoggedIn(context).then(context => {
     // me = context.me

diff --git a/src/chat/thread.js b/src/chat/thread.js
@@ -153,7 +153,7 @@ export function thread (dom, kb, subject, messageStore, options) {
       rhs.appendChild(sendButton)
     }
 
-    const context = { div: middle, dom: dom }
+    const context = { div: middle, dom }
     login.ensureLoggedIn(context).then(context => {
       me = context.me
       turnOnInput()

diff --git a/src/create/create.ts b/src/create/create.ts
@@ -81,7 +81,7 @@ export function newThingUI (
         ensureLoadedProfile(createContext).then(
           _context => {
             const newPaneOptions: NewPaneOptions = Object.assign({
-              newBase: newBase,
+              newBase,
               folder: options.folder || undefined,
               workspace: ws
             }, options)

diff --git a/src/index.ts b/src/index.ts
@@ -67,7 +67,7 @@ import * as tabs from './tabs'
 import * as utils from './utils'
 import * as login from './login/login'
 import * as widgets from './widgets/index'
-import versionInfo from './versionInfo'
+import { versionInfo } from './versionInfo'
 import { initHeader } from './header'
 import { initFooter } from './footer'
 import * as createTypes from './create/types'

diff --git a/src/login/login.ts b/src/login/login.ts
@@ -788,7 +788,7 @@ export function selectWorkspace (
 
   const me = offlineTestID()
   const box = dom.createElement('div')
-  const context: AuthenticationContext = { me: me, dom: dom, div: box }
+  const context: AuthenticationContext = { me, dom, div: box }
 
   function say (s, background) {
     box.appendChild(widgets.errorMessageBlock(dom, s, background))

diff --git a/src/media/media-capture.ts b/src/media/media-capture.ts
@@ -153,7 +153,7 @@ export function cameraCaptureControl (
     ;(store as any).fetcher
       .webOperation('PUT', destination.uri, {
         data: blob,
-        contentType: contentType
+        contentType
       })
       .then(
         _resp => {

diff --git a/src/messageArea.js b/src/messageArea.js
@@ -170,7 +170,7 @@ export function messageArea (dom, kb, subject, messageStore, options) {
       rhs.appendChild(sendButton)
     }
 
-    const context = { div: middle, dom: dom }
+    const context = { div: middle, dom }
     login.ensureLoggedIn(context).then(context => {
       me = context.me
       turnOnInput()

diff --git a/src/stories/Buttons.stories.mdx b/src/stories/Buttons.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks';
+import { Canvas, Meta, Story } from '@storybook/addon-docs';
 import { action } from '@storybook/addon-actions'
 
 <Meta title="Buttons" />

diff --git a/src/stories/DateTime.stories.mdx b/src/stories/DateTime.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 
 <Meta title="Date & Time"/>
 

diff --git a/src/stories/Display.stories.mdx b/src/stories/Display.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 
 <Meta title="Display"/>
 

diff --git a/src/stories/DomManipulation.stories.mdx b/src/stories/DomManipulation.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 
 <Meta title="DOM manipulation" />
 

diff --git a/src/stories/DragAndDrop.stories.mdx b/src/stories/DragAndDrop.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story, Props } from '@storybook/addon-docs/blocks';
+import { Canvas, Meta, Story, Props } from '@storybook/addon-docs';
 import { action } from '@storybook/addon-actions'
 
 <Meta title="Drag & Drop"/>

diff --git a/src/stories/Events.stories.mdx b/src/stories/Events.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks';
+import { Canvas, Meta, Story } from '@storybook/addon-docs';
 import { action } from '@storybook/addon-actions'
 
 <Meta title="Events" />

diff --git a/src/stories/Header.stories.mdx b/src/stories/Header.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 
 <Meta title="Header"/>
 

diff --git a/src/stories/Images.stories.mdx b/src/stories/Images.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 import { rawJsonDecorator } from './decorators'
 
 export const imageDecorator = (Story) => {

diff --git a/src/stories/Interactive.stories.mdx b/src/stories/Interactive.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 
 import { action } from '@storybook/addon-actions'
 

diff --git a/src/stories/Log.stories.mdx b/src/stories/Log.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 
 <Meta title="Log"/>
 

diff --git a/src/stories/Matrix.stories.mdx b/src/stories/Matrix.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 
 <Meta title="Matrix"/>
 

diff --git a/src/stories/MediaTypes.stories.mdx b/src/stories/MediaTypes.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 import { rawJsonDecorator } from './decorators'
 
 <Meta title="Media Types" />

diff --git a/src/stories/Notepad.stories.mdx b/src/stories/Notepad.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 import { rawJsonDecorator } from './decorators'
 
 <Meta title="Notepad" />

diff --git a/src/stories/RdfUtils.stories.mdx b/src/stories/RdfUtils.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 import { rawJsonDecorator } from './decorators'
 
 <Meta title="RDF utilities" />

diff --git a/src/stories/Tabs.stories.mdx b/src/stories/Tabs.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story, Props } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story, Props } from '@storybook/addon-docs'
 import { action } from '@storybook/addon-actions'
 
 <Meta title="Tabs"/>

diff --git a/src/stories/Widgets.stories.mdx b/src/stories/Widgets.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 
 <Meta title="Widgets" />
 

diff --git a/src/stories/forms/Fields.stories.mdx b/src/stories/forms/Fields.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 import { action } from '@storybook/addon-actions'
 
 <Meta title="Forms/fields" />

diff --git a/src/stories/forms/Forms.stories.mdx b/src/stories/forms/Forms.stories.mdx
@@ -1,6 +1,6 @@
 import * as UI from '../../../lib'
 
-import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
+import { Canvas, Meta, Story } from '@storybook/addon-docs'
 
 <Meta title="Forms/appendForm" />