Skip to content

Commit 001e40d

Browse files
timea-solidtimea-solid
committed
cleaned and updated dep and configs
1 parent 1c75c97 commit 001e40d

40 files changed

+49264
-16175
lines changed

‎package-lock.json

Lines changed: 49158 additions & 16060 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 36 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"lint-fix": "eslint \"src/**/*.js\" \"src/**/*.ts\" --fix",
2222
"jest": "jest",
2323
"test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --watch",
24-
"test": "npm run build && npm run lint && npm run jest",
24+
"test": "npm run lint && npm run jest",
2525
"doc": "typedoc --out ./Documentation/api/ ./src/ --excludeInternal",
2626
"prepublishOnly": "npm test && npm run build",
2727
"postpublish": "git push origin main --follow-tags",
@@ -53,69 +53,62 @@
5353
},
5454
"homepage": "https://github.com/solid/solid-ui",
5555
"dependencies": {
56-
"@babel/runtime": "^7.16.5",
57-
"@storybook/addon-docs": "^6.4.18",
58-
"crypto-browserify": "^3.12.0",
5956
"escape-html": "^1.0.3",
6057
"jss": "^10.9.0",
6158
"jss-preset-default": "^10.9.0",
62-
"mime-types": "^2.1.34",
59+
"mime-types": "^2.1.35",
6360
"pane-registry": "^2.4.7",
64-
"path-browserify": "^1.0.1",
65-
"postcss-flexbugs-fixes": "^5.0.2",
66-
"rdflib": "^2.2.17",
61+
"rdflib": "^2.2.18",
6762
"solid-logic": "^1.3.14",
6863
"solid-namespace": "^0.5.2",
69-
"stream-browserify": "^3.0.0",
7064
"uuid": "^8.3.2"
7165
},
7266
"devDependencies": {
73-
"@babel/cli": "^7.16.0",
74-
"@babel/core": "^7.16.5",
75-
"@babel/plugin-proposal-class-properties": "^7.16.5",
76-
"@babel/plugin-proposal-optional-chaining": "^7.16.5",
77-
"@babel/plugin-transform-async-to-generator": "^7.16.5",
78-
"@babel/plugin-transform-runtime": "^7.16.5",
79-
"@babel/preset-env": "^7.16.5",
80-
"@babel/preset-typescript": "^7.16.5",
81-
"@storybook/addon-actions": "^6.4.9",
82-
"@storybook/addon-essentials": "^6.4.9",
83-
"@storybook/addon-links": "^6.4.9",
84-
"@storybook/addon-postcss": "^2.0.0",
85-
"@storybook/html": "^6.4.9",
86-
"@testing-library/dom": "^8.11.1",
67+
"@babel/cli": "^7.17.6",
68+
"@babel/core": "^7.17.7",
69+
"@babel/plugin-proposal-class-properties": "^7.16.7",
70+
"@babel/plugin-proposal-optional-chaining": "^7.16.7",
71+
"@babel/plugin-transform-async-to-generator": "^7.16.8",
72+
"@babel/plugin-transform-runtime": "^7.17.0",
73+
"@babel/preset-env": "^7.16.11",
74+
"@babel/preset-typescript": "^7.16.7",
75+
"@babel/runtime": "^7.17.7",
76+
"@storybook/addon-docs": "^6.4.19",
77+
"@storybook/addon-essentials": "^6.4.19",
78+
"@storybook/addon-links": "^6.4.19",
79+
"@storybook/builder-webpack5": "^6.4.19",
80+
"@storybook/html": "^6.4.19",
81+
"@storybook/manager-webpack5": "^6.4.19",
82+
"@testing-library/dom": "^8.11.3",
8783
"@testing-library/user-event": "^13.5.0",
88-
"@types/jest": "^27.0.3",
84+
"@types/jest": "^27.4.1",
8985
"@types/jsdom": "^16.2.14",
90-
"@types/node": "^17.0.5",
91-
"@typescript-eslint/eslint-plugin": "^5.8.0",
92-
"@typescript-eslint/parser": "^5.8.0",
93-
"autoprefixer": "^10.4.0",
86+
"@types/node": "^17.0.21",
87+
"@types/react": "^17.0.40",
88+
"@typescript-eslint/eslint-plugin": "^5.15.0",
89+
"@typescript-eslint/parser": "^5.15.0",
9490
"babel-loader": "^8.2.3",
95-
"eslint": "^7.32.0",
96-
"eslint-config-standard": "^16.0.3",
91+
"eslint": "^8.11.0",
92+
"eslint-config-standard": "^17.0.0-1",
9793
"eslint-import-resolver-typescript": "^2.5.0",
9894
"eslint-plugin-import": "^2.25.4",
99-
"eslint-plugin-jest": "^25.3.0",
95+
"eslint-plugin-jest": "^26.1.1",
10096
"eslint-plugin-node": "^11.1.0",
10197
"eslint-plugin-promise": "^6.0.0",
102-
"html-webpack-plugin": "^4.5.2",
98+
"html-webpack-plugin": "^5.5.0",
10399
"husky": "^7.0.4",
104-
"jest": "^27.4.5",
100+
"jest": "^27.5.1",
105101
"jsdom": "^19.0.0",
106-
"lint-staged": "^12.1.4",
107-
"nock": "^13.2.1",
108-
"postcss-flexbugs-fixes": "^5.0.2",
109-
"raw-loader": "^4.0.2",
102+
"lint-staged": "^12.3.7",
103+
"nock": "^13.2.4",
110104
"react": "^17.0.2",
111105
"react-dom": "^17.0.2",
112106
"react-is": "^17.0.2",
113-
"standard": "^16.0.4",
114-
"ts-jest": "^27.1.2",
115-
"typedoc": "^0.22.10",
116-
"typescript": "^4.5.4",
117-
"webpack": "^4.46.0",
118-
"webpack-cli": "^3.3.12"
107+
"ts-jest": "^27.1.3",
108+
"typedoc": "^0.22.13",
109+
"typescript": "^4.6.2",
110+
"webpack": "^5.70.0",
111+
"webpack-cli": "^4.9.2"
119112
},
120113
"husky": {
121114
"hooks": {

‎src/acl/access-groups.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ function findAgent (uri, kb): PartialAgentTriple | null {
250250
// An Origin URI is one like https://fred.github.io eith no trailing slash
251251
if (uri.startsWith('http') && uri.split('/').length === 3) {
252252
// there is no third slash
253-
return { pred: 'origin', obj: obj } // The only way to know an origin alas
253+
return { pred: 'origin', obj } // The only way to know an origin alas
254254
}
255255
// @@ This is an almighty kludge needed because drag and drop adds extra slashes to origins
256256
if (
@@ -263,18 +263,18 @@ function findAgent (uri, kb): PartialAgentTriple | null {
263263
return { pred: 'origin', obj: sym(uri.slice(0, -1)) } // Fix a URI where the drag and drop system has added a spurious slash
264264
}
265265

266-
if (ns.vcard('WebID').uri in types) return { pred: 'agent', obj: obj }
266+
if (ns.vcard('WebID').uri in types) return { pred: 'agent', obj }
267267

268268
if (ns.vcard('Group').uri in types) {
269-
return { pred: 'agentGroup', obj: obj } // @@ note vcard membership not RDFs
269+
return { pred: 'agentGroup', obj } // @@ note vcard membership not RDFs
270270
}
271271
if (
272272
obj.sameTerm(ns.foaf('Agent')) ||
273273
obj.sameTerm(ns.acl('AuthenticatedAgent')) || // AuthenticatedAgent
274274
obj.sameTerm(ns.rdf('Resource')) ||
275275
obj.sameTerm(ns.owl('Thing'))
276276
) {
277-
return { pred: 'agentClass', obj: obj }
277+
return { pred: 'agentClass', obj }
278278
}
279279
if (
280280
ns.vcard('Individual').uri in types ||
@@ -283,13 +283,13 @@ function findAgent (uri, kb): PartialAgentTriple | null {
283283
) {
284284
const pref = kb.any(obj, ns.foaf('preferredURI'))
285285
if (pref) return { pred: 'agent', obj: sym(pref) }
286-
return { pred: 'agent', obj: obj }
286+
return { pred: 'agent', obj }
287287
}
288288
if (ns.solid('AppProvider').uri in types) {
289-
return { pred: 'origin', obj: obj }
289+
return { pred: 'origin', obj }
290290
}
291291
if (ns.solid('AppProviderClass').uri in types) {
292-
return { pred: 'originClass', obj: obj }
292+
return { pred: 'originClass', obj }
293293
}
294294
debug.log(' Triage fails for ' + uri)
295295
return null

‎src/acl/acl.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export function adoptACLDefault (
2525
aclDoc: NamedNode,
2626
defaultResource: NamedNode,
2727
defaultACLDoc: NamedNode
28-
): IndexedFormula {
28+
): LiveStore {
2929
const ACL = ns.acl
3030
const isContainer = doc.uri.slice(-1) === '/' // Give default for all directories
3131

@@ -46,7 +46,7 @@ export function adoptACLDefault (
4646

4747
const kb2 = graph() // Potential - derived is kept apart
4848
proposed.forEach(st => kb2.add(move(st.subject), move(st.predicate), move(st.object), sym(aclDoc.uri)))
49-
return kb2
49+
return kb2 as LiveStore
5050

5151
function move (symbol) {
5252
const y = defaultACLDoc.uri.length // The default ACL file

‎src/chat/message.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ export function renderMessageEditor (channelObject, messageTable, userContext, o
447447
// messageEditor.appendChild(dom.createElement('br'))
448448

449449
let field, sendButton
450-
const context = { div: middle, dom: dom }
450+
const context = { div: middle, dom }
451451

452452
ensureLoggedIn(context).then(context => {
453453
// me = context.me

‎src/chat/thread.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export function thread (dom, kb, subject, messageStore, options) {
153153
rhs.appendChild(sendButton)
154154
}
155155

156-
const context = { div: middle, dom: dom }
156+
const context = { div: middle, dom }
157157
login.ensureLoggedIn(context).then(context => {
158158
me = context.me
159159
turnOnInput()

‎src/create/create.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export function newThingUI (
8181
ensureLoadedProfile(createContext).then(
8282
_context => {
8383
const newPaneOptions: NewPaneOptions = Object.assign({
84-
newBase: newBase,
84+
newBase,
8585
folder: options.folder || undefined,
8686
workspace: ws
8787
}, options)

‎src/login/login.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ export function selectWorkspace (
774774

775775
const me = offlineTestID()
776776
const box = dom.createElement('div')
777-
const context: AuthenticationContext = { me: me, dom: dom, div: box }
777+
const context: AuthenticationContext = { me, dom, div: box }
778778

779779
function say (s, background) {
780780
box.appendChild(widgets.errorMessageBlock(dom, s, background))

‎src/media/media-capture.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export function cameraCaptureControl (
153153
;(store as any).fetcher
154154
.webOperation('PUT', destination.uri, {
155155
data: blob,
156-
contentType: contentType
156+
contentType
157157
})
158158
.then(
159159
_resp => {

‎src/messageArea.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export function messageArea (dom, kb, subject, messageStore, options) {
170170
rhs.appendChild(sendButton)
171171
}
172172

173-
const context = { div: middle, dom: dom }
173+
const context = { div: middle, dom }
174174
login.ensureLoggedIn(context).then(context => {
175175
me = context.me
176176
turnOnInput()

‎src/stories/Buttons.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks';
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs';
44
import { action } from '@storybook/addon-actions'
55

66
<Meta title="Buttons" />

‎src/stories/DateTime.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44

55
<Meta title="Date & Time"/>
66

‎src/stories/Display.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44

55
<Meta title="Display"/>
66

‎src/stories/DomManipulation.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44

55
<Meta title="DOM manipulation" />
66

‎src/stories/DragAndDrop.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story, Props } from '@storybook/addon-docs/blocks';
3+
import { Canvas, Meta, Story, Props } from '@storybook/addon-docs';
44
import { action } from '@storybook/addon-actions'
55

66
<Meta title="Drag & Drop"/>

‎src/stories/Events.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks';
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs';
44
import { action } from '@storybook/addon-actions'
55

66
<Meta title="Events" />

‎src/stories/Header.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44

55
<Meta title="Header"/>
66

‎src/stories/Images.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44
import { rawJsonDecorator } from './decorators'
55

66
export const imageDecorator = (Story) => {

‎src/stories/Interactive.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44

55
import { action } from '@storybook/addon-actions'
66

‎src/stories/Log.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44

55
<Meta title="Log"/>
66

‎src/stories/Matrix.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44

55
<Meta title="Matrix"/>
66

‎src/stories/MediaTypes.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44
import { rawJsonDecorator } from './decorators'
55

66
<Meta title="Media Types" />

‎src/stories/Notepad.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44
import { rawJsonDecorator } from './decorators'
55

66
<Meta title="Notepad" />

‎src/stories/RdfUtils.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44
import { rawJsonDecorator } from './decorators'
55

66
<Meta title="RDF utilities" />

‎src/stories/Tabs.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story, Props } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story, Props } from '@storybook/addon-docs'
44
import { action } from '@storybook/addon-actions'
55

66
<Meta title="Tabs"/>

‎src/stories/Widgets.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44

55
<Meta title="Widgets" />
66

‎src/stories/forms/Fields.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44
import { action } from '@storybook/addon-actions'
55

66
<Meta title="Forms/fields" />

‎src/stories/forms/Forms.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44

55
<Meta title="Forms/appendForm" />
66

‎src/stories/forms/Intro.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44

55
<Meta title="Forms/Documentation" />
66

‎src/stories/forms/Options.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as UI from '../../../lib'
22

3-
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks'
3+
import { Canvas, Meta, Story } from '@storybook/addon-docs'
44
import { action } from '@storybook/addon-actions'
55

66
<Meta title="Forms/Options" />

0 commit comments

Comments
 (0)