diff --git a/package.json b/package.json index 193d5fe..02c9b98 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "test": "yarn test:node && yarn test:web", "test:integration": "playwright test packages/*/test-node/*.spec.js", "test:node": "yarn test:unit && yarn test:integration", - "test:unit": "node --trace-warnings ./node_modules/.bin/mocha --require ./scripts/testMochaGlobalHooks.js \"packages/*/test-node/**/*.test.{ts,js,mjs,cjs}\" -- --timeout 5000 --reporter dot --exit", + "test:unit": "node --trace-warnings ./node_modules/.bin/mocha --require ./scripts/testMochaGlobalHooks.js \"packages/*/test-node/**/*.test.{ts,js,mjs,cjs}\" -- --timeout 8000 --reporter dot --exit", "test:web": "web-test-runner", "types": "run-s types:clear types:copy types:build", "types:build": "tsc --build", @@ -85,7 +85,7 @@ "prettier": "^2.5.1", "prettier-plugin-package": "^1.3.0", "publish-docs": "^0.1.2", - "puppeteer": "^9.0.0", + "puppeteer": "^13.0.0", "remark-emoji": "^2.1.0", "rimraf": "^3.0.2", "rollup": "^2.36.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index e42e1aa..60514af 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -30,7 +30,7 @@ "rocket:build": "node src/cli.js build -c demo", "rocket:start": "node src/cli.js start -c demo", "start": "npm run rocket:start", - "test": "mocha --require ../../scripts/testMochaGlobalHooks.js test-node/**/*.test.{js,cjs} test-node/*.test.{js,cjs} --timeout 5000", + "test": "mocha --require ../../scripts/testMochaGlobalHooks.js test-node/**/*.test.{js,cjs} test-node/*.test.{js,cjs} --timeout 8000", "test:watch": "onchange 'src/**/*.{js,cjs}' 'test-node/**/*.{js,cjs}' -- npm test", "types:copy": "copyfiles \"./types/**/*.d.ts\" dist-types/", "xtest:watch": "mocha test/**/*.test.js --parallel --watch" diff --git a/packages/cli/src/RocketBuild.js b/packages/cli/src/RocketBuild.js index 7a8b9e0..e66e526 100755 --- a/packages/cli/src/RocketBuild.js +++ b/packages/cli/src/RocketBuild.js @@ -188,7 +188,7 @@ export class RocketBuild { } } const url = `http://localhost:${this.engine.devServer.config.port}/${relUrl}`; - await page.goto(url); + await page.goto(url, { waitUntil: 'networkidle0' }); await page.screenshot({ path: imagePath }); await unlink(openGraphFile); diff --git a/packages/launch/__public/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf b/packages/launch/__public/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf new file mode 100644 index 0000000..0fea34b Binary files /dev/null and b/packages/launch/__public/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf differ diff --git a/packages/launch/__public/fonts/OpenSans-Italic-VariableFont_wdth,wght.woff2 b/packages/launch/__public/fonts/OpenSans-Italic-VariableFont_wdth,wght.woff2 new file mode 100644 index 0000000..fdcd887 Binary files /dev/null and b/packages/launch/__public/fonts/OpenSans-Italic-VariableFont_wdth,wght.woff2 differ diff --git a/packages/launch/__public/fonts/OpenSans-VariableFont_wdth,wght.ttf b/packages/launch/__public/fonts/OpenSans-VariableFont_wdth,wght.ttf new file mode 100644 index 0000000..51dd3c3 Binary files /dev/null and b/packages/launch/__public/fonts/OpenSans-VariableFont_wdth,wght.ttf differ diff --git a/packages/launch/__public/fonts/OpenSans-VariableFont_wdth,wght.woff2 b/packages/launch/__public/fonts/OpenSans-VariableFont_wdth,wght.woff2 new file mode 100644 index 0000000..15ee895 Binary files /dev/null and b/packages/launch/__public/fonts/OpenSans-VariableFont_wdth,wght.woff2 differ diff --git a/packages/launch/css/404.css b/packages/launch/css/404.css index ca3762a..f2eb8a2 100644 --- a/packages/launch/css/404.css +++ b/packages/launch/css/404.css @@ -1,5 +1,3 @@ -@import url('https://fonts.googleapis.com/css?family=Dosis:300,400,500'); - @-moz-keyframes rocket-movement { 100% { -moz-transform: translate(1200px, -600px); diff --git a/packages/launch/css/layout.css b/packages/launch/css/layout.css index aaa26e6..640ceb6 100644 --- a/packages/launch/css/layout.css +++ b/packages/launch/css/layout.css @@ -5,6 +5,14 @@ } } +@font-face { + font-family: 'Open Sans'; + src: url('/fonts/OpenSans-VariableFont_wdth,wght.woff2') format('woff2 supports variations'), + url('/fonts/OpenSans-VariableFont_wdth,wght.woff2') format('woff2-variations'); + font-weight: 1 999; + font-display: optional; +} + body { margin: 0; font-family: var(--primary-font-family); diff --git a/packages/launch/src/LayoutSidebar.js b/packages/launch/src/LayoutSidebar.js index 59e4eeb..875bc91 100644 --- a/packages/launch/src/LayoutSidebar.js +++ b/packages/launch/src/LayoutSidebar.js @@ -136,15 +136,12 @@ export class LayoutSidebar extends Layout { `, head__40: html` - - - diff --git a/presets/spark/src/css/content.css b/presets/spark/src/css/content.css index 2259cdf..991e6a1 100644 --- a/presets/spark/src/css/content.css +++ b/presets/spark/src/css/content.css @@ -3,7 +3,7 @@ src: url('/fonts/OpenSans-VariableFont_wdth,wght.woff2') format('woff2 supports variations'), url('/fonts/OpenSans-VariableFont_wdth,wght.woff2') format('woff2-variations'); font-weight: 1 999; - font-display: swap; + font-display: optional; } body { diff --git a/site/pages/10--docs/30--guides/20--social-media.rocket.md b/site/pages/10--docs/30--guides/20--social-media.rocket.md index b5c9216..ecb1c2d 100644 --- a/site/pages/10--docs/30--guides/20--social-media.rocket.md +++ b/site/pages/10--docs/30--guides/20--social-media.rocket.md @@ -57,8 +57,23 @@ export const openGraphLayout = () => html` + +``` diff --git a/site/pages/index.rocket.js b/site/pages/index.rocket.js index 839e1ce..96afd83 100644 --- a/site/pages/index.rocket.js +++ b/site/pages/index.rocket.js @@ -70,8 +70,24 @@ export const openGraphLayout = data => html` -