Skip to content

Commit a07bb68

Browse files
bourgeoabourgeoa
authored
Merge pull request SolidOS#504 from SolidOS/prune-deleted
Use new discovery logic including community management
2 parents fd705c8 + 6c33eba commit a07bb68

18 files changed

Lines changed: 42372 additions & 8355 deletions

‎package-lock.json‎

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

‎package.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"clean": "rm -rf lib dist ./Documentation/form-examples/main.js",
2020
"coverage": "jest --coverage --collectCoverageFrom=src/**/*.[jt]s",
2121
"lint": "eslint \"src/**/*.js\" \"src/**/*.ts\" \"test/**/*.ts\"",
22-
"lint-fix": "eslint \"src/**/*.js\" \"src/**/*.ts\" --fix",
22+
"lint-fix": "eslint \"src/**/*.js\" \"src/**/*.ts\" \"test/**/*.ts\" --fix",
2323
"jest": "jest",
2424
"test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --watch",
2525
"test": "npm run build-version && npm run lint && npm run jest",
@@ -55,12 +55,15 @@
5555
"homepage": "https://github.com/solidos/solid-ui",
5656
"dependencies": {
5757
"escape-html": "^1.0.3",
58+
"eslint-plugin-n": "^15.2.2",
59+
"i": "^0.3.7",
5860
"jss": "^10.9.0",
5961
"jss-preset-default": "^10.9.0",
6062
"mime-types": "^2.1.35",
61-
"pane-registry": "^2.4.10",
63+
"npm": "^8.13.2",
64+
"pane-registry": "2.4.10-e0d1abde",
6265
"rdflib": "^2.2.19",
63-
"solid-logic": "^1.3.17",
66+
"solid-logic": "1.3.17-af110ecf",
6467
"solid-namespace": "^0.5.2",
6568
"uuid": "^8.3.2"
6669
},
@@ -96,7 +99,6 @@
9699
"eslint-import-resolver-typescript": "^2.7.0",
97100
"eslint-plugin-import": "^2.25.4",
98101
"eslint-plugin-jest": "^26.1.3",
99-
"eslint-plugin-n": "^15.1.0",
100102
"eslint-plugin-node": "^11.1.0",
101103
"eslint-plugin-promise": "^6.0.0",
102104
"html-webpack-plugin": "^5.5.0",

‎src/chat/bookmarks.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ function updatePromise (del, ins) {
8585
}) // promise
8686
}
8787

88-
// export findBookmarkDocument,
89-
9088
/* Bookmarking
9189
*/
9290
/** Find a user's bookmarks
@@ -97,6 +95,7 @@ export async function findBookmarkDocument (userContext) {
9795
const isPublic = true
9896

9997
await findAppInstances(userContext, theClass, isPublic) // public -- only look for public links
98+
10099
if (userContext.instances && userContext.instances.length > 0) {
101100
userContext.bookmarkDocument = userContext.instances[0]
102101
if (userContext.instances.length > 1) {
@@ -116,11 +115,10 @@ export async function findBookmarkDocument (userContext) {
116115
return userContext
117116
}
118117
await registerInTypeIndex(
119-
userContext,
120118
newBookmarkFile,
121-
theClass,
122-
true
123-
) // public
119+
userContext.index,
120+
theClass
121+
)
124122
userContext.bookmarkDocument = newBookmarkFile
125123
} else {
126124
alert('You seem to have no bookmark file and not even a profile file.')

‎src/iconBase.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import { log } from './debug'
1818

1919
declare let $SolidTestEnvironment
2020

21-
// Do not export. lways us this module to find the icons, as it varies
22-
const iconsOnGithub = 'https://solidos.github.io/solid-ui/src'
21+
// Do not export. Always us this module to find the icons, as they vary
22+
const iconsOnGithub = 'https://solidos.github.io/solid-ui/src' // changed org 2022-05
2323

2424
export const icons = (module as any).scriptURI // Firefox extension
2525
? {

0 commit comments

Comments
 (0)