Skip to content

Commit

Permalink
fix: merge pull request #258 from nyaggah/develop
Browse files Browse the repository at this point in the history
fix(devtools-page): fix devtools setPage urls
  • Loading branch information
JoeyDoey authored Sep 27, 2023
2 parents 3fea70c + f40a7ec commit 2ee4367
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
6 changes: 6 additions & 0 deletions .changeset/ten-dots-explain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@bedframe/core': patch
'@bedframe/cli': patch
---

fix devtools setPage urls
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import { GlobalStyles } from '@/styles'
chrome.devtools.panels.create(
'Bedframe (Panel)',
'assets/icons/icon-128x128.png',
'src/pages/devtools/index.html',
'pages/devtools/index.html',
)

chrome.devtools.panels.elements.createSidebarPane(
'Bedframe (Side Panel)',
function (panel) {
panel.setPage('src/pages/devtools/panel.html')
panel.setPage('pages/devtools/panel.html')
panel.setHeight('8ex')
panel.setObject({
data: 'Some data to show',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import '@/styles/style.css'
chrome.devtools.panels.create(
'Bedframe (Panel)',
'assets/icons/icon-128x128.png',
'src/pages/devtools/index.html',
'pages/devtools/index.html',
)

chrome.devtools.panels.elements.createSidebarPane(
'Bedframe (Side Panel)',
function (panel) {
panel.setPage('src/pages/devtools/panel.html')
panel.setPage('pages/devtools/panel.html')
panel.setHeight('8ex')
panel.setObject({
data: 'Some data to show',
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/lib/make/utils/write-package-json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ ${isStyle.styledComponents ? `"styled-components": "^6.0.7"` : ''}
}
},
"devDependencies": {
"@bedframe/cli": "^0.0.70",
"@bedframe/core": "^0.0.35",
"@bedframe/cli": "^0.0.71",
"@bedframe/core": "^0.0.36",
${
changesets
? `"@changesets/cli": "^2.26.2",
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/lib/get-fonts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export function getFonts(fonts: FontFamily[]) {
name: f.name,
local: f.local,
src: f.src,
// TO diddly DO: allow for f.transform here. user can have custom transform
transform(font) {
if (!fontWeights) return null
if (font.basename in fontWeights) {
Expand Down

0 comments on commit 2ee4367

Please sign in to comment.