Skip to content
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

Update glimmer-scoped-css to 0.4.1 in all packages #1158

Merged
merged 3 commits into from
Apr 11, 2024
Merged

Update glimmer-scoped-css to 0.4.1 in all packages #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab243d7
Update glimmer-scoped-css in all packages
backspace Apr 11, 2024
5b5a458
Fix use of decoder return type
backspace Apr 11, 2024
2fa08f0
Fix use of decoder in runtime-common
backspace Apr 11, 2024
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
2 changes: 1 addition & 1 deletion packages/boxel-motion/test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"eslint-plugin-n": "^16.2.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-qunit": "^8.0.1",
"glimmer-scoped-css": "^0.4.0",
"glimmer-scoped-css": "^0.4.1",
"loader.js": "^4.7.0",
"normalize.css": "8.0.1",
"prettier": "^3.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/boxel-ui/addon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-simple-import-sort": "^8.0.0",
"eslint-plugin-typescript-sort-keys": "^2.1.0",
"glimmer-scoped-css": "^0.4.0",
"glimmer-scoped-css": "^0.4.1",
"prettier": "^2.8.7",
"prettier-plugin-ember-template-tag": "^1.1.0",
"rollup": "^3.28.1",
Expand Down
9 changes: 7 additions & 2 deletions packages/boxel-ui/addon/rollup.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,15 @@ function scopedCSS(srcDir) {
hash.update(source);
let cssFileName = hash.digest('hex').slice(0, 10) + '.css';
let dir = path.dirname(localPath);
let css = decodeScopedCSSRequest(source);
let cssAndFile = decodeScopedCSSRequest(source);
return {
id: path.resolve(path.dirname(importer), cssFileName),
meta: { 'scoped-css': { css, fileName: path.join(dir, cssFileName) } },
meta: {
'scoped-css': {
css: cssAndFile.css,
fileName: path.join(dir, cssFileName),
},
},
external: 'relative',
};
},
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-common/loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ async function maybeHandleScopedCSSRequest(req: Request) {
if (typeof (globalThis as any).document == 'undefined') {
return Promise.resolve(new Response('', { status: 200 }));
} else {
let decodedCSS = decodeScopedCSSRequest(req.url);
let decodedCSS = decodeScopedCSSRequest(req.url).css;
return Promise.resolve(
new Response(`
let styleNode = document.createElement('style');
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"ember-concurrency-async-plugin": "workspace:*",
"ember-source": "~5.4.0",
"flat": "^5.0.2",
"glimmer-scoped-css": "^0.4.0",
"glimmer-scoped-css": "^0.4.1",
"http-status-codes": "^2.2.0",
"ignore": "^5.2.0",
"js-string-escape": "^1.0.1",
Expand Down
52 changes: 20 additions & 32 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading