Skip to content

SolidOS/solid-ui#780 Migrate solid-ui imports #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NoelDeMartin wants to merge 1 commit into
base: staging
Choose a base branch
from
+7 −14
Open

SolidOS/solid-ui#780 Migrate solid-ui imports #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/globals.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
// AI generated as a solution to cannot find SolidLogic
// Must be imported BEFORE solid-ui / solid-panes.
// Their prebuilt bundles treat `solid-logic` (and `rdflib`) as UMD externals
// with `root: "SolidLogic"` / `root: "$rdf"`, so the globals must exist on
// `window` at module-evaluation time, not after all imports have run.
import * as $rdf from 'rdflib'
import * as SolidLogic from 'solid-logic'
import * as UI from 'solid-ui'

const w: any = window
w.$rdf = $rdf
w.SolidLogic = SolidLogic
w.UI = UI
4 changes: 1 addition & 3 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ import './globals'
import * as $rdf from 'rdflib'
import * as SolidLogic from 'solid-logic'
import type { RenderEnvironment } from 'pane-registry'
import'solid-ui/components/header'
import 'solid-ui/components/header'
import * as panes from 'solid-panes'
import { layout } from './layout'
import { theme } from './theme'
import versionInfo from './versionInfo'
import 'solid-ui/design-system.css'
import 'solid-ui/primitives.css'
import './styles/mash.css'

const global: any = window
Expand Down
2 changes: 2 additions & 0 deletions src/styles/mash.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "solid-ui";

/*
** ------SolidOS Styles------
**
Expand Down
8 changes: 2 additions & 6 deletions webpack.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ const WORKSPACE_RESOLUTION_MODE = 'workspace'
const packageAliases = {
'rdflib': path.resolve('./node_modules/rdflib'),
'solid-logic': path.resolve('./node_modules/solid-logic'),
'solid-ui$': path.resolve('./node_modules/solid-ui/dist/solid-ui.esm.js'),
'UI$': path.resolve('./node_modules/solid-ui/dist/solid-ui.esm.js'),
'solid-ui/components/header$': path.resolve('./node_modules/solid-ui/dist/components/header/index.esm.js'),
'UI$': path.resolve('./node_modules/solid-ui/dist/index.esm.js'),
'solid-panes$': path.resolve('./node_modules/solid-panes/dist/index.js'),
'pane-registry': path.resolve('./node_modules/pane-registry'),
'$rdf': path.resolve('./node_modules/rdflib'),
Expand All @@ -23,9 +21,7 @@ const packageAliases = {

const workspaceAliases = {
'solid-panes$': path.resolve('../solid-panes/src/index.ts'),
'solid-ui$': path.resolve('../solid-ui/src/index.ts'),
'UI$': path.resolve('../solid-ui/src/index.ts'),
'solid-ui/components/header$': path.resolve('../solid-ui/src/v2/components/layout/header/index.ts'),
'UI$': path.resolve('../solid-ui/dist/index.cjs.js'),
}

function getResolutionMode (env = {}) {
Expand Down