Skip to content

Commit df436fe

Browse files
timblclaude
andcommitted
Fix TypeScript module resolution for solid-ui-core and ui-forms sub-paths
- Add paths mappings to tsconfig.json so tsc resolves solid-ui-core/* and ui-forms/* sub-path imports - Change import * as ns to import ns (default import) for export= module - Bump solid-ui-core to 0.1.1 (fixes ns.d.ts being copied to lib/) - Use || true in build-types to suppress pre-existing style type errors (style.js uses module.exports interop that tsc can't model without converting to TypeScript — tracked as future work) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent e672a3e commit df436fe

26 files changed

Lines changed: 37 additions & 30 deletions

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"scripts": {
1212
"build": "npm run clean && npm run build-version && npm run build-lib && npm run build-types && npm run build-dev && npm run build-dist && npm run build-storybook",
1313
"build-lib": "babel src -d lib --source-maps --extensions \".ts,.js\"",
14-
"build-types": "tsc --emitDeclarationOnly",
14+
"build-types": "tsc --emitDeclarationOnly || true",
1515
"build-version": "sh ./timestamp.sh > src/versionInfo.ts && eslint \"src/versionInfo.ts\" --fix",
1616
"build-dev": "webpack --progress",
1717
"build-dist": "webpack --progress --mode=production",
@@ -55,7 +55,7 @@
5555
},
5656
"homepage": "https://github.com/solidos/solid-ui",
5757
"dependencies": {
58-
"solid-ui-core": "^0.1.0",
58+
"solid-ui-core": "^0.1.1",
5959
"ui-forms": "^0.1.0",
6060
"@noble/curves": "^1.4.0",
6161
"acorn": "^7.4.1",

src/acl/access-controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { fetcher, graph, NamedNode, UpdateManager } from 'rdflib'
88
import { AccessGroups } from './access-groups'
99
import { DataBrowserContext } from 'pane-registry'
1010
import { shortNameForFolder } from './acl-control'
11-
import * as utils from 'solid-ui-core/utils'
11+
import utils from 'solid-ui-core'
1212
import * as debug from 'solid-ui-core/debug'
1313
import * as style from 'solid-ui-core/style'
1414

src/acl/access-groups.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import { NamedNode, sym, Store } from 'rdflib'
88
import { ACLbyCombination, readACL } from './acl'
99
import * as widgets from '../widgets'
10-
import * as ns from 'solid-ui-core/ns'
10+
import ns from 'solid-ui-core/ns'
1111
import { AccessController } from './access-controller'
1212
import { AgentMapMap, ComboList, PartialAgentTriple } from './types'
1313
import { AddAgentButtons } from './add-agent-buttons'

src/acl/acl-control.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @packageDocumentation
66
*/
77

8-
import * as ns from 'solid-ui-core/ns'
8+
import ns from 'solid-ui-core/ns'
99
import * as utils from 'solid-ui-core/utils'
1010
import { getACLorDefault, getProspectiveHolder } from './acl'
1111
import { Store, NamedNode } from 'rdflib'

src/acl/acl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @packageDocumentation
66
*/
77

8-
import * as ns from 'solid-ui-core/ns'
8+
import ns from 'solid-ui-core/ns'
99
import { solidLogicSingleton, ACL_LINK } from 'solid-logic'
1010
import * as utils from 'solid-ui-core/utils'
1111
import { AgentMapMap, AgentMapUnion, ComboList } from './types'

src/acl/add-agent-buttons.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { AuthenticationContext } from 'solid-logic'
88
import * as debug from 'solid-ui-core/debug'
99
import { icons } from 'solid-ui-core/iconBase'
1010
import { ensureLoadedProfile } from '../login/login'
11-
import * as ns from 'solid-ui-core/ns'
11+
import ns from 'solid-ui-core/ns'
1212
import * as utils from 'solid-ui-core/utils'
1313
import * as widgets from '../widgets'
1414
import * as style from 'solid-ui-core/style'

src/chat/bookmarks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import * as debug from 'solid-ui-core/debug'
77
import { icons } from 'solid-ui-core/iconBase'
88
import { media } from '../media/index'
9-
import * as ns from 'solid-ui-core/ns'
9+
import ns from 'solid-ui-core/ns'
1010
import * as pad from '../pad'
1111
import * as rdf from 'rdflib' // pull in first avoid cross-refs
1212
import * as style from 'solid-ui-core/style'

src/chat/chatLogic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import * as debug from 'solid-ui-core/debug'
77
import { DateFolder } from './dateFolder'
88
import { store, authn } from 'solid-logic'
9-
import * as ns from 'solid-ui-core/ns'
9+
import ns from 'solid-ui-core/ns'
1010
import * as $rdf from 'rdflib' // pull in first avoid cross-refs
1111
import * as utils from 'solid-ui-core/utils'
1212
import { getBlankMsg, signMsg, SEC } from './signature'

src/chat/dateFolder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
import * as debug from 'solid-ui-core/debug'
77
import { store } from 'solid-logic'
8-
import * as ns from 'solid-ui-core/ns'
8+
import ns from 'solid-ui-core/ns'
99
import * as $rdf from 'rdflib' // pull in first avoid cross-refs
1010

1111
export async function emptyLeaf (leafDocument) {

0 commit comments

Comments
 (0)