Skip to content

Commit 23e59b8

Browse files
bourgeoabourgeoa
authored
Merge pull request SolidOS#482 from solid/updateDep
Update dep
2 parents 48ad957 + abb71d3 commit 23e59b8

42 files changed

Lines changed: 28096 additions & 21377 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.storybook/main.js‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
11
module.exports = {
2-
stories: [
3-
"../src/**/*.stories.@(js|jsx|ts|tsx|mdx)"
4-
],
2+
stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
53
addons: [
64
"@storybook/addon-links",
75
"@storybook/addon-essentials"
86
],
9-
webpackFinal: async (config) => {
10-
config.externals = {
11-
'fs': 'null',
12-
'node-uuid': 'null',
13-
'node-fetch': 'fetch',
14-
'isomorphic-fetch': 'fetch',
15-
'xmldom': 'window',
16-
'text-encoding': 'TextEncoder',
17-
'whatwg-url': 'window',
18-
'@trust/webcrypto': 'crypto'
19-
}
20-
// Return the altered config
21-
return config;
22-
},
23-
};
7+
core: {
8+
builder: "webpack5"
9+
}
10+
}

‎package-lock.json‎

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

‎package.json‎

Lines changed: 37 additions & 39 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 build-version && 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,65 +53,63 @@
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-
"rdflib": "^2.2.17",
61+
"rdflib": "^2.2.18",
6662
"solid-logic": "^1.3.14",
6763
"solid-namespace": "^0.5.2",
68-
"stream-browserify": "^3.0.0",
6964
"uuid": "^8.3.2"
7065
},
7166
"devDependencies": {
72-
"@babel/cli": "^7.16.0",
73-
"@babel/core": "^7.16.5",
74-
"@babel/plugin-proposal-class-properties": "^7.16.5",
75-
"@babel/plugin-proposal-optional-chaining": "^7.16.5",
76-
"@babel/plugin-transform-async-to-generator": "^7.16.5",
77-
"@babel/plugin-transform-runtime": "^7.16.5",
78-
"@babel/preset-env": "^7.16.5",
79-
"@babel/preset-typescript": "^7.16.5",
80-
"@storybook/addon-actions": "^6.4.9",
81-
"@storybook/addon-essentials": "^6.4.9",
82-
"@storybook/addon-links": "^6.4.9",
83-
"@storybook/html": "^6.4.9",
84-
"@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",
8583
"@testing-library/user-event": "^13.5.0",
86-
"@types/jest": "^27.0.3",
84+
"@types/jest": "^27.4.1",
8785
"@types/jsdom": "^16.2.14",
88-
"@types/node": "^17.0.5",
89-
"@typescript-eslint/eslint-plugin": "^5.8.0",
90-
"@typescript-eslint/parser": "^5.8.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",
9190
"babel-loader": "^8.2.3",
92-
"eslint": "^7.32.0",
93-
"eslint-config-standard": "^16.0.3",
91+
"eslint": "^8.11.0",
92+
"eslint-config-standard": "^17.0.0-1",
9493
"eslint-import-resolver-typescript": "^2.5.0",
9594
"eslint-plugin-import": "^2.25.4",
96-
"eslint-plugin-jest": "^25.3.0",
95+
"eslint-plugin-jest": "^26.1.1",
96+
"eslint-plugin-n": "^15.0.1",
9797
"eslint-plugin-node": "^11.1.0",
9898
"eslint-plugin-promise": "^6.0.0",
99-
"html-webpack-plugin": "^4.5.2",
99+
"html-webpack-plugin": "^5.5.0",
100100
"husky": "^7.0.4",
101-
"jest": "^27.4.5",
101+
"jest": "^27.5.1",
102102
"jsdom": "^19.0.0",
103-
"lint-staged": "^12.1.4",
104-
"nock": "^13.2.1",
105-
"raw-loader": "^4.0.2",
103+
"lint-staged": "^12.3.7",
104+
"nock": "^13.2.4",
106105
"react": "^17.0.2",
107106
"react-dom": "^17.0.2",
108107
"react-is": "^17.0.2",
109-
"standard": "^16.0.4",
110-
"ts-jest": "^27.1.2",
111-
"typedoc": "^0.22.10",
112-
"typescript": "^4.5.4",
113-
"webpack": "^4.46.0",
114-
"webpack-cli": "^3.3.12"
108+
"ts-jest": "^27.1.3",
109+
"typedoc": "^0.22.13",
110+
"typescript": "^4.6.2",
111+
"webpack": "^5.70.0",
112+
"webpack-cli": "^4.9.2"
115113
},
116114
"husky": {
117115
"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/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/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ import * as tabs from './tabs'
6767
import * as utils from './utils'
6868
import * as login from './login/login'
6969
import * as widgets from './widgets/index'
70-
import versionInfo from './versionInfo'
70+
import { versionInfo } from './versionInfo'
7171
import { initHeader } from './header'
7272
import { initFooter } from './footer'
7373
import * as createTypes from './create/types'

‎src/login/login.ts‎

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

789789
const me = offlineTestID()
790790
const box = dom.createElement('div')
791-
const context: AuthenticationContext = { me: me, dom: dom, div: box }
791+
const context: AuthenticationContext = { me, dom, div: box }
792792

793793
function say (s, background) {
794794
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 => {

0 commit comments

Comments
 (0)