Compare commits

...

73 Commits

Author SHA1 Message Date
github-actions[bot]
ccdd4d077e Version Packages 2021-07-11 17:02:49 +03:00
Benny Powers
a5661b85c2 chore: update dependencies 2021-07-11 17:01:27 +03:00
github-actions[bot]
99b12c7c9e Version Packages 2021-07-11 16:03:49 +03:00
Benny Powers
61bb700c3e fix(plugins-manager): dist types 2021-07-11 16:00:10 +03:00
github-actions[bot]
aa93c2ad89 Version Packages 2021-07-11 14:57:17 +03:00
Benny Powers
8e9c0a3106 chore: prettier 2021-07-11 14:48:06 +03:00
Benny Powers
1c68a95c3c docs: generated READMEs 2021-07-11 14:48:06 +03:00
Benny Powers
c1876da2ff docs: improve guides 2021-07-11 14:48:06 +03:00
Thomas Allmer
3dde0ab096 chore: fix link on launch preset page 2021-07-11 14:48:06 +03:00
Benny Powers
09caa4bcef docs: improve guides 2021-07-11 14:48:06 +03:00
Benny Powers
ddc89e05bb fix(cli): fix setup array types 2021-07-11 14:48:06 +03:00
Benny Powers
7e70d8a327 fix(cli): improve types 2021-07-11 14:48:06 +03:00
Benny Powers
fc8b3a2944 feat(plugins-manager): further improve types 2021-07-11 14:48:06 +03:00
Benny Powers
ee20047305 fix(launch): add inline notification styles for noscript users 2021-07-11 14:48:06 +03:00
Benny Powers
48dcdd7d6d fix(search): hide search for noscript 2021-07-11 14:48:06 +03:00
Benny Powers
03e15051be docs: fix for noscript parser bug 2021-07-11 14:48:06 +03:00
Benny Powers
312d5bec81 docs: style code tabs and markdown tables 2021-07-11 14:48:06 +03:00
Benny Powers
e31e8be75b docs: improve docs for presets 2021-07-11 14:48:06 +03:00
Benny Powers
9978ea7eda fix: improve typings for plugins-manager 2021-07-11 14:48:06 +03:00
Benny Powers
d91e46b867 feat: bootstrap command
also adds code tabs and updates documentation
2021-07-11 14:48:06 +03:00
Benny Powers
174217180b chore: update deps 2021-07-11 14:48:06 +03:00
Konnor Rogers
f6aa1872c2 docs: tiny typo! 2021-07-08 10:24:11 +03:00
Abdón Rodríguez Davila
f5a6cbfb97 Fix inline-notification script import 2021-07-07 18:07:56 +03:00
github-actions[bot]
989758ce03 Version Packages 2021-07-07 15:33:15 +02:00
Thomas Allmer
fbcedde7a0 fix(mdjs-preview): use a scoped registry for the internal accordion element 2021-07-07 15:14:32 +02:00
github-actions[bot]
d72427d889 Version Packages 2021-07-06 12:34:03 +02:00
Jorge del Casar
b7d5cbacf3 fix(launch): remove footer extra comma
Close #197
2021-07-06 11:44:13 +02:00
Benny Powers
8d8c756607 Merge pull request #198 from danihuge/patch-5
Fix typos
2021-07-05 14:01:09 +03:00
Dani Garcia
3750c4e7a2 Fix typos 2021-07-05 12:59:25 +02:00
Benny Powers
5c3eda35a9 Merge pull request #191 from modernweb-dev/changeset-release/main
Version Packages
2021-07-04 22:57:22 +03:00
github-actions[bot]
6910d50bf5 Version Packages 2021-07-04 19:47:35 +00:00
Dani Garcia
a2dc8656db chore: improve wording in getting-started.md (#196) 2021-07-04 21:46:26 +02:00
Benny Powers
e778cd8a3c Update 30-collection-header.njk
fixes #189
2021-07-04 21:45:21 +02:00
Thomas Allmer
9e3c2f52d9 fix(launch): create help & feedback link only if site.helpUrl is defined 2021-07-04 18:21:19 +02:00
Thomas Allmer
579e8e72a2 fix(cli): Unordered joiningBlocks should generally end up at the end 2021-07-04 16:50:11 +02:00
Thomas Allmer
06ae8693b2 docs: add info that a server needs to handle the 404.html file 2021-07-04 16:50:07 +02:00
Thomas Allmer
cee2b7b04c fix(launch): fix font variables 2021-07-04 16:49:40 +02:00
Thomas Allmer
9625b94d39 fix(launch): remove footer urls that require user creation 2021-07-04 16:48:44 +02:00
Benny Powers
1f79d7a047 feat(launch): move font-family to variables 2021-07-04 12:00:31 +02:00
Benny Powers
bf99541951 fix(cli): copy all static assets on build 2021-07-04 12:00:14 +02:00
github-actions[bot]
8df9a3e9c3 Version Packages 2021-07-02 13:42:36 +02:00
Benny Powers
1b9559f2a5 feat(cli): add async before11ty hook (#183) 2021-07-02 11:58:54 +02:00
github-actions[bot]
8eede4b16b Version Packages 2021-06-30 15:24:07 +02:00
Thomas Allmer
2294ccf4a2 chore: only release patch versions 2021-06-30 15:20:51 +02:00
Benny Powers
3b1a0cf26a feat(cli): expose checkLinks options 2021-06-30 15:18:36 +02:00
Benny Powers
cf442215a9 feat: add slack invite 2021-06-30 15:02:33 +02:00
Thomas Allmer
41049f3908 chore: fix launch tests 2021-06-30 14:36:54 +02:00
Thomas Allmer
2b5c61d19c feat: no responsive images for svgs & option to define ignores 2021-06-30 14:36:54 +02:00
Jorge del Casar
f5d349e256 feat(launch): load used fonts from google fonts 2021-06-28 21:00:13 +02:00
Jorge del Casar
ce0b00e7a1 fix(cli): don't transform external images
Fix #141
2021-06-28 20:59:28 +02:00
github-actions[bot]
83286a99de Version Packages 2021-06-22 18:42:00 +02:00
Thijs Louisse
6cabdba5f6 feat(rocket): upgrade to lit2 2021-06-22 18:27:19 +02:00
github-actions[bot]
f5f2d69d0c Version Packages 2021-06-22 15:00:26 +02:00
Thomas Allmer
795a3613af fix(cli): service worker url respects pathPrefix 2021-06-22 14:57:52 +02:00
github-actions[bot]
bcf8f4fe83 Version Packages 2021-06-21 16:25:40 +02:00
Thomas Allmer
5330740cb3 fix(cli): replace images to be responsive from the bottom up 2021-06-21 16:20:48 +02:00
Thomas Allmer
2edd61beaa chore: remove image hashes from tests 2021-06-21 15:56:41 +02:00
github-actions[bot]
2a5fc08f35 Version Packages 2021-06-21 14:37:07 +02:00
Thomas Allmer
43a7ca10c3 fix(cli): responsive images need to respect pathPrefix 2021-06-21 14:35:51 +02:00
github-actions[bot]
da39fa72f3 Version Packages 2021-06-16 09:08:08 +02:00
Thomas Allmer
a0e8edfbb9 fix(check-html-links): ignore not http schema urls 2021-06-16 09:04:05 +02:00
Thomas Allmer
50434293bb fix(check-html-links): ignore tel links 2021-06-16 09:04:05 +02:00
Thomas Allmer
f08f92615b fix(check-html-links): add missing slash dependency 2021-06-16 09:04:05 +02:00
Thomas Allmer
1949b1e1cb fix(check-html-links): ignore html encoded mailto links 2021-06-16 09:04:05 +02:00
github-actions[bot]
340bf8e653 Version Packages 2021-06-11 17:56:06 +02:00
Thomas Allmer
eae200708d feat: update to mdjs version with lit 2 and render to light dom 2021-06-11 17:52:15 +02:00
github-actions[bot]
f707f636fa Version Packages 2021-06-11 13:15:48 +02:00
Thomas Allmer
814b5d29ad feat: render mdjs stories to light dom 2021-06-11 13:03:24 +02:00
Thomas Allmer
e1e96acceb feat: update mdjs to lit 2021-06-11 13:03:24 +02:00
github-actions[bot]
7543a129cf Version Packages 2021-06-08 22:28:18 +02:00
Thomas Allmer
60e85a17a7 fix: support picture tags with <source srset="..."> 2021-06-08 08:56:43 +02:00
github-actions[bot]
fd8f97859a Version Packages 2021-05-30 15:30:38 +02:00
Thomas Allmer
56fdb0cbd4 fix(plugins-manager): fix types for optional parameters 2021-05-30 15:27:44 +02:00
155 changed files with 3934 additions and 656 deletions

View File

@@ -10,3 +10,5 @@ _site
_site-dev _site-dev
__output __output
__output-dev __output-dev
docs/_merged*

View File

@@ -0,0 +1 @@
<svg id="n" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#c12127;}.cls-2{fill:#fff;}</style></defs><title>n</title><path class="cls-1" d="M0,16V0H16V16ZM3,3V13H8V5h3v8h2V3Z"/><path class="cls-2" d="M3,3H13V13H11V5H8v8H3Z"/></svg>

After

Width:  |  Height:  |  Size: 287 B

View File

@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid meet" viewBox="76.58987244897958 44 164.00775510204068 164" width="160.01" height="160"><defs><path d="M237.6 95L187.6 95L187.6 45L237.6 45L237.6 95Z" id="arNRoK435"></path><path d="M182.59 95L132.59 95L132.59 45L182.59 45L182.59 95Z" id="a3H2WU7Px"></path><path d="M127.59 95L77.59 95L77.59 45L127.59 45L127.59 95Z" id="b1DInM56vl"></path><path d="M237.6 150L187.6 150L187.6 100L237.6 100L237.6 150Z" id="a7LFlgQIwu"></path><path d="M182.59 150L132.59 150L132.59 100L182.59 100L182.59 150Z" id="amwLiZcuo"></path><path d="M182.59 205L132.59 205L132.59 155L182.59 155L182.59 205Z" id="f3Peu5RWan"></path><path d="M237.6 205L187.6 205L187.6 155L237.6 155L237.6 205Z" id="a6DXBfqPa"></path><path d="M127.59 205L77.59 205L77.59 155L127.59 155L127.59 205Z" id="c1GWSTH1z7"></path></defs><g><g><use xlink:href="#arNRoK435" opacity="1" fill="#f9ad00" fill-opacity="1"></use></g><g><use xlink:href="#a3H2WU7Px" opacity="1" fill="#f9ad00" fill-opacity="1"></use></g><g><use xlink:href="#b1DInM56vl" opacity="1" fill="#f9ad00" fill-opacity="1"></use></g><g><use xlink:href="#a7LFlgQIwu" opacity="1" fill="#f9ad00" fill-opacity="1"></use></g><g><use xlink:href="#amwLiZcuo" opacity="1" fill="#4e4e4e" fill-opacity="1"></use></g><g><use xlink:href="#f3Peu5RWan" opacity="1" fill="#4e4e4e" fill-opacity="1"></use></g><g><use xlink:href="#a6DXBfqPa" opacity="1" fill="#4e4e4e" fill-opacity="1"></use></g><g><use xlink:href="#c1GWSTH1z7" opacity="1" fill="#4e4e4e" fill-opacity="1"></use></g></g></svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -0,0 +1 @@
<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 518 518"><style>.st0{fill:#2c8ebb}.st1{fill:#fff}</style><path class="st0" d="M259 0c143 0 259 116 259 259S402 518 259 518 0 402 0 259 116 0 259 0z"/><path class="st1" d="M435.2 337.5c-1.8-14.2-13.8-24-29.2-23.8-23 .3-42.3 12.2-55.1 20.1-5 3.1-9.3 5.4-13 7.1.8-11.6.1-26.8-5.9-43.5-7.3-20-17.1-32.3-24.1-39.4 8.1-11.8 19.2-29 24.4-55.6 4.5-22.7 3.1-58-7.2-77.8-2.1-4-5.6-6.9-10-8.1-1.8-.5-5.2-1.5-11.9.4C293.1 96 289.6 93.8 286.9 92c-5.6-3.6-12.2-4.4-18.4-2.1-8.3 3-15.4 11-22.1 25.2-1 2.1-1.9 4.1-2.7 6.1-12.7.9-32.7 5.5-49.6 23.8-2.1 2.3-6.2 4-10.5 5.6h.1c-8.8 3.1-12.8 10.3-17.7 23.3-6.8 18.2.2 36.1 7.1 47.7-9.4 8.4-21.9 21.8-28.5 37.5-8.2 19.4-9.1 38.4-8.8 48.7-7 7.4-17.8 21.3-19 36.9-1.6 21.8 6.3 36.6 9.8 42 1 1.6 2.1 2.9 3.3 4.2-.4 2.7-.5 5.6.1 8.6 1.3 7 5.7 12.7 12.4 16.3 13.2 7 31.6 10 45.8 2.9 5.1 5.4 14.4 10.6 31.3 10.6h1c4.3 0 58.9-2.9 74.8-6.8 7.1-1.7 12-4.7 15.2-7.4 10.2-3.2 38.4-12.8 65-30 18.8-12.2 25.3-14.8 39.3-18.2 13.6-3.3 22.1-15.7 20.4-29.4zm-23.8 14.7c-16 3.8-24.1 7.3-43.9 20.2-30.9 20-64.7 29.3-64.7 29.3s-2.8 4.2-10.9 6.1c-14 3.4-66.7 6.3-71.5 6.4-12.9.1-20.8-3.3-23-8.6-6.7-16 9.6-23 9.6-23s-3.6-2.2-5.7-4.2c-1.9-1.9-3.9-5.7-4.5-4.3-2.5 6.1-3.8 21-10.5 27.7-9.2 9.3-26.6 6.2-36.9.8-11.3-6 .8-20.1.8-20.1s-6.1 3.6-11-3.8c-4.4-6.8-8.5-18.4-7.4-32.7 1.2-16.3 19.4-32.1 19.4-32.1s-3.2-24.1 7.3-48.8c9.5-22.5 35.1-40.6 35.1-40.6s-21.5-23.8-13.5-45.2c5.2-14 7.3-13.9 9-14.5 6-2.3 11.8-4.8 16.1-9.5 21.5-23.2 48.9-18.8 48.9-18.8s13-39.5 25-31.8c3.7 2.4 17 32 17 32s14.2-8.3 15.8-5.2c8.6 16.7 9.6 48.6 5.8 68-6.4 32-22.4 49.2-28.8 60-1.5 2.5 17.2 10.4 29 43.1 10.9 29.9 1.2 55 2.9 57.8.3.5.4.7.4.7s12.5 1 37.6-14.5c13.4-8.3 29.3-17.6 47.4-17.8 17.5-.3 18.4 20.2 5.2 23.4z"/></svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -1,3 +1,7 @@
:root {
--markdown-table-row-odd-background-color: #efefef;
}
body[layout^='layout-home'] .markdown-body .call-to-action:nth-of-type(2) { body[layout^='layout-home'] .markdown-body .call-to-action:nth-of-type(2) {
--primary-color: #222; --primary-color: #222;
--primary-color-lighter: #333; --primary-color-lighter: #333;
@@ -19,3 +23,12 @@ rocket-navigation {
header { header {
font-family: 'Montserrat', sans-serif; font-family: 'Montserrat', sans-serif;
} }
code-tabs[collection="package-managers"] {
--code-tabs-icon-height: 18px;
--code-tabs-justify-tabs: end;
}
:not(rocket-navigation):not(:defined) {
opacity: 0;
}

View File

@@ -9,6 +9,11 @@ module.exports = async function () {
name: 'GitHub', name: 'GitHub',
url: 'https://github.com/modernweb-dev/rocket', url: 'https://github.com/modernweb-dev/rocket',
}, },
{
name: 'Slack',
url:
'https://join.slack.com/t/lit-and-friends/shared_invite/zt-llwznvsy-LZwT13R66gOgnrg12PUGqw',
},
], ],
gitSiteUrl: 'https://github.com/modernweb-dev/rocket', gitSiteUrl: 'https://github.com/modernweb-dev/rocket',
gitBranch: 'main', gitBranch: 'main',

View File

@@ -1,11 +1,3 @@
<link
href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&display=swap"
rel="stylesheet"
/>
<meta name="twitter:creator" content="@modern_web_dev" /> <meta name="twitter:creator" content="@modern_web_dev" />
<link rel="stylesheet" href="{{ '/_assets/body.css' | asset | url }}" mdjs-use> <link rel="stylesheet" href="{{ '/_assets/body.css' | asset | url }}" mdjs-use>

View File

@@ -1,4 +1,4 @@
# Configuration >> Computed Config ||20 # Configuration >> Computed Config || 20
If you want to add data that depends on other data then you can do it via [Eleventy's computed data](https://www.11ty.dev/docs/data-computed/). If you want to add data that depends on other data then you can do it via [Eleventy's computed data](https://www.11ty.dev/docs/data-computed/).
@@ -8,25 +8,23 @@ Rocket exposes it via `setupEleventyComputedConfig`.
Let's say you want to add a `Welcome to the contact page` everywhere. (A filter might be a better choice, but it's a good example of the concept.) Let's say you want to add a `Welcome to the contact page` everywhere. (A filter might be a better choice, but it's a good example of the concept.)
👉 `rocket.config.mjs` (or your theme config file) 👉 `rocket.config.js` (or your theme config file)
```js <!-- prettier-ignore-start -->
```js copy
import { addPlugin } from 'plugins-manager'; import { addPlugin } from 'plugins-manager';
/** @type {Partial<import("../../../types/main").RocketCliOptions>} */ /** @type {import('@rocket/cli').RocketCliOptions} */
const config = { export default ({
setupEleventyComputedConfig: [ setupEleventyComputedConfig: [
addPlugin({ name: 'greeting', plugin: data => `Welcome to the ${data.title} page.` }), addPlugin({ name: 'greeting', plugin: data => `Welcome to the ${data.title} page.` }),
], ],
}; });
export default config;
``` ```
<!-- prettier-ignore-end -->
{% raw %} Now you can use {% raw %}{{ greeting }}{% endraw %} everywhere,
Now you can use {{ greeting }} everywhere. and it will be correctly replaced with a Welcome and the page title.
{% endraw %}
And it will be correctly replaced with a Welcome and the page title.
## Default Available Configs ## Default Available Configs

View File

@@ -100,6 +100,82 @@ export default {
}; };
``` ```
## Ignoring Images
Files ending in `.svg` or that include `rocket-ignore.` will remain untouched.
For example
```md
![Logo stays svg](logo.svg)
![Ignore by file name](my-image.rocket-unresponsive.jpg)
![My Image Alternative Text](my-image.jpeg)
```
becomes
```html
<img src="logo.svg" alt="Logo stays svg" rocket-image="responsive" />
<img src="my-image.rocket-unresponsive.jpg" alt="Ignore by file name" rocket-image="responsive" />
<picture>[...] </picture>
```
### Adjusting ignore function
The default ignore function looks like this
```js
/**
* The default responsive ignore function will ignore files
* - ending in `.svg`
* - containing `rocket-unresponsive.`
*
* @param {object} opts
* @param {string} opts.src
* @param {string} opts.title
* @param {string} opts.alt
* @param {{name: string, value: string}[]} opts.attributes
* @returns {boolean}
*/
function ignore({ src }) {
return src.endsWith('svg') || src.includes('rocket-unresponsive.');
}
```
and you can adjust it by setting it via the `imagePreset`.
For this example we want to also ignore `.jpeg` files.
👉 `rocket.config.js`
```js
export default {
imagePresets: {
responsive: {
// ...
ignore: ({ src }) =>
src.endsWith('.jpeg') || src.endsWith('svg') || src.includes('rocket-unresponsive.'),
},
},
};
```
With that setting we get the following behavior
```md
![Logo stays svg](logo.svg)
![Ignore by file name](my-image.rocket-unresponsive.jpg)
![My Image Alternative Text](my-image.jpeg)
```
becomes
```html
<img src="logo.svg" alt="Logo stays svg" rocket-image="responsive" />
<img src="my-image.rocket-unresponsive.jpg" alt="Ignore by file name" rocket-image="responsive" />
<img src="my-image.jpeg" alt="My Image Alternative Text" rocket-image="responsive" />
```
## Defining your own presets ## Defining your own presets
You can add your own image preset like so You can add your own image preset like so

View File

@@ -1,4 +1,4 @@
# Configuration >> Overview ||10 # Configuration >> Overview || 10
The configuration file is `rocket.config.js` or `rocket.config.mjs`. The configuration file is `rocket.config.js` or `rocket.config.mjs`.
@@ -59,7 +59,7 @@ For these cases you can use `setupDevAndBuildPlugins`, which will automatically
import json from '@rollup/plugin-json'; import json from '@rollup/plugin-json';
import { addPlugin } from 'plugins-manager'; import { addPlugin } from 'plugins-manager';
/** @type {Partial<import("@rocket/cli").RocketCliOptions>} */ /** @type {import('@rocket/cli').RocketCliOptions} */
const config = { const config = {
setupDevAndBuildPlugins: [ setupDevAndBuildPlugins: [
addPlugin({ name: 'json', plugin: json, location: 'top', options: { my: 'settings' } }), addPlugin({ name: 'json', plugin: json, location: 'top', options: { my: 'settings' } }),
@@ -79,10 +79,22 @@ All plugins which are either default or are added via a preset can still be adju
```js ```js
import { adjustPluginOptions } from 'plugins-manager'; import { adjustPluginOptions } from 'plugins-manager';
/** @type {Partial<import("@rocket/cli").RocketCliOptions>} */ /** @type {import('@rocket/cli').RocketCliOptions} */
const config = { const config = {
setupDevAndBuildPlugins: [adjustPluginOptions('json', { my: 'overwrite settings' })], setupDevAndBuildPlugins: [adjustPluginOptions('json', { my: 'overwrite settings' })],
}; };
export default config; export default config;
``` ```
## Lifecycle
You can hook into the rocket lifecycle by specifying a function for `before11ty`. This function runs before 11ty calls it's write method. If it is an async function, Rocket will await it's promise.
```js
export default {
async before11ty() {
await copyDataFiles();
},
};
```

View File

@@ -7,6 +7,25 @@ eleventyNavigation:
Here you will find all the details for each of the packages/systems we offer. Here you will find all the details for each of the packages/systems we offer.
You should check out: ## Contents
- [@rocket/launch](./presets/launch.md) which is our default preset - [Configuration](./configuration/)
- [Overview](./configuration/overview/)
- [Computed Config](./configuration/computed-config/)
- [Service Worker](./configuration/service-worker/)
- [Images](./configuration/images/)
- [Presets](./presets/)
- [Joining Blocks](./presets/joining-blocks/)
- [`@rocket/launch`](./presets/launch/)
- [`@rocket/search`](./presets/search/)
- [`@rocket/blog`](./presets/blog/)
- [Markdown JavaScript](./markdown-javascript/)
- [Overview](./markdown-javascript/overview/)
- [Preview](./markdown-javascript/preview/)
- [Story](./markdown-javascript/story/)
- [Eleventy Plugins](./eleventy-plugins/)
- [Markdown JavaScript (mdjs)](./eleventy-plugins/mdjs-unified/)
- [Tools](./tools/)
- [Plugins Manager](./tools/plugins-manager/)
- [Rollup Config](./tools/rollup-config/)
- [Check HTML Links ](./tools/check-html-links/)

View File

@@ -1,5 +1,11 @@
# Markdown JavaScript >> Overview || 10 # Markdown JavaScript >> Overview || 10
```js script
import '@mdjs/mdjs-story/define';
import '@mdjs/mdjs-preview/define';
import { html } from '@mdjs/mdjs-story';
```
Markdown JavaScript (mdjs) is a format that allows you to use JavaScript with Markdown, to create interactive demos. It does so by "annotating" JavaScript that should be executed in Markdown. Markdown JavaScript (mdjs) is a format that allows you to use JavaScript with Markdown, to create interactive demos. It does so by "annotating" JavaScript that should be executed in Markdown.
To annotate we use a code block with `js script`. To annotate we use a code block with `js script`.
@@ -63,13 +69,6 @@ import '@mdjs/mdjs-preview/define';
Once loaded you can use them like so: Once loaded you can use them like so:
````md
```js script
import '@mdjs/mdjs-story/define';
import '@mdjs/mdjs-preview/define';
```
````
### Story ### Story
The code snippet will actually get executed at that place and you will have a live demo The code snippet will actually get executed at that place and you will have a live demo
@@ -117,12 +116,6 @@ export const JsPreviewStory = () => html` <demo-wc-card>JS Preview Story</demo-w
Here is a live example from [demo-wc-card](https://www.npmjs.com/package/demo-wc-card). Here is a live example from [demo-wc-card](https://www.npmjs.com/package/demo-wc-card).
```js script
import '@mdjs/mdjs-story/define';
import '@mdjs/mdjs-preview/define';
import { html } from 'lit-html';
```
```js preview-story ```js preview-story
import 'demo-wc-card/demo-wc-card.js'; import 'demo-wc-card/demo-wc-card.js';
export const header = () => { export const header = () => {

View File

@@ -17,7 +17,7 @@ You can showcase live running code by annotating a code block with `js preview-s
- Settings can be remembered for other pages / return visits - Settings can be remembered for other pages / return visits
```js script ```js script
import { html } from 'lit-html'; import { html } from '@mdjs/mdjs-preview';
import './assets/demo-element.js'; import './assets/demo-element.js';
``` ```
@@ -25,7 +25,7 @@ import './assets/demo-element.js';
````md ````md
```js script ```js script
import { html } from 'lit-html'; import { html } from '@mdjs/mdjs-preview';
import './assets/demo-element.js'; import './assets/demo-element.js';
``` ```

View File

@@ -3,12 +3,12 @@
You can showcase live running code by annotating a code block with `js story`. You can showcase live running code by annotating a code block with `js story`.
```js script ```js script
import { html } from 'lit-html'; import { html } from '@mdjs/mdjs-story';
``` ```
````md ````md
```js script ```js script
import { html } from 'lit-html'; import { html } from '@mdjs/mdjs-story';
``` ```
```js story ```js story

View File

@@ -1,16 +1,28 @@
# Presets >> Blog ||40 # Presets >> Blog || 40
Enable writing blog posts within your Rocket site. Enable writing blog posts within your Rocket site.
## Installation ## Installation
```bash <code-tabs collection="package-managers" default-tab="npm">
```bash tab npm
npm i @rocket/blog npm i @rocket/blog
``` ```
```bash tab yarn
yarn add @rocket/blog
```
```bash tab pnpm
pnpm add @rocket/blog
```
</code-tabs>
## Usage ## Usage
👉 `rocket.config.mjs` 👉 `rocket.config.js`
```js ```js
import { rocketBlog } from '@rocket/blog'; import { rocketBlog } from '@rocket/blog';

View File

@@ -1,4 +1,4 @@
# Presets >> Joining Blocks ||10 # Presets >> Joining Blocks || 10
The template system allows for a very granular control of how individual parts will be merged, overwritten or reorderd. The template system allows for a very granular control of how individual parts will be merged, overwritten or reorderd.
@@ -6,7 +6,7 @@ As a preset you may want to add this to your layout.
{% raw %} {% raw %}
``` ```jinja2
<footer id="main-footer"> <footer id="main-footer">
{% for blockName, blockPath in _joiningBlocks.footer %} {% for blockName, blockPath in _joiningBlocks.footer %}
{% include blockPath %} {% include blockPath %}
@@ -22,11 +22,15 @@ This will now render all templates within `_includes/_joiningBlocks/footer/*`.
Let's assume we have a preset with the following files Let's assume we have a preset with the following files
```html 👉 `_includes/_joiningBlocks/footer/10-first.njk`
<!-- usedPreset/_includes/_joiningBlocks/footer/10-first.njk -->
<p>first</p>
<!-- usedPreset/_includes/_joiningBlocks/footer/20-second.njk --> ```html
<p>first</p>
```
👉 `_includes/_joiningBlocks/footer/20-second.njk`
```html
<p>second</p> <p>second</p>
``` ```
@@ -41,8 +45,9 @@ And it produces this in your website
Now we can add a file which will insert content without needing to overwrite any of the preset file. Now we can add a file which will insert content without needing to overwrite any of the preset file.
👉 `docs/_includes/_joiningBlocks/footer/15-in-between.njk`
```html ```html
<!-- docs/_includes/_joiningBlocks/footer/15-in-between.njk -->
<p>in-between</p> <p>in-between</p>
``` ```
@@ -60,8 +65,9 @@ the final output will be
Now if you want to overwrite you can use the same filename. Now if you want to overwrite you can use the same filename.
👉 `docs/_includes/_joiningBlocks/footer/10-first.njk`
```html ```html
<!-- docs/_includes/_joiningBlocks/footer/10-first.njk -->
<p>updated first</p> <p>updated first</p>
``` ```
@@ -78,8 +84,9 @@ the final output will be
Sometimes you wanna reorder when you overwrite as well Sometimes you wanna reorder when you overwrite as well
👉 `docs/_includes/_joiningBlocks/footer/30-first.njk`
```html ```html
<!-- docs/_includes/_joiningBlocks/footer/30-first.njk -->
<p>first</p> <p>first</p>
``` ```

View File

@@ -1,14 +1,40 @@
# Presets >> Launch ||20 ---
alerts:
- type: tip
content: Take a tip from me
- type: warning
content: Be *sure* about this...
- type: danger
content: You **really** shouldn't!
---
# Presets >> Launch || 20
Rocket comes with a preset you will love. Simple, responsive and behaving like native, it sure is going to be a hit among your users. Rocket comes with a preset you will love. Simple, responsive and behaving like native, it sure is going to be a hit among your users.
## Installation ## Installation
```bash Install `@rocket/launch` from the NPM repository using your favourite package manager.
<code-tabs collection="package-managers" default-tab="npm">
```bash tab npm
npm i @rocket/launch npm i @rocket/launch
``` ```
👉 `rocket.config.mjs` ```bash tab yarn
yarn add @rocket/launch
```
```bash tab pnpm
pnpm add @rocket/launch
```
</code-tabs>
## Usage
👉 `rocket.config.js`
```js ```js
import { rocketLaunch } from '@rocket/launch'; import { rocketLaunch } from '@rocket/launch';
@@ -20,51 +46,80 @@ export default {
## Data ## Data
Most data comes from `site.cjs`. The launch preset configures [11ty data](https://www.11ty.dev/docs/data/) using a few overridable files:
There is also a specific `rocketLaunch.json`. - `site.cjs`: Responsible for most of the site-wide config
- `rocketLaunch.json`: configures the homepage layout
The footer data comes from `footer.json` - `footer.json`: Configures the content of the footer
## Inline Notification ## Inline Notification
Notification are web components that bring in some styles.
To use them in Markdown you need to write the HTML tag and have it separated by an empty line.
```js script ```js script
import '@rocket/launch/inline-notification/inline-notification.js'; import '@rocket/launch/inline-notification/inline-notification.js';
``` ```
First you need to import the script Launch ships with `<inline-notification>`, a custom element that applies some styles similar to "info boxes". The element works for `<noscript>` users as well, as long as you don't [override](/guides/presets/overriding/) the default `noscript.css` file.
```` To add an inline notification you need to remember to import the element definition:
<!-- prettier-ignore-start -->
~~~markdown
```js script ```js script
import '@rocket/launch/inline-notification/inline-notification.js'; import '@rocket/launch/inline-notification/inline-notification.js';
``` ```
```` ~~~
<!-- prettier-ignore-end -->
### Tip Then you can add your notification to the page. If you want to write the notification's content using markdown, just pad the opening and closing tags with empty lines.
<inline-notification type="tip"> There are three varieties of `<inline-notification>`, "tip", "warning", and "danger"
I am a tip <style>
#inline-notifications::part(tab) {
text-transform: capitalize;
}
#inline-notifications code-tab::part(content) {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 6px;
}
#inline-notifications code-copy::part(copy-button) {
position: absolute;
top: 10px;
border-radius: 6px;
border: 1px solid var(--primary-lines-color);
}
</style>
</inline-notification> <code-tabs id="inline-notifications" default-tab="tip">
**Usage** {%for alert in alerts%}
```md <code-tab data-label="{{ alert.type }}" data-id="{{ alert.type }}" no-copy>
<inline-notification type="tip">
I am a tip ```md copy
<inline-notification type="{{ alert.type }}">
{{ alert.content | safe }}
</inline-notification> </inline-notification>
``` ```
<inline-notification type="{{ alert.type }}">
{{ alert.content | safe }}
</inline-notification>
</code-tab>
{%endfor%}
</code-tabs>
### Modify the Title ### Modify the Title
To override the title you can provide a property success. The notification title defautls to it's type. You can write a custom title with the `title` attribute.
<inline-notification type="tip" title="success"> <inline-notification type="tip" title="success">
@@ -72,8 +127,6 @@ I am a success message
</inline-notification> </inline-notification>
**Usage**
```md ```md
<inline-notification type="tip" title="success"> <inline-notification type="tip" title="success">
@@ -82,38 +135,8 @@ I am a success message
</inline-notification> </inline-notification>
``` ```
### Warning
<inline-notification type="warning"> <inline-notification type="warning">
I am a warning The `title` attribute does not change the title for `<noscript>` users, so don't include any critical information in it.
</inline-notification> </inline-notification>
**Usage**
```md
<inline-notification type="warning">
I am a warning
</inline-notification>
```
### Danger
<inline-notification type="danger">
I am a dangerous message
</inline-notification>
**Usage**
```md
<inline-notification type="danger">
I am a dangerous message
</inline-notification>
```

View File

@@ -1,14 +1,28 @@
# Presets >> Search ||30 # Presets >> Search || 30
Add a search for all your static content. Add a search for all your static content.
## Installation ## Installation
```bash <code-tabs collection="package-managers" default-tab="npm">
```bash tab npm
npm i @rocket/search npm i @rocket/search
``` ```
👉 `rocket.config.mjs` ```bash tab yarn
yarn add @rocket/search
```
```bash tab pnpm
pnpm add @rocket/search
```
</code-tabs>
## Usage
👉 `rocket.config.js`
```js ```js
import { rocketSearch } from '@rocket/search'; import { rocketSearch } from '@rocket/search';
@@ -17,3 +31,13 @@ export default {
presets: [rocketSearch()], presets: [rocketSearch()],
}; };
``` ```
## Styling
| Property | Default | Description |
| ------------------------------------- | --------- | ------------------------------------ |
| `--rocket-search-background-color` | `#fff` | Search results background color |
| `--rocket-search-input-border-color` | `#dfe1e5` | |
| `--rocket-search-input-border-radius` | `24px` | |
| `--rocket-search-fill-color` | `#000` | Search Icon Color |
| `--rocket-search-highlight-color` | `#6c63ff` | Highlighted search result text color |

View File

@@ -1,6 +1,6 @@
# Tools >> Check HTML Links ||30 # Tools >> Check HTML Links ||30
```js ```js script
import '@rocket/launch/inline-notification/inline-notification.js'; import '@rocket/launch/inline-notification/inline-notification.js';
``` ```

View File

@@ -20,7 +20,7 @@ The Plugins Manager helps you register and execute your plugins across the vario
## Adding Remark/Unified Plugins ## Adding Remark/Unified Plugins
If you want to a plugin to the Markdown processing you can use `setupUnifiedPlugins`. If you want to add a plugin to the Markdown processing you can use `setupUnifiedPlugins`.
```js ```js
import emoji from 'remark-emoji'; import emoji from 'remark-emoji';

View File

@@ -10,94 +10,157 @@ Make sure they are installed before proceeding.
The fastest way to get started is by using an existing preset like the launch preset. The fastest way to get started is by using an existing preset like the launch preset.
1. Start with an empty new folder ### Step 1. Initialize the Project Package
``` Start by creating an empty folder for your project
mkdir my-project
cd my-project
npm init -y
```
2. Install dependencies ```bash copy
mkdir my-project
cd my-project
```
``` Then initialize a package.json file
npm install --save-dev @rocket/cli @rocket/launch
```
3. Add to your .gitignore <code-tabs collection="package-managers" default-tab="npm">
``` ```bash tab npm
## Rocket ignore files (need to be the full relative path to the folders) npm init -y
docs/_merged_data/ ```
docs/_merged_assets/
docs/_merged_includes/
```
<inline-notification type="danger"> ```bash tab yarn
yarn init -y
```
You may be tempted to skip the step above, because you're not ready to commit to git yet! ```bash tab pnpm
pnpm init -y
```
Rocket uses the .gitignore file to manage its requirements. If you skip this step, Rocket will fail to deploy! </code-tabs>
### Step 2. Install dependencies
<code-tabs collection="package-managers" default-tab="npm">
```bash tab npm
npm install --save-dev @rocket/cli @rocket/launch
```
```bash tab yarn
yarn add -D @rocket/cli @rocket/launch
```
```bash tab pnpm
pnpm add -D @rocket/cli @rocket/launch
```
</code-tabs>
### Step 3. Bootstrap the project
<code-tabs collection="package-managers" default-tab="npm">
```bash tab npm
npx rocket bootstrap
```
```bash tab yarn
yarn rocket bootstrap
```
```bash tab pnpm
pnpx rocket bootstrap
```
</code-tabs>
The `bootstrap` command creates four files in your repo:
- `.gitignore` containing rocket's build artifacts
- `rocket.config.js` containing a minimal rocket config
- `docs/.eleventyignore` required to allow you to [override templates](/guides/presets/overriding/)
- `docs/index.md` your first page
It also set the package `type` to `"module"` and adds a `start` and `docs` package scripts.
<inline-notification type="warning">
If you don't want to use the `module` package type, make sure to rename the generated config file to `rocket.config.mjs`.
</inline-notification> </inline-notification>
4. Create a `rocket.config.mjs` (or `.js` if you have type: "module" in you package.json) <details><summary>Default Files Contents</summary>
```js <code-tabs default-tab="rocket.config.js">
import { rocketLaunch } from '@rocket/launch';
export default { ```js tab rocket.config.js
presets: [rocketLaunch()], import { rocketLaunch } from '@rocket/launch';
};
```
5. (optionally) Create a file `.eleventyignore` (this file will be needed once you start customizing presets) export default {
presets: [rocketLaunch()],
};
```
``` ```md tab docs/index.md
node_modules/** # Welcome to Your Rocket Site
/docs/_assets
/docs/_includes
/docs/_data
```
<inline-notification type="warning" title="note"> Add your markdown content here.
```
All further paths are relative to your project root (my-project in this case). <!-- prettier-ignore-start -->
</inline-notification> ```html tab docs/.eleventyignore
_assets
_includes
_data
```
```html tab .gitignore
## Rocket ignore files (need to be the full relative path to the folders)
docs/_merged_data/
docs/_merged_assets/
docs/_merged_includes/
```
<!-- prettier-ignore-end -->
</code-tabs>
</details>
## Add your First Page ## Add your First Page
👉 `docs/index.md` Bootstrap created the file `docs/index.md`. Open it in your editor and change it to suit your needs.
<small>NOTE: This tutorial assumes you are familiar with Markdown, for page authoring.</small>
```md ```md
# Welcome to Your Rocket Site # Welcome to Your Rocket Site
Text here, like any Markdown file. Add your markdown content here.
``` ```
This tutorial assumes you are familiar with Markdown, for page authoring.
Please note that the heading - text prefixed with `#` or `##` - is not optional for each page in this tutorial. Everything below that first line is optional Markdown text. Please note that the heading - text prefixed with `#` or `##` - is not optional for each page in this tutorial. Everything below that first line is optional Markdown text.
## Startup: ## Startup
👉 `package.json`
Add `"start": "rocket start"` to your package.json
```json
"scripts": {
"start": "rocket start"
}
```
Now you can launch your site locally with Now you can launch your site locally with
```bash <code-tabs collection="package-managers" default-tab="npm">
npm run start
```bash tab npm
npm start
``` ```
```bash tab yarn
yarn start
```
```bash tab pnpm
pnpx start
```
</code-tabs>
## Taking Inventory Before Adding Pages: ## Taking Inventory Before Adding Pages:
We're about to add both content and navigation at the same time. We're about to add both content and navigation at the same time.
@@ -107,11 +170,16 @@ It can be helpful to take an inventory, before we start, to separate basic setup
- We built the project with basic npm commands - We built the project with basic npm commands
- Added a couple required files manually - Added a couple required files manually
- Adjusted package.json - Adjusted package.json
- **doc/index.md** to seed the content - **docs/index.md** to seed the content
- Launches with `npm start` - Launches with `npm start`
That's all it takes to get a new super-fast and powerful site, complete with a service worker, default styling, navigation, and ready to deploy as a plain old static files. That's all it takes to get a new super-fast and powerful site, complete with a service worker, default styling, navigation, and ready to deploy as a plain old static files.
## Next Steps
- [Adding Pages](../adding-pages/)
- [Using Presets](../../presets/getting-started/)
```js script ```js script
import '@rocket/launch/inline-notification/inline-notification.js'; import '@rocket/launch/inline-notification/inline-notification.js';
``` ```

View File

@@ -1,4 +1,4 @@
# First Pages >> Managing sidebar ||30 # First Pages >> Managing sidebar || 30
The sidebar will show all the content of the current section. The sidebar will show all the content of the current section.
@@ -33,10 +33,11 @@ eleventyNavigation:
--- ---
``` ```
<!--
You can also look at this live playground: You can also look at this live playground:
```js story ```js story
import { html } from 'lit-html'; import { html } from '@mdjs/mdjs-preview';
export const headlineConverter = () => html` export const headlineConverter = () => html`
<p> <p>
@@ -45,6 +46,7 @@ export const headlineConverter = () => html`
</p> </p>
`; `;
``` ```
-->
How it then works is very similar to https://www.11ty.dev/docs/plugins/navigation/ How it then works is very similar to https://www.11ty.dev/docs/plugins/navigation/

View File

@@ -1,25 +1,49 @@
# First Pages >> Use JavaScript ||40 # First Pages >> Use JavaScript || 40
You can use `js script` to execute JavaScript (`type="module"`). If you would like to add JavaScript to a page, you can do it inline using the `script` markdown directive. The script you write runs on the page as a module.
```` <!-- prettier-ignore-start -->
~~~markdown
```js script ```js script
console.log('foo'); const message = 'Hello, World!';
console.log(message);
``` ```
```` ~~~
<!-- prettier-ignore-end -->
This can be useful for importing web components and using them in Markdown. Adding the above will log `Hello, World!` to the console without adding a global `message` variable.
```` This can be useful for importing web components and using them in Markdown. Imagine you had some `magic-reveal` element that you wanted to use on a page:
<!-- prettier-ignore-start -->
~~~markdown
```js script ```js script
import 'magic-reveal/magic-reveal.js'; import 'magic-reveal/magic-reveal.js';
```
<magic-reveal> <magic-reveal>
This text will get magically revealed. I can **still** use Markdown as long as there is an empty line between the opening/closing tags and my text. This text will get magically revealed.
I can **still** use Markdown as long as there is an empty line
between the opening/closing tags and my text.
</magic-reveal> </magic-reveal>
``` ~~~
```` <!-- prettier-ignore-end -->
or you can use `js story`, `js preview-story`, ... ## Component Story Format
You can also add storybook-style CSF (v2 only) stories to a page using `js story` or `js preview-story`, just make sure to import `html` from `@mdjs/mdjs-preview` instead of from `lit` or `lit-html`.
<!-- prettier-ignore-start -->
~~~markdown
```js story
import { html } from '@mdjs/mdjs-preview';
export const StoryPreview = () => html`
<p>Use stories in Rocket!</p>
`;
```
~~~
<!-- prettier-ignore-end -->

View File

@@ -1 +1 @@
# Go Live ||40 # Go Live || 40

View File

@@ -1,4 +1,4 @@
# Go Live >> Overview ||10 # Go Live >> Overview || 10
A few things are usually needed before going live "for real". A few things are usually needed before going live "for real".
@@ -9,17 +9,21 @@ Many servers are configured to handle this automatically and to serve a 404.html
The [Rocket Launch preset](../../docs/presets/launch.md) ships a default 404 template you can use. The [Rocket Launch preset](../../docs/presets/launch.md) ships a default 404 template you can use.
To enable it, you need to create a 404.md and use the 404 layout. To enable it, you need to create a `404.md` and use the 404 layout.
👉 `docs/404.md` 👉 `docs/404.md`
``` ```markdown copy
--- ---
layout: layout-404 layout: layout-404
permalink: 404.html permalink: 404.html
--- ---
``` ```
This results in a `404.html` page, which will do nothing by itself. But many hosting services like netlify or firebase, for example will redirect 404s to this `404.html` by default.
If the hosting provider doesn't already do this, then you may be able to accomplish it via some settings for example by using a `.htaccess` file in case of an apache server.
## Add a Sitemap ## Add a Sitemap
A sitemap can be used to inform search engines or services about the pages your site has. A sitemap can be used to inform search engines or services about the pages your site has.
@@ -28,24 +32,21 @@ You can create one by adding this file:
👉 `docs/sitemap.njk` 👉 `docs/sitemap.njk`
{% raw %} ```markdown copy
```
--- ---
layout: layout-raw layout: layout-raw
permalink: /sitemap.xml permalink: /sitemap.xml
eleventyExcludeFromCollections: true eleventyExcludeFromCollections: true
--- ---
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
{% for page in collections.all %} {% raw %}{% for page in collections.all %}
<url> <url>
<loc>{{ rocketConfig.absoluteBaseUrl }}{{ page.url | url }}</loc> <loc>{{ rocketConfig.absoluteBaseUrl }}{{ page.url | url }}</loc>
<lastmod>{{ page.date.toISOString() }}</lastmod> <lastmod>{{ page.date.toISOString() }}</lastmod>
<changefreq>{{ page.data.changeFreq if page.data.changeFreq else "monthly" }}</changefreq> <changefreq>{{ page.data.changeFreq if page.data.changeFreq else "monthly" }}</changefreq>
</url> </url>
{% endfor %} {% endfor %}{% endraw %}
</urlset> </urlset>
``` ```
{% endraw %}

View File

@@ -1,4 +1,4 @@
# Go Live >> Social Media ||20 # Go Live >> Social Media || 20
Having a nice preview image for social media can be very helpful. Having a nice preview image for social media can be very helpful.
For that reason Rocket creates those automatically with the title, parent title, section and your logo. For that reason Rocket creates those automatically with the title, parent title, section and your logo.
@@ -15,7 +15,7 @@ Note: If your logo has an `<?xml>` tag it will throw an error as it will be inli
You can create your own image and link it with something like this You can create your own image and link it with something like this
``` ```markdown copy
--- ---
socialMediaImage: path/to/my/image.png socialMediaImage: path/to/my/image.png
--- ---
@@ -29,7 +29,7 @@ You can create an `11tydata.cjs` file next to your page. If your page is `docs/g
In there you can use the default `createSocialImage` but provide your own values. In there you can use the default `createSocialImage` but provide your own values.
```js ```js copy
const { createSocialImage } = require('@rocket/cli'); const { createSocialImage } = require('@rocket/cli');
module.exports = async function () { module.exports = async function () {
@@ -39,7 +39,7 @@ module.exports = async function () {
subTitle2: 'in 5 Minutes', subTitle2: 'in 5 Minutes',
footer: 'Rocket Guides', footer: 'Rocket Guides',
// you can also override the svg only for this page by providing // you can also override the svg only for this page by providing
// createSocialImageSvg: async () => '<svg>...</svg>' // createSocialImageSvg: async () => '{%raw%}<svg>...</svg>{%endraw%}'
}); });
return { return {
socialMediaImage, socialMediaImage,
@@ -52,13 +52,14 @@ module.exports = async function () {
Often you want to have a unique style for your social media images. Often you want to have a unique style for your social media images.
For that you can provide your own function which returns a string of an SVG to render the image. For that you can provide your own function which returns a string of an SVG to render the image.
👉 `rocket.config.mjs` 👉 `rocket.config.js`
```js <!-- prettier-ignore-start -->
```js copy
import { adjustPluginOptions } from 'plugins-manager'; import { adjustPluginOptions } from 'plugins-manager';
/** @type {Partial<import("@rocket/cli").RocketCliOptions>} */ /** @type {import('@rocket/cli').RocketCliOptions} */
const config = { export default ({
setupEleventyComputedConfig: [ setupEleventyComputedConfig: [
adjustPluginOptions('socialMediaImage', { adjustPluginOptions('socialMediaImage', {
createSocialImageSvg: async ({ createSocialImageSvg: async ({
@@ -95,59 +96,69 @@ const config = {
}, },
}), }),
], ],
}; });
export default config;
``` ```
<!-- prettier-ignore-end -->
## Using an SVG File as a src with Nunjucks ## Using an SVG File as a src with Nunjucks
If you have multiple variations it may be easier to save them as SVG files and use a template system. If you have multiple variations it may be easier to save them as SVG files and use a template system.
WARNING: Untested example <!-- prettier-ignore-start -->
<code-tabs default-tab="rocket.config.js">
👉 `rocket.config.mjs` ```js tab rocket.config.js
{% raw %}
```js
import { adjustPluginOptions } from 'plugins-manager'; import { adjustPluginOptions } from 'plugins-manager';
/** @type {Partial<import("@rocket/cli").RocketCliOptions>} */ /** @type {import('@rocket/cli').RocketCliOptions} */
const config = { export default ({
setupEleventyComputedConfig: [ setupEleventyComputedConfig: [
adjustPluginOptions('socialMediaImage', { adjustPluginOptions('socialMediaImage', {
createSocialImageSvg: async (args = {}) => { createSocialImageSvg: async (args = {}) => {
// inside of the svg you can use {{ title }} const svgBuffer = await fs.promises.readFile('/path/to/your/template.svg');
const svgBuffer = await fs.promises.readFile('/path/to/your/svg/file');
const svg = logoBuffer.toString(); const svg = logoBuffer.toString();
return nunjucks.renderString(svg, args); return nunjucks.renderString(svg, args);
}, },
}), }),
], ],
}; });
{% endraw %}
``` ```
```svg tab /path/to/your/template.svg
{%raw%}<svg xmlns="http://www.w3.org/2000/svg" fill="#e63946" viewBox="0 0 511.998 511.998">
<text font-family="'Open Sans', sans-serif" font-size="39" transform="translate(422.99 408.53)">
<tspan x="-89.26" y="12.25">{{ title }}</tspan>
</text>
<path d="M98.649 430.256c-46.365 28.67-71.17 30.939-78.916 23.51-7.75-7.433-6.519-32.307 20.182-79.832 24.953-44.412 65.374-96.693 113.818-147.211l-11.279-10.817c-49.33 51.442-90.583 104.845-116.163 150.373-19.228 34.22-37.848 79.134-17.375 98.766 5.84 5.6 13.599 7.935 22.484 7.935 22.269 0 51.606-14.677 75.469-29.432 44.416-27.464 96.044-70.919 145.373-122.362l-11.279-10.817c-48.446 50.519-98.987 93.095-142.314 119.887zM254.734 294.95l-18.47-17.71 10.816-11.281 18.47 17.71zM285.516 324.473l-18.47-17.71 10.816-11.28 18.47 17.71zM315.543 317.807l-73.886-70.847 10.816-11.28 73.886 70.846zM500.916 41.287c-7.769 1.59-76.412 16.062-93.897 34.294l-50.728 52.899-114.703-3.629-39.198 40.876 79.28 40.569-21.755 22.687 72.848 69.858 21.755-22.687 43.857 77.51 39.197-40.876-8.433-114.451 50.727-52.899c17.485-18.234 29.067-87.422 30.331-95.251l1.801-11.169-11.082 2.269zM228.209 161.383l19.842-20.692 93.688 2.964-48.775 50.864-64.755-33.136zm173.423 166.303l-35.822-63.308 48.776-50.865 6.886 93.482-19.84 20.691zm-69.334-50.943l-50.287-48.223L412.89 92.037l50.288 48.223-130.88 136.483zm140.711-148.707l-48.316-46.334c14.54-8.427 44.787-17.217 68.076-22.632-4.433 23.497-11.949 54.085-19.76 68.966z"/>
<path d="M326.335 257.25l-24.628-23.614 10.816-11.28 24.628 23.615zM431.385 134.414l-11.808 12.315-11.28-10.816 11.808-12.315zM401.838 165.183l-11.28-10.816 11.807-12.314 11.28 10.816zM384.121 183.66l-11.28-10.816 11.807-12.314 11.28 10.816zM175.19 184.515l11.051 11.05-23.582 23.582-11.05-11.05zM190.903 168.796l11.05 11.052-7.863 7.86-11.05-11.052z"/>
</svg>{%endraw%}
```
</code-tabs>
<!-- prettier-ignore-end -->
## Enabling / Disabling ## Enabling / Disabling
Generating images from SVG is quite fast but it can still add that's why by default during `rocket start` there will be no social media images created. Generating images from SVG is quite fast but it can still add that's why by default during `rocket start` there will be no social media images created.
If you with so create them also during start you can If you with so create them also during start you can
```js <!-- prettier-ignore-start -->
const config = { ```js copy
export default ({
start: { start: {
createSocialMediaImages: true, createSocialMediaImages: true,
}, },
}; });
``` ```
<!-- prettier-ignore-end -->
Similarly, if you never want to create social media images even during build then you can globally disable it via Similarly, if you never want to create social media images even during build then you can globally disable it via
```js <!-- prettier-ignore-start -->
const config = { ```js copy
export default ({
createSocialMediaImages: true, createSocialMediaImages: true,
}; });
``` ```
<!-- prettier-ignore-end -->

View File

@@ -5,4 +5,19 @@ eleventyNavigation:
order: 10 order: 10
--- ---
Rocket is a fundamentally straight forward way to generate static pages while still allowing to sprinkle in some JavaScript where needed. Rocket helps you generate static pages from Markdown files while giving you the flexibility to sprinkle in some JavaScript where needed.
- [First Pages](./first-pages/getting-started/) Learn how to bootstrap and run a Rocket site
- [Adding Pages](./first-pages/adding-pages/) Create your own content pages
- [Linking](./first-pages/link-to-other-pages/) Link between yuor markdown pages
- [Managing Sidebar](./first-pages/manage-sidebar/) Customize your site's navigation
- [Use JavaScript](./first-pages/use-javascript/) Write inline scripts in markdown
- [URLs](./first-pages/urls/) Customize your pages' permalinks
- [Layouts](./first-pages/layouts/) Give your page a custom layout
- [Presets](./presets/getting-started/) Customize Rocket with config presets
- [Overriding](./presets/overriding/) Override preset templates
- [Using Templates](./presets/using-templates/) Make use of preset templates
- [Create Your Own](./presets/create-your-own/getting-started/) Write and publish your own presets
- [Configuration](./configuration/getting-started/) Make Rocket your own
- [Go Live](./go-live/overview/) Publish your site
- [Social Media](./go-live/social-media/) Generate social images

View File

@@ -1,106 +0,0 @@
# Presets >> Create your own || 90
A preset is a setup function and a folder including `_assets`, `_data` and `_includes` (all optional).
To play around with a preset you can create a folder `fire-theme`.
You then create the setup function for it with only one property called `path` which will allow Rocket to properly resolve it.
## Create a Preset Config File
👉 `fire-theme/fireTheme.js`
```js
import path from 'path';
import { fileURLToPath } from 'url';
const __dirname = path.dirname(fileURLToPath(import.meta.url));
export function fireTheme() {
return {
path: path.resolve(__dirname),
};
}
```
Once you have that you can start filling in content you need.
For example a we could override the full `layout.css` by adding a it like so
👉 `fire-theme/layout.css`
```css
body {
background: hotpink;
}
```
Once you have that you can add it to your Rocket config.
NOTE: The order of presets is important, as for example in this case we take everything from `rocketLaunch` but later override via `fireTheme`.
👉 `rocket-config.js`
```js
import { rocketLaunch } from '@rocket/launch';
import { fireTheme } from 'path/to/fire-theme/fireTheme.js';
export default {
presets: [rocketLaunch(), fireTheme()],
};
```
## Publish a Preset
If you would like to publish a preset to use it on multiple websites or share it with your friends you can do like so.
1. Pick a name for the package => for this example we take `fire-theme`.
2. Create a new folder `fire-theme`
3. Create a folder `fire-theme/preset` copy `fireTheme.js` from [above](#create-a-preset-config-file) into `preset/fireTheme.js`
4. Add a 👉 `package.json`
```json
{
"name": "fire-theme",
"version": "0.3.0",
"description": "Fire Theme for Rocket",
"license": "MIT",
"type": "module",
"exports": {
".": "./index.js",
"./preset/": "./preset/"
},
"files": ["*.js", "preset"],
"keywords": ["rocket", "preset"]
}
```
5. Add a 👉 `index.js`
```js
export { fireTheme } from './preset/fireTheme.js';
```
6. Add a 👉 `README.md`
````
# FireTheme
This is a theme/preset for [Rocket](https://rocket.modern-web.dev/).
## Installation
```
npm i -D fire-theme
```
Add it to your 👉 `rocket.config.js`
```js
import { fireTheme } from 'fire-theme';
export default {
presets: [fireTheme()],
};
```
````

View File

@@ -0,0 +1,54 @@
# Presets >> Create your Own >> Getting Started || 10
A preset is a setup function and a folder including `_assets`, `_data` and `_includes` (all optional).
To play around with a preset you can create a folder `fire-theme`.
You then create the setup function for it with only one property called `path` which will allow Rocket to properly resolve it.
## Create a Preset Config File
👉 `fire-theme/fireTheme.js`
```js copy
import path from 'path';
import { fileURLToPath } from 'url';
const __dirname = path.dirname(fileURLToPath(import.meta.url));
export function fireTheme() {
return {
path: path.resolve(__dirname),
};
}
```
Once you have that you can start filling in content you need.
For example we could override the full `layout.css` by adding it like so
👉 `fire-theme/layout.css`
```css copy
body {
background: hotpink;
}
```
Once you have that you can add it to your Rocket config.
NOTE: The order of presets is important, as for example in this case we take everything from `rocketLaunch` but later override via `fireTheme`.
👉 `rocket.config.js`
<!-- prettier-ignore-start -->
```js copy
import { rocketLaunch } from '@rocket/launch';
import { fireTheme } from 'path/to/fire-theme/fireTheme.js';
/** @type {import('@rocket/cli').RocketCliOptions} */
export default ({
presets: [rocketLaunch(), fireTheme()],
});
```
<!-- prettier-ignore-end -->

View File

@@ -0,0 +1,22 @@
# Presets >> Create your Own >> Hooks || 20
Your preset can hook into the rocket lifecycle by specifying a function for `before11ty`. This function runs before 11ty calls it's write method. If it is an async function, Rocket will await it's promise.
<!-- prettier-ignore-start -->
```js
/** @type {import('@rocket/cli').RocketPreset} */
export default ({
async before11ty() {
await copyDataFiles();
},
});
```
<!-- prettier-ignore-end -->
## Preset Interface
The full preset interface is copied below for your reference.
```ts
{% include ../../../../packages/cli/types/preset.d.ts %}
```

View File

@@ -0,0 +1,7 @@
# Presets >> Create your Own || 40
## Contents
- [Getting Started](./getting-started/)
- [Hooks](./hooks/)
- [Publishing your Preset](./publishing/)

View File

@@ -0,0 +1,60 @@
# Presets >> Create your Own >> Publishing || 100
If you would like to publish a preset to use it on multiple websites or share it with your friends you can do like so.
1. Pick a name for the package
- use the convention `rocket-preset-${name}`
- for this example we use `rocket-preset-fire-theme`.
2. Create a new folder `fire-theme`
3. Create a folder `fire-theme/preset` copy `fireTheme.js` from [above](../getting-started/) into `preset/fireTheme.js`
4. Add a 👉 `package.json`
```json copy
{
"name": "rocket-preset-fire-theme",
"version": "0.3.0",
"description": "Fire Theme for Rocket",
"license": "MIT",
"type": "module",
"exports": {
".": "./index.js",
"./preset/": "./preset/"
},
"files": ["*.js", "preset"],
"keywords": ["rocket", "preset"]
}
```
5. Add a 👉 `index.js`
```js copy
export { fireTheme } from './preset/fireTheme.js';
```
<!-- prettier-ignore-start -->
6. Add a 👉 `README.md`
~~~markdown copy
# FireTheme
This is a theme/preset for [Rocket](https://rocket.modern-web.dev/).
## Installation
```
npm i -D fire-theme
```
Add it to your 👉 `rocket.config.js`
```js
import { fireTheme } from 'fire-theme';
/** @type {import('@rocket/cli').RocketCliOptions} */
export default ({
presets: [rocketLaunch(), fireTheme()],
});
```
~~~
<!-- prettier-ignore-end -->

View File

@@ -1,7 +1,36 @@
# Presets >> Getting Started ||10 # Presets >> Getting Started || 10
Presets are ... Presets are partial rocket configs that combine any number of plugins to add specific features. Rocket is built on these presets, like `rocketLaunch`, `rocketBlog`, and `rocketSearch`
You can use a preset via the config... You can use a preset via the config by adding it to the `presets` array
You can load multiple presets. <!-- prettier-ignore-start -->
```js copy
import { rocketLaunch } from '@rocket/launch';
import { rocketBlog } from '@rocket/blog';
import { rocketSearch } from '@rocket/search';
/** @type {import('@rocket/cli').RocketCliOptions} */
export default ({
presets: [rocketLaunch(), rocketBlog(), rocketSearch()],
});
```
<!-- prettier-ignore-end -->
## Community Presets
There are a number of community-made presets available:
<!--
-- Thank you for your interest in rocket. To add your preset,
-- follow the format below. Please add your preset in alphabetical order.
-->
- [rocket-preset-code-tabs](https://www.npmjs.com/package/rocket-preset-code-tabs) - Add tab elements for code blocks
- [rocket-preset-custom-elements-manifest](https://www.npmjs.com/package/rocket-preset-custom-elements-manifest) - Documents code generation for JavaScript libraries, particularly custom elements.
- [rocket-preset-markdown-directive](https://www.npmjs.com/package/rocket-preset-markdown-directive) - Add your own custom md code block directives
- [rocket-preset-playground-elements](https://www.npmjs.com/package/rocket-preset-playground-elements) - Live code editors that run in-browser
- [rocket-preset-slide-decks](https://www.npmjs.com/package/rocket-preset-slide-decks) - Slide decks in Markdown and HTML
- [rocket-preset-webcomponents-dev](https://www.npmjs.com/package/rocket-preset-webcomponents-dev) - Live code editors that run on webcomponents.dev
> Want your plugin listed here? Please [create a PR](https://github.com/modernweb-dev/rocket/edit/main/docs/guides/presets/getting-started.md)!

View File

@@ -1 +1,6 @@
# Presets || 20 # Presets || 20
- [Getting Started](./getting-started/)
- [Overriding](./overriding/)
- [Using Templates](./using-templates/)
- [Create Your Own](./create-your-own/getting-started/)

View File

@@ -4,4 +4,23 @@ All loaded presets will be combined but you can override each file.
Take a look at `docs/_merged_includes` and override what you want to override by placing the same filename into `_includes`. Take a look at `docs/_merged_includes` and override what you want to override by placing the same filename into `_includes`.
For example, to override the css files loaded in the `<head>`,
```bash
cp docs/_merged_includes/_joiningBlocks/head/40-stylesheets.njk \
docs/_includes/_joiningBlocks/head/40-stylesheets.njk
```
then edit the file to suit your needs.
Also works for `_assets`, `_data` ... Also works for `_assets`, `_data` ...
<inline-notification type="warning">
If you don't [add `.eleventyignore`](/guides/first-pages/getting-started/#setup), you may receive error messages when running `rocket build`.
</inline-notification>
```js script
import '@rocket/launch/inline-notification/inline-notification.js';
```

View File

@@ -37,6 +37,14 @@ If you look into `docs/_merged_includes/_joiningBlocks/bottom/` you will see a f
- `190-google-analytics.njk` - `190-google-analytics.njk`
- `my-script.njk` - `my-script.njk`
<inline-notification type="tip">
File names without an order/number in front are considered with the order number `10 000` so the generally end up at the bottom. If you need something even below unordered items you can use numbers that are greater then `10 000`.
_Note: For unordered files there is no guarantee of any order._
</inline-notification>
## Controlling the order ## Controlling the order
In the html `<head>` order is usually not that important but when adding script it does. In the html `<head>` order is usually not that important but when adding script it does.
@@ -57,3 +65,7 @@ which brings the order to
## More information ## More information
For more details please see the [Joining Blocks Docs](../../docs/presets/joining-blocks.md) For more details please see the [Joining Blocks Docs](../../docs/presets/joining-blocks.md)
```js script
import '@rocket/launch/inline-notification/inline-notification.js';
```

View File

@@ -8,6 +8,7 @@
}, },
"type": "module", "type": "module",
"scripts": { "scripts": {
"analyze": "node scripts/workspaces-scripts-bin.mjs analyze",
"build": "npm run build:packages && npm run build:site", "build": "npm run build:packages && npm run build:site",
"build:packages": "node scripts/workspaces-scripts-bin.mjs build:package", "build:packages": "node scripts/workspaces-scripts-bin.mjs build:package",
"build:site": "npm run rocket:build", "build:site": "npm run rocket:build",
@@ -17,7 +18,7 @@
"debug:webkit": "web-test-runner --watch --config web-test-runner-webkit.config.mjs", "debug:webkit": "web-test-runner --watch --config web-test-runner-webkit.config.mjs",
"format": "npm run format:eslint && npm run format:prettier", "format": "npm run format:eslint && npm run format:prettier",
"format:eslint": "eslint --ext .ts,.js,.mjs,.cjs . --fix", "format:eslint": "eslint --ext .ts,.js,.mjs,.cjs . --fix",
"format:prettier": "node node_modules/prettier/bin-prettier.js \"**/*.{ts,js,mjs,cjs,md}\" \"**/package.json\" --write --ignore-path .eslintignore", "format:prettier": "node node_modules/prettier/bin-prettier.js \"**/*.{ts,js,mjs,cjs,md}\" \"**/!(expected)/package.json\" --write --ignore-path .eslintignore",
"lint": "run-p lint:*", "lint": "run-p lint:*",
"lint:eslint": "eslint --ext .ts,.js,.mjs,.cjs .", "lint:eslint": "eslint --ext .ts,.js,.mjs,.cjs .",
"lint:prettier": "node node_modules/prettier/bin-prettier.js \"**/*.{ts,js,mjs,cjs,md}\" --check --ignore-path .eslintignore", "lint:prettier": "node node_modules/prettier/bin-prettier.js \"**/*.{ts,js,mjs,cjs,md}\" --check --ignore-path .eslintignore",
@@ -45,7 +46,8 @@
}, },
"devDependencies": { "devDependencies": {
"@changesets/cli": "^2.12.0", "@changesets/cli": "^2.12.0",
"@open-wc/testing": "^2.5.32", "@custom-elements-manifest/analyzer": "^0.4.12",
"@open-wc/testing": "^3.0.0-next.1",
"@rollup/plugin-commonjs": "^17.0.0", "@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-json": "^4.1.0", "@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-typescript": "^8.1.0", "@rollup/plugin-typescript": "^8.1.0",
@@ -59,6 +61,7 @@
"@web/test-runner": "^0.12.2", "@web/test-runner": "^0.12.2",
"@web/test-runner-commands": "^0.4.0", "@web/test-runner-commands": "^0.4.0",
"@web/test-runner-playwright": "^0.8.0", "@web/test-runner-playwright": "^0.8.0",
"cem-plugin-readme": "^0.1.2",
"chai": "^4.2.0", "chai": "^4.2.0",
"concurrently": "^5.3.0", "concurrently": "^5.3.0",
"copyfiles": "^2.4.1", "copyfiles": "^2.4.1",
@@ -78,11 +81,12 @@
"puppeteer": "^9.0.0", "puppeteer": "^9.0.0",
"remark-emoji": "^2.1.0", "remark-emoji": "^2.1.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"rocket-preset-code-tabs": "^0.2.1",
"rollup": "^2.36.1", "rollup": "^2.36.1",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
"sinon": "^9.2.3", "sinon": "^9.2.3",
"ts-node": "^9.1.1", "ts-node": "^9.1.1",
"typescript": "^4.1.3" "typescript": "^4.3.2"
}, },
"eslintConfig": { "eslintConfig": {
"parser": "@typescript-eslint/parser", "parser": "@typescript-eslint/parser",

View File

@@ -1,5 +1,11 @@
# @rocket/blog # @rocket/blog
## 0.3.1
### Patch Changes
- a5661b8: Updates dependencies
## 0.3.0 ## 0.3.0
### Minor Changes ### Minor Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "@rocket/blog", "name": "@rocket/blog",
"version": "0.3.0", "version": "0.3.1",
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"
}, },
@@ -38,6 +38,6 @@
"testing" "testing"
], ],
"dependencies": { "dependencies": {
"plugins-manager": "^0.2.1" "plugins-manager": "^0.2.4"
} }
} }

View File

@@ -1,5 +1,11 @@
# @rocket/building-rollup # @rocket/building-rollup
## 0.3.1
### Patch Changes
- 60e85a1: Support `picture` tags by handling `source` tags with `srcset` attributes in the rollup asset gathering build phase.
## 0.3.0 ## 0.3.0
### Minor Changes ### Minor Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "@rocket/building-rollup", "name": "@rocket/building-rollup",
"version": "0.3.0", "version": "0.3.1",
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"
}, },
@@ -56,7 +56,7 @@
"@rollup/plugin-babel": "^5.2.2", "@rollup/plugin-babel": "^5.2.2",
"@rollup/plugin-node-resolve": "^11.0.1", "@rollup/plugin-node-resolve": "^11.0.1",
"@rollup/plugin-replace": "^2.4.2", "@rollup/plugin-replace": "^2.4.2",
"@web/rollup-plugin-html": "^1.6.0", "@web/rollup-plugin-html": "^1.8.0",
"@web/rollup-plugin-import-meta-assets": "^1.0.4", "@web/rollup-plugin-import-meta-assets": "^1.0.4",
"@web/rollup-plugin-polyfills-loader": "^1.1.0", "@web/rollup-plugin-polyfills-loader": "^1.1.0",
"browserslist": "^4.16.1", "browserslist": "^4.16.1",

View File

@@ -1,5 +1,31 @@
# check-html-links # check-html-links
## 0.2.3
### Patch Changes
- 5043429: Ignore `<a href="tel:9999">` links
- f08f926: Add missing `slash` dependency
- a0e8edf: Ignore links containing not http schema urls like `sketch://`, `vscode://`, ...
```html
<a href="sketch://add-library?url=https%3A%2F%2Fmyexample.com%2Fdesign%2Fui-kit.xml"></a>
<a href="vscode://file/c:/myProject/package.json:5:10"></a>
```
- 1949b1e: Ignore plain and html encoded mailto links
```html
<!-- source -->
<a href="mailto:address@example.com">contact</a>
<!-- html encoded -->
<a
href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#97;&#100;&#100;&#114;&#101;&#115;&#115;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;"
>contact</a
>
```
## 0.2.2 ## 0.2.2
### Patch Changes ### Patch Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "check-html-links", "name": "check-html-links",
"version": "0.2.2", "version": "0.2.3",
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"
}, },
@@ -37,7 +37,8 @@
"command-line-args": "^5.1.1", "command-line-args": "^5.1.1",
"glob": "^7.0.0", "glob": "^7.0.0",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"sax-wasm": "^2.0.0" "sax-wasm": "^2.0.0",
"slash": "^3.0.0"
}, },
"devDependencies": { "devDependencies": {
"@types/glob": "^7.0.0" "@types/glob": "^7.0.0"

View File

@@ -182,6 +182,18 @@ function getValueAndAnchor(inValue) {
}; };
} }
/**
* @param {string} url
* @returns {boolean}
*/
function isNonHttpSchema(url) {
const found = url.match(/([a-z]+):/);
if (found) {
return found.length > 0;
}
return false;
}
/** /**
* *
* @param {Link[]} links * @param {Link[]} links
@@ -207,8 +219,13 @@ async function resolveLinks(links, { htmlFilePath, rootDir, ignoreUsage }) {
if (ignoreUsage(value)) { if (ignoreUsage(value)) {
// ignore // ignore
} else if (value.includes('mailto:')) { } else if (
value.startsWith('mailto:') ||
value.startsWith('&#109;&#97;&#105;&#108;&#116;&#111;&#58;') // = "mailto:" but html encoded
) {
// ignore for now - could add a check to validate if the email address is valid // ignore for now - could add a check to validate if the email address is valid
} else if (value.startsWith('tel:')) {
// ignore for now - could add a check to validate if the phone number is valid
} else if (valueFile === '' && anchor !== '') { } else if (valueFile === '' && anchor !== '') {
addLocalFile(htmlFilePath, anchor, usageObj); addLocalFile(htmlFilePath, anchor, usageObj);
} else if (value.startsWith('//') || value.startsWith('http')) { } else if (value.startsWith('//') || value.startsWith('http')) {
@@ -219,6 +236,8 @@ async function resolveLinks(links, { htmlFilePath, rootDir, ignoreUsage }) {
addLocalFile(filePath, anchor, usageObj); addLocalFile(filePath, anchor, usageObj);
} else if (value === '' && anchor === '') { } else if (value === '' && anchor === '') {
// no need to check it // no need to check it
} else if (isNonHttpSchema(value)) {
// not a schema we handle
} else { } else {
const filePath = path.join(path.dirname(htmlFilePath), valueFile); const filePath = path.join(path.dirname(htmlFilePath), valueFile);
addLocalFile(filePath, anchor, usageObj); addLocalFile(filePath, anchor, usageObj);

View File

@@ -1 +1,3 @@
<a href="mailto:foo@bar.com"></a> <a href="mailto:foo@bar.com"></a>
<!-- encoded mailto links -->
<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#97;&#100;&#100;&#114;&#101;&#115;&#115;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;"></a>

View File

@@ -0,0 +1,2 @@
<a href="sketch://add-library?url=https%3A%2F%2Fmyexample.com%2Fdesign%2Fui-kit.xml"></a>
<a href="vscode://file/c:/myProject/package.json:5:10"></a>

View File

@@ -0,0 +1 @@
<a href="tel:99999"></a>

View File

@@ -183,6 +183,16 @@ describe('validateFolder', () => {
expect(cleanup(errors)).to.deep.equal([]); expect(cleanup(errors)).to.deep.equal([]);
}); });
it('ignores tel links', async () => {
const { errors, cleanup } = await execute('fixtures/tel');
expect(cleanup(errors)).to.deep.equal([]);
});
it('ignore not http schema urls', async () => {
const { errors, cleanup } = await execute('fixtures/not-http-schema');
expect(cleanup(errors)).to.deep.equal([]);
});
it('ignoring a folder', async () => { it('ignoring a folder', async () => {
const { errors, cleanup } = await execute('fixtures/internal-link-ignore', { const { errors, cleanup } = await execute('fixtures/internal-link-ignore', {
ignoreLinkPatterns: ['./relative/*', './relative/**/*'], ignoreLinkPatterns: ['./relative/*', './relative/**/*'],

View File

@@ -1,5 +1,106 @@
# @rocket/cli # @rocket/cli
## 0.9.8
### Patch Changes
- a5661b8: Updates dependencies
## 0.9.7
### Patch Changes
- d91e46b: Add `bootstrap` command
- 9978ea7: Improves typings for `addPlugin`
- Updated dependencies [9978ea7]
- @rocket/eleventy-plugin-mdjs-unified@0.5.1
- plugins-manager@0.2.3
## 0.9.6
### Patch Changes
- bf99541: Adjust copy logic to
1. for `_assets/_static` copy over everything
2. for all other paths copy over everything except `*.html` and `*.md`
- 579e8e7: Unordered joiningBlocks are now considered with the order number `10 000` and will generally be at the bottom.
You can use numbers `> 10 000` to place files even after unordered joiningBlocks.
## 0.9.5
### Patch Changes
- 1b9559f: Adds `before11ty` hook to config and presets
## 0.9.4
### Patch Changes
- 2b5c61d: Allow configuring the imagePreset ignore rules via the option `ignore`
```js
export default {
imagePresets: {
responsive: {
// ...
ignore: ({ src }) =>
src.endsWith('.jpeg') || src.endsWith('svg') || src.includes('rocket-unresponsive.'),
},
},
};
```
- 2b5c61d: Do not generate responsive images for files ending in `.svg` or that include `rocket-ignore.`
- ce0b00e: don't transform external images
- 3b1a0cf: Allow to configure check-html-links
```js
export default {
checkLinks: {
/* ... */
},
};
```
## 0.9.3
### Patch Changes
- 795a361: The server worker url should respect a set pathPrefix.
## 0.9.2
### Patch Changes
- 5330740: When replacing images with responsive picture tags do this from the bottom up so the initial dom parsing locations still hold true.
## 0.9.1
### Patch Changes
- 43a7ca1: Responsive images need to respect a set pathPrefix
## 0.9.0
### Minor Changes
- eae2007: Update to mdjs version that uses lit 2 and renders stories to light dom
### Patch Changes
- Updated dependencies [eae2007]
- @rocket/eleventy-plugin-mdjs-unified@0.5.0
## 0.8.2
### Patch Changes
- 60e85a1: Support `picture` tags by handling `source` tags with `srcset` attributes in the rollup asset gathering build phase.
- Updated dependencies [60e85a1]
- @rocket/building-rollup@0.3.1
## 0.8.1 ## 0.8.1
### Patch Changes ### Patch Changes

View File

@@ -1,6 +1,6 @@
{ {
"name": "@rocket/cli", "name": "@rocket/cli",
"version": "0.8.1", "version": "0.9.8",
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"
}, },
@@ -57,9 +57,9 @@
"dependencies": { "dependencies": {
"@11ty/eleventy": "^0.11.1", "@11ty/eleventy": "^0.11.1",
"@11ty/eleventy-img": "^0.9.0", "@11ty/eleventy-img": "^0.9.0",
"@rocket/building-rollup": "^0.3.0", "@rocket/building-rollup": "^0.3.1",
"@rocket/core": "^0.1.2", "@rocket/core": "^0.1.2",
"@rocket/eleventy-plugin-mdjs-unified": "^0.4.1", "@rocket/eleventy-plugin-mdjs-unified": "^0.5.1",
"@rocket/eleventy-rocket-nav": "^0.3.0", "@rocket/eleventy-rocket-nav": "^0.3.0",
"@rollup/plugin-babel": "^5.2.2", "@rollup/plugin-babel": "^5.2.2",
"@rollup/plugin-node-resolve": "^11.0.1", "@rollup/plugin-node-resolve": "^11.0.1",
@@ -67,12 +67,12 @@
"@web/dev-server": "^0.1.4", "@web/dev-server": "^0.1.4",
"@web/dev-server-rollup": "^0.3.2", "@web/dev-server-rollup": "^0.3.2",
"@web/rollup-plugin-copy": "^0.2.0", "@web/rollup-plugin-copy": "^0.2.0",
"check-html-links": "^0.2.2", "check-html-links": "^0.2.3",
"command-line-args": "^5.1.1", "command-line-args": "^5.1.1",
"command-line-usage": "^6.1.1", "command-line-usage": "^6.1.1",
"fs-extra": "^9.0.1", "fs-extra": "^9.0.1",
"micromatch": "^4.0.2", "micromatch": "^4.0.2",
"plugins-manager": "^0.2.1", "plugins-manager": "^0.2.4",
"slash": "^3.0.0", "slash": "^3.0.0",
"utf8": "^3.0.0", "utf8": "^3.0.0",
"workbox-window": "^6.1.5" "workbox-window": "^6.1.5"

View File

@@ -1,5 +1,7 @@
{% set rocketServiceWorkerUrl = '/' + rocketConfig.serviceWorkerName %}
<script> <script>
window.__rocketServiceWorkerUrl = '/{{ rocketConfig.serviceWorkerName }}'; window.__rocketServiceWorkerUrl = '{{ rocketServiceWorkerUrl | url }}';
</script> </script>
<script type="module" inject-service-worker="" src="{{ '/_assets/scripts/registerServiceWorker.js' | asset | url }}"></script> <script type="module" inject-service-worker="" src="{{ '/_assets/scripts/registerServiceWorker.js' | asset | url }}"></script>

View File

@@ -11,7 +11,7 @@
} }
</style> </style>
<script type="module"> <script type="module">
import { render } from 'lit-html'; import { render } from '@mdjs/mdjs-story';
async function onHashChange() { async function onHashChange() {
const urlParts = new URLSearchParams(document.location.hash.substr(1)); const urlParts = new URLSearchParams(document.location.hash.substr(1));

View File

@@ -29,7 +29,7 @@ async function productionBuild(config) {
name: 'copy', name: 'copy',
plugin: copy, plugin: copy,
options: { options: {
patterns: ['!(*.md|*.html)*', '_merged_assets/_static/**/*.{png,gif,jpg,json,css,svg,ico}'], patterns: ['!(*.md|*.html)*', '_merged_assets/_static/**/*'],
rootDir: config.outputDevDir, rootDir: config.outputDevDir,
}, },
}), }),

View File

@@ -19,6 +19,10 @@ const { setComputedConfig } = computedConfigPkg;
const __dirname = path.dirname(fileURLToPath(import.meta.url)); const __dirname = path.dirname(fileURLToPath(import.meta.url));
export class RocketEleventy extends Eleventy { export class RocketEleventy extends Eleventy {
/** @type{Required<import('../types/main').RocketCliOptions>} */
// @ts-expect-error: awkward to type this in jsdoc
config;
/** /**
* @param {string} input * @param {string} input
* @param {string} output * @param {string} output
@@ -26,11 +30,14 @@ export class RocketEleventy extends Eleventy {
*/ */
constructor(input, output, cli) { constructor(input, output, cli) {
super(input, output); super(input, output);
/** @type {*} */
this.eleventyFiles;
this.__rocketCli = cli; this.__rocketCli = cli;
} }
async write() { async write() {
await this.__rocketCli.mergePresets(); await this.__rocketCli.mergePresets();
for (const fn of this.__rocketCli.config.__before11tyFunctions) await fn();
await super.write(); await super.write();
await this.__rocketCli.update(); await this.__rocketCli.update();
} }
@@ -45,7 +52,10 @@ export class RocketEleventy extends Eleventy {
path.join(this.__rocketCli.config._inputDirCwdRelative, '_includes', '**'), path.join(this.__rocketCli.config._inputDirCwdRelative, '_includes', '**'),
]; ];
ignores = ignores.filter(ignore => !keepWatching.includes(ignore)); ignores = ignores.filter(
/** @param {string} ignore */
ignore => !keepWatching.includes(ignore),
);
// debug("Ignoring watcher changes to: %o", ignores); // debug("Ignoring watcher changes to: %o", ignores);
let configOptions = this.config.chokidarConfig; let configOptions = this.config.chokidarConfig;
@@ -69,6 +79,10 @@ export class RocketCli {
/** @type {string[]} */ /** @type {string[]} */
errors = []; errors = [];
/** @type{Required<import('../types/main').RocketCliOptions>} */
// @ts-expect-error: awkward to type this in jsdoc
config;
constructor({ argv } = { argv: undefined }) { constructor({ argv } = { argv: undefined }) {
const mainDefinitions = [ const mainDefinitions = [
{ name: 'command', defaultOption: true, defaultValue: 'help' }, { name: 'command', defaultOption: true, defaultValue: 'help' },
@@ -106,7 +120,8 @@ export class RocketCli {
const config = new TemplateConfig(null, relCwdPathToConfig); const config = new TemplateConfig(null, relCwdPathToConfig);
elev.config = config.getConfig(); elev.config = config.getConfig();
elev.resetConfig(); /** @type {*} */
(elev).resetConfig();
elev.setConfigPathOverride(relCwdPathToConfig); elev.setConfigPathOverride(relCwdPathToConfig);
elev.isVerbose = false; elev.isVerbose = false;
@@ -120,7 +135,7 @@ export class RocketCli {
for (const folder of ['_assets', '_data', '_includes']) { for (const folder of ['_assets', '_data', '_includes']) {
const to = path.join(this.config._inputDirCwdRelative, `_merged${folder}`); const to = path.join(this.config._inputDirCwdRelative, `_merged${folder}`);
await fs.emptyDir(to); await fs.emptyDir(to);
for (const sourceDir of this.config._presetPathes) { for (const sourceDir of this.config._presetPaths) {
const from = path.join(sourceDir, folder); const from = path.join(sourceDir, folder);
if (fs.existsSync(from)) { if (fs.existsSync(from)) {
if (folder === '_includes') { if (folder === '_includes') {
@@ -138,7 +153,9 @@ export class RocketCli {
*/ */
async setup() { async setup() {
if (this.__isSetup === false) { if (this.__isSetup === false) {
this.config = await normalizeConfig(this.argvConfig); this.config =
/** @type{Required<import('../types/main').RocketCliOptions>} */
(await normalizeConfig(this.argvConfig));
setComputedConfig(this.config); setComputedConfig(this.config);
this.__isSetup = true; this.__isSetup = true;
} }
@@ -147,6 +164,10 @@ export class RocketCli {
async run() { async run() {
await this.setup(); await this.setup();
if (this.config.command === 'bootstrap') {
return this.bootstrap();
}
for (const plugin of this.config.plugins) { for (const plugin of this.config.plugins) {
if (this.considerPlugin(plugin) && typeof plugin.setupCommand === 'function') { if (this.considerPlugin(plugin) && typeof plugin.setupCommand === 'function') {
this.config = plugin.setupCommand(this.config); this.config = plugin.setupCommand(this.config);
@@ -187,6 +208,45 @@ export class RocketCli {
} }
} }
async bootstrap() {
const outputDir = path.join(this.config.outputDir, '..');
const moduleDir = path.dirname(fileURLToPath(import.meta.url));
const bootstrapFilesDir = path.join(moduleDir, 'public', 'bootstrap');
const packageJsonPath = path.join(outputDir, 'package.json');
const gitignorePath = path.join(outputDir, '.gitignore');
if (!(await fs.pathExists(packageJsonPath))) {
await fs.writeJson(packageJsonPath, {});
}
await fs.copy(bootstrapFilesDir, outputDir, {
errorOnExist: true,
filter: file => !file.endsWith('_gitignore'),
});
const packageJson = await fs.readJson(packageJsonPath);
await fs.writeJson(
packageJsonPath,
{
...packageJson,
type: 'module',
scripts: {
...packageJson.scripts,
start: 'rocket start',
docs: 'rocket build',
},
},
{ spaces: 2 },
);
await fs.ensureFile(gitignorePath);
await fs.appendFile(
gitignorePath,
await fs.readFile(path.join(bootstrapFilesDir, '_gitignore'), 'utf8'),
);
}
/** /**
* @param {RocketPlugin} plugin * @param {RocketPlugin} plugin
*/ */

View File

@@ -50,6 +50,7 @@ export class RocketLint {
const checkLinks = new CheckHtmlLinksCli(); const checkLinks = new CheckHtmlLinksCli();
checkLinks.setOptions({ checkLinks.setOptions({
...this.config.checkLinks,
rootDir: this.config.lintInputDir, rootDir: this.config.lintInputDir,
printOnError: false, printOnError: false,
continueOnError: true, continueOnError: true,

View File

@@ -2,6 +2,7 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const EleventyImage = require('@11ty/eleventy-img'); const EleventyImage = require('@11ty/eleventy-img');
const urlFilter = require('@11ty/eleventy/src/Filters/Url.js');
const { SaxEventType, SAXParser } = require('sax-wasm'); const { SaxEventType, SAXParser } = require('sax-wasm');
const { getComputedConfig } = require('../public/computedConfig.cjs'); const { getComputedConfig } = require('../public/computedConfig.cjs');
@@ -82,10 +83,20 @@ function getAttributes(data) {
// return classString ? classString.split(' ') : []; // return classString ? classString.split(' ') : [];
// } // }
/**
*
* @param src {string} image src attribute value.
* @returns {boolean} true if src starts with https://, http:// or //
*/
function isExternalSrc(src) {
return /^(?:https?:)?\/\//.test(src);
}
/** /**
* @param {string} html * @param {string} html
*/ */
function getImages(html) { function getImages(html, { imagePresets }) {
/** @type {Heading[]} */ /** @type {Heading[]} */
const images = []; const images = [];
parser.eventHandler = (ev, _data) => { parser.eventHandler = (ev, _data) => {
@@ -99,16 +110,26 @@ function getImages(html) {
const src = getAttribute(data, 'src'); const src = getAttribute(data, 'src');
const title = getAttribute(data, 'title'); const title = getAttribute(data, 'title');
const alt = getAttribute(data, 'alt'); const alt = getAttribute(data, 'alt');
if (presetName) { if (presetName) {
images.push({ const presetSettings = imagePresets[presetName];
presetName, if (!presetSettings) {
attributes, throw new Error(`Could not find imagePresets: { ${presetName}: {} }`);
src, }
title, const { ignore } = presetSettings;
alt, const ignoreFn = typeof ignore === 'function' ? ignore : () => false;
openStart,
closeEnd, if (!isExternalSrc(src) && !ignoreFn({ src, title, alt, attributes })) {
}); images.push({
presetName,
attributes,
src,
title,
alt,
openStart,
closeEnd,
});
}
} }
} }
} }
@@ -140,7 +161,7 @@ async function responsiveImages(images, { inputPath, outputDir, imagePresets = {
const metadata = await EleventyImage(filePath, { const metadata = await EleventyImage(filePath, {
outputDir: path.join(outputDir, 'images'), outputDir: path.join(outputDir, 'images'),
urlPath: '/images/', urlPath: urlFilter('/images/'),
...presetSettings, ...presetSettings,
}); });
const lowsrc = metadata.jpeg[0]; const lowsrc = metadata.jpeg[0];
@@ -194,7 +215,7 @@ async function responsiveImages(images, { inputPath, outputDir, imagePresets = {
function updateHtml(html, changes) { function updateHtml(html, changes) {
let newHtml = html; let newHtml = html;
for (const change of changes) { for (const change of changes.reverse()) {
newHtml = replaceBetween({ newHtml = replaceBetween({
html: newHtml, html: newHtml,
start: change.openStart, start: change.openStart,
@@ -231,7 +252,7 @@ async function insertResponsiveImages(html) {
imagePresets: config.imagePresets, imagePresets: config.imagePresets,
}; };
let images = getImages(html); let images = getImages(html, options);
images = resolveFilePath(images, options); images = resolveFilePath(images, options);
images = await responsiveImages(images, options); images = await responsiveImages(images, options);
const newHtml = updateHtml(html, images); const newHtml = updateHtml(html, images);

View File

@@ -1,6 +1,10 @@
const rocketCopy = { const rocketCopy = {
configFunction: (eleventyConfig, { _inputDirCwdRelative, filesExtensionsToCopy }) => { configFunction: (eleventyConfig, { _inputDirCwdRelative }) => {
eleventyConfig.addPassthroughCopy(`${_inputDirCwdRelative}/**/*.{${filesExtensionsToCopy}}`); eleventyConfig.addPassthroughCopy(`${_inputDirCwdRelative}/!(*.md|*.html)*`);
eleventyConfig.addPassthroughCopy(
`${_inputDirCwdRelative}/!(_includes|_data|_assets|_merged_data|_merged_includes)*/**/!(*.md|*.html)*`,
);
eleventyConfig.addPassthroughCopy(`${_inputDirCwdRelative}/_merged_assets/_static/**/*`);
}, },
}; };

View File

@@ -5,6 +5,7 @@
/** @typedef {import('@web/dev-server').DevServerConfig} DevServerConfig */ /** @typedef {import('@web/dev-server').DevServerConfig} DevServerConfig */
/** @typedef {import('../types/main').RocketCliOptions} RocketCliOptions */ /** @typedef {import('../types/main').RocketCliOptions} RocketCliOptions */
/** @typedef {import('../types/main').ImagePreset} ImagePreset */
/** @typedef {import('../types/main').RocketPlugin} RocketPlugin */ /** @typedef {import('../types/main').RocketPlugin} RocketPlugin */
import path from 'path'; import path from 'path';
@@ -19,9 +20,25 @@ import { fileURLToPath } from 'url';
const __dirname = path.dirname(fileURLToPath(import.meta.url)); const __dirname = path.dirname(fileURLToPath(import.meta.url));
/**
* The default responsive ignore function will ignore files
* - ending in `.svg`
* - containing `rocket-unresponsive.`
*
* @param {object} opts
* @param {string} opts.src
* @param {string} opts.title
* @param {string} opts.alt
* @param {{name: string, value: string}[]} opts.attributes
* @returns {boolean}
*/
function ignore({ src }) {
return src.endsWith('svg') || src.includes('rocket-unresponsive.');
}
/** /**
* @param {Partial<RocketCliOptions>} inConfig * @param {Partial<RocketCliOptions>} inConfig
* @returns {Promise<RocketCliOptions>} * @returns {Promise<RocketCliOptions & { __before11tyFunctions: RocketCliOptions['before11ty'][] }>}
*/ */
export async function normalizeConfig(inConfig) { export async function normalizeConfig(inConfig) {
let config = { let config = {
@@ -45,11 +62,17 @@ export async function normalizeConfig(inConfig) {
devServer: {}, devServer: {},
...inConfig, ...inConfig,
/** @type{RocketCliOptions['before11ty'][]} */
__before11tyFunctions: [],
/** @type{{[key: string]: ImagePreset}} */
imagePresets: { imagePresets: {
responsive: { responsive: {
widths: [600, 900, 1640], widths: [600, 900, 1640],
formats: ['avif', 'jpeg'], formats: ['avif', 'jpeg'],
sizes: '100vw', sizes: '100vw',
ignore,
}, },
}, },
}; };
@@ -104,9 +127,9 @@ export async function normalizeConfig(inConfig) {
const _inputDirCwdRelative = path.join(_configDirCwdRelative, config.inputDir); const _inputDirCwdRelative = path.join(_configDirCwdRelative, config.inputDir);
// cli core preset is always first // cli core preset is always first
config._presetPathes = [path.join(__dirname, '..', 'preset')]; config._presetPaths = [path.join(__dirname, '..', 'preset')];
for (const preset of config.presets) { for (const preset of config.presets) {
config._presetPathes.push(preset.path); config._presetPaths.push(preset.path);
if (preset.adjustImagePresets) { if (preset.adjustImagePresets) {
config.imagePresets = preset.adjustImagePresets(config.imagePresets); config.imagePresets = preset.adjustImagePresets(config.imagePresets);
@@ -142,9 +165,13 @@ export async function normalizeConfig(inConfig) {
if (preset.setupCliPlugins) { if (preset.setupCliPlugins) {
config.setupCliPlugins = [...config.setupCliPlugins, ...preset.setupCliPlugins]; config.setupCliPlugins = [...config.setupCliPlugins, ...preset.setupCliPlugins];
} }
if (typeof preset.before11ty === 'function') {
config.__before11tyFunctions.push(preset.before11ty);
}
} }
// add "local" preset // add "local" preset
config._presetPathes.push(path.resolve(_inputDirCwdRelative)); config._presetPaths.push(path.resolve(_inputDirCwdRelative));
/** @type {MetaPlugin[]} */ /** @type {MetaPlugin[]} */
let pluginsMeta = [ let pluginsMeta = [
@@ -169,6 +196,10 @@ export async function normalizeConfig(inConfig) {
plugins.push(pluginInst); plugins.push(pluginInst);
} }
if (typeof config.before11ty === 'function') {
config.__before11tyFunctions.push(config.before11ty);
}
// TODO: check pathPrefix to NOT have a '/' at the end as it will mean it may get ignored by 11ty 🤷‍♂️ // TODO: check pathPrefix to NOT have a '/' at the end as it will mean it may get ignored by 11ty 🤷‍♂️
return { return {

View File

@@ -0,0 +1,6 @@
node_modules
## Rocket ignore files (need to be the full relative path to the folders)
docs/_merged_data/
docs/_merged_assets/
docs/_merged_includes/

View File

@@ -0,0 +1,3 @@
_assets
_includes
_data

View File

@@ -0,0 +1,3 @@
# Welcome to Your Rocket Site
Add your markdown content here.

View File

@@ -0,0 +1,5 @@
import { rocketLaunch } from '@rocket/launch';
export default {
presets: [rocketLaunch()],
};

View File

@@ -106,7 +106,7 @@ function socialMediaImagePlugin(args = {}) {
}; };
} }
function sortyByOrder(a, b) { function sortByOrder(a, b) {
if (a.order > b.order) { if (a.order > b.order) {
return 1; return 1;
} }
@@ -127,20 +127,20 @@ async function dirToTree(sourcePath, extra = '') {
if (entry.isDirectory()) { if (entry.isDirectory()) {
const value = await dirToTree(sourcePath, relativePath); const value = await dirToTree(sourcePath, relativePath);
unsortedEntries.push({ unsortedEntries.push({
order: matches && matches.length > 0 ? parseInt(matches[1]) : 0, order: matches && matches.length > 0 ? parseInt(matches[1]) : 10000,
name: entry.name, name: entry.name,
value, value,
}); });
} else { } else {
unsortedEntries.push({ unsortedEntries.push({
order: matches && matches.length > 0 ? parseInt(matches[1]) : 0, order: matches && matches.length > 0 ? parseInt(matches[1]) : 10000,
name: entry.name, name: entry.name,
value: relativePath, value: relativePath,
}); });
} }
} }
const sortedTree = {}; const sortedTree = {};
for (const unsortedEntry of unsortedEntries.sort(sortyByOrder)) { for (const unsortedEntry of unsortedEntries.sort(sortByOrder)) {
sortedTree[unsortedEntry.name] = unsortedEntry.value; sortedTree[unsortedEntry.name] = unsortedEntry.value;
} }
return sortedTree; return sortedTree;

View File

@@ -30,10 +30,7 @@ module.exports = function (eleventyConfig) {
{ {
name: 'rocket-copy', name: 'rocket-copy',
plugin: rocketCopy, plugin: rocketCopy,
options: { options: { _inputDirCwdRelative },
_inputDirCwdRelative,
filesExtensionsToCopy: 'png,gif,jpg,jpeg,svg,css,xml,json,js',
},
}, },
{ {
name: 'eleventy-plugin-mdjs-unified', name: 'eleventy-plugin-mdjs-unified',

View File

@@ -1,6 +1,7 @@
import chai from 'chai'; import chai from 'chai';
import { RocketCli } from '../src/RocketCli.js'; import { RocketCli } from '../src/RocketCli.js';
import path from 'path'; import path from 'path';
import globby from 'globby';
import fs from 'fs-extra'; import fs from 'fs-extra';
import prettier from 'prettier'; import prettier from 'prettier';
import { fileURLToPath } from 'url'; import { fileURLToPath } from 'url';
@@ -19,6 +20,7 @@ export function setFixtureDir(importMetaUrl) {
* @property {boolean} stripStartEndWhitespace * @property {boolean} stripStartEndWhitespace
* @property {boolean} stripScripts * @property {boolean} stripScripts
* @property {boolean} formatHtml * @property {boolean} formatHtml
* @property {boolean} replaceImageHashes
* @property {start|build} type * @property {start|build} type
*/ */
@@ -51,13 +53,20 @@ export async function readOutput(
stripScripts = false, stripScripts = false,
formatHtml = false, formatHtml = false,
type = 'build', type = 'build',
replaceImageHashes = false,
} = {}, } = {},
) { ) {
if (!cli || !cli.config) { if (!cli || !cli.config) {
throw new Error(`No valid cli provided to readOutput - you passed a ${typeof cli}: ${cli}`); throw new Error(`No valid cli provided to readOutput - you passed a ${typeof cli}: ${cli}`);
} }
const outputDir = type === 'build' ? cli.config.outputDir : cli.config.outputDevDir; const outputDir =
type === 'bootstrap'
? path.join(cli.config.outputDir, '..')
: type === 'build'
? cli.config.outputDir
: cli.config.outputDevDir;
let text = await fs.promises.readFile(path.join(outputDir, fileName)); let text = await fs.promises.readFile(path.join(outputDir, fileName));
text = text.toString(); text = text.toString();
if (stripToBody) { if (stripToBody) {
@@ -70,6 +79,9 @@ export async function readOutput(
const scriptCloseTagStart = text.indexOf('</script>', scriptOpenTagEnd) + 9; const scriptCloseTagStart = text.indexOf('</script>', scriptOpenTagEnd) + 9;
text = text.substring(0, scriptOpenTagEnd) + text.substring(scriptCloseTagStart); text = text.substring(0, scriptOpenTagEnd) + text.substring(scriptCloseTagStart);
} }
if (replaceImageHashes) {
text = text.replace(/\/images\/([a-z0-9]+)-/g, '/images/__HASH__-');
}
if (formatHtml) { if (formatHtml) {
text = prettier.format(text, { parser: 'html', printWidth: 100 }); text = prettier.format(text, { parser: 'html', printWidth: 100 });
} }
@@ -109,6 +121,12 @@ export async function readBuildOutput(cli, fileName, options = {}) {
return readOutput(cli, fileName, options); return readOutput(cli, fileName, options);
} }
export async function getfixtureExpectedFiles(pathToDir) {
const cwd = path.join(fixtureDir, pathToDir);
const paths = await globby('**/*', { cwd, absolute: true, dot: true });
return paths;
}
export async function execute(cli, configFileDir) { export async function execute(cli, configFileDir) {
await cli.setup(); await cli.setup();
cli.config.outputDevDir = path.join(configFileDir, '__output-dev'); cli.config.outputDevDir = path.join(configFileDir, '__output-dev');
@@ -120,6 +138,14 @@ export async function execute(cli, configFileDir) {
return cli; return cli;
} }
export async function executeBootstrap(pathToDir) {
const configFileDir = path.join(fixtureDir, pathToDir.split('/').join(path.sep));
const cli = new RocketCli({ argv: ['bootstrap'] });
await fs.emptyDir(configFileDir);
await execute(cli, configFileDir);
return cli;
}
export async function executeStart(pathToConfig) { export async function executeStart(pathToConfig) {
const configFile = path.join(fixtureDir, pathToConfig.split('/').join(path.sep)); const configFile = path.join(fixtureDir, pathToConfig.split('/').join(path.sep));
const cli = new RocketCli({ const cli = new RocketCli({

View File

@@ -2,14 +2,17 @@ import chai from 'chai';
import fetch from 'node-fetch'; import fetch from 'node-fetch';
import chalk from 'chalk'; import chalk from 'chalk';
import { import {
executeBootstrap,
executeBuild, executeBuild,
executeLint, executeLint,
executeStart, executeStart,
expectThrowsAsync, expectThrowsAsync,
readBuildOutput, readBuildOutput,
readStartOutput, readStartOutput,
getfixtureExpectedFiles,
setFixtureDir, setFixtureDir,
} from '@rocket/cli/test-helpers'; } from '@rocket/cli/test-helpers';
import fs from 'fs-extra';
const { expect } = chai; const { expect } = chai;
@@ -31,7 +34,22 @@ describe('RocketCli e2e', () => {
it('can add a unified plugin via the config', async () => { it('can add a unified plugin via the config', async () => {
cli = await executeStart('e2e-fixtures/unified-plugin/rocket.config.js'); cli = await executeStart('e2e-fixtures/unified-plugin/rocket.config.js');
const indexHtml = await readStartOutput(cli, 'index.html'); const indexHtml = await readStartOutput(cli, 'index.html');
expect(indexHtml).to.equal('<p>See a 🐶</p>'); expect(indexHtml).to.equal(`<p>See a 🐶</p>`);
});
describe('bootstrap command', () => {
it('can bootstrap a project', async () => {
cli = await executeBootstrap('e2e-fixtures/bootstrap/__output');
for (const p of await getfixtureExpectedFiles('e2e-fixtures/bootstrap/expected')) {
const actual = await fs.readFile(
p.replace('expected', '__output').replace('_gitignore', '.gitignore'),
'utf8',
);
const expected = await fs.readFile(p, 'utf8');
expect(actual, p).to.equal(expected);
}
});
}); });
describe('eleventy in config', () => { describe('eleventy in config', () => {
@@ -102,6 +120,30 @@ describe('RocketCli e2e', () => {
); );
const assetHtml = await readStartOutput(cli, 'use-assets/index.html'); const assetHtml = await readStartOutput(cli, 'use-assets/index.html');
expect(assetHtml).to.equal('<link rel="stylesheet" href="/_merged_assets/some.css">'); expect(assetHtml).to.equal('<link rel="stylesheet" href="/_merged_assets/some.css">');
const imageHtml = await readStartOutput(cli, 'image/index.html', { replaceImageHashes: true });
expect(imageHtml).to.equal(
[
'<p>',
' <figure>',
' <picture>',
'<source type="image/avif" srcset="/images/__HASH__-600.avif 600w, /images/__HASH__-900.avif 900w" sizes="100vw">',
'<source type="image/jpeg" srcset="/images/__HASH__-600.jpeg 600w, /images/__HASH__-900.jpeg 900w" sizes="100vw">',
' <img',
' alt="My Image Alternative Text" rocket-image="responsive"',
' src="/images/__HASH__-600.jpeg"',
' ',
' ',
' width="600"',
' height="316"',
' loading="lazy"',
' decoding="async"',
' />',
' </picture>',
' <figcaption>My Image Description</figcaption>',
'</figure>',
' </p>',
].join('\n'),
);
}); });
it('can add a pathPrefix that will be used in the build command', async () => { it('can add a pathPrefix that will be used in the build command', async () => {
@@ -119,6 +161,26 @@ describe('RocketCli e2e', () => {
expect(assetHtml).to.equal( expect(assetHtml).to.equal(
'<html><head><link rel="stylesheet" href="../41297ffa.css">\n\n</head><body>\n\n</body></html>', '<html><head><link rel="stylesheet" href="../41297ffa.css">\n\n</head><body>\n\n</body></html>',
); );
let imageHtml = await readBuildOutput(cli, 'image/index.html');
imageHtml = imageHtml.replace(/\.\.\/([a-z0-9]+)\./g, '../__HASH__.');
expect(imageHtml).to.equal(
[
'<html><head>',
'</head><body><p>',
' </p><figure>',
' <picture>',
'<source type="image/avif" srcset="../__HASH__.avif 600w, ../__HASH__.avif 900w" sizes="100vw">',
'<source type="image/jpeg" srcset="../__HASH__.jpeg 600w, ../__HASH__.jpeg 900w" sizes="100vw">',
' <img alt="My Image Alternative Text" rocket-image="responsive" src="../__HASH__.jpeg" width="600" height="316" loading="lazy" decoding="async">',
' </picture>',
' <figcaption>My Image Description</figcaption>',
'</figure>',
' <p></p>',
'',
'',
'</body></html>',
].join('\n'),
);
}); });
it('smoke test for link checking', async () => { it('smoke test for link checking', async () => {

View File

@@ -22,7 +22,10 @@ describe('RocketCli images', () => {
describe('Images', () => { describe('Images', () => {
it('does render content images responsive', async () => { it('does render content images responsive', async () => {
cli = await executeStart('e2e-fixtures/images/rocket.config.js'); cli = await executeStart('e2e-fixtures/images/rocket.config.js');
const indexHtml = await readStartOutput(cli, 'index.html', { formatHtml: true }); const indexHtml = await readStartOutput(cli, 'index.html', {
formatHtml: true,
replaceImageHashes: true,
});
expect(indexHtml).to.equal( expect(indexHtml).to.equal(
[ [
'<p>', '<p>',
@@ -30,18 +33,18 @@ describe('RocketCli images', () => {
' <picture>', ' <picture>',
' <source', ' <source',
' type="image/avif"', ' type="image/avif"',
' srcset="/images/d67643ad-600.avif 600w, /images/d67643ad-900.avif 900w"', ' srcset="/images/__HASH__-600.avif 600w, /images/__HASH__-900.avif 900w"',
' sizes="100vw"', ' sizes="100vw"',
' />', ' />',
' <source', ' <source',
' type="image/jpeg"', ' type="image/jpeg"',
' srcset="/images/d67643ad-600.jpeg 600w, /images/d67643ad-900.jpeg 900w"', ' srcset="/images/__HASH__-600.jpeg 600w, /images/__HASH__-900.jpeg 900w"',
' sizes="100vw"', ' sizes="100vw"',
' />', ' />',
' <img', ' <img',
' alt="My Image Alternative Text"', ' alt="My Image Alternative Text"',
' rocket-image="responsive"', ' rocket-image="responsive"',
' src="/images/d67643ad-600.jpeg"', ' src="/images/__HASH__-600.jpeg"',
' width="600"', ' width="600"',
' height="316"', ' height="316"',
' loading="lazy"', ' loading="lazy"',
@@ -53,51 +56,134 @@ describe('RocketCli images', () => {
'</p>', '</p>',
].join('\n'), ].join('\n'),
); );
});
it('renders multiple images in the correct order', async () => { const keepSvgHtml = await readStartOutput(cli, 'ignores/index.html', {
cli = await executeStart('e2e-fixtures/images/rocket.config.js'); formatHtml: true,
const indexHtml = await readStartOutput(cli, 'two-images/index.html', { formatHtml: true }); replaceImageHashes: true,
expect(indexHtml).to.equal( });
// ignores src="[...].svg" and src="[...]rocket-unresponsive.[...]"
expect(keepSvgHtml).to.equal(
[ [
'<p>Ignore SVG</p>',
'<p><img src="../_assets/logo.svg" alt="Logo stays svg" rocket-image="responsive" /></p>',
'<p>Ignore if contains <code>rocket-unresponsive.</code></p>',
'<p>',
' <img',
' src="../_assets/my-image.rocket-unresponsive.jpg"',
' alt="Logo stays svg"',
' rocket-image="responsive"',
' />',
'</p>',
'<p>Responsive</p>',
'<p>', '<p>',
' <picture>', ' <picture>',
' <source', ' <source',
' type="image/avif"', ' type="image/avif"',
' srcset="/images/d67643ad-600.avif 600w, /images/d67643ad-900.avif 900w"', ' srcset="/images/__HASH__-600.avif 600w, /images/__HASH__-900.avif 900w"',
' sizes="100vw"', ' sizes="100vw"',
' />', ' />',
' <source', ' <source',
' type="image/jpeg"', ' type="image/jpeg"',
' srcset="/images/d67643ad-600.jpeg 600w, /images/d67643ad-900.jpeg 900w"', ' srcset="/images/__HASH__-600.jpeg 600w, /images/__HASH__-900.jpeg 900w"',
' sizes="100vw"', ' sizes="100vw"',
' />', ' />',
' <img', ' <img',
' alt="one"', ' alt="My Image Alternative Text"',
' rocket-image="responsive"', ' rocket-image="responsive"',
' src="/images/d67643ad-600.jpeg"', ' src="/images/__HASH__-600.jpeg"',
' width="600"', ' width="600"',
' height="316"', ' height="316"',
' loading="lazy"', ' loading="lazy"',
' decoding="async"', ' decoding="async"',
' />', ' />',
' </picture>', ' </picture>',
'', '</p>',
].join('\n'),
);
});
it('can configure more patterns to ignore', async () => {
cli = await executeStart('e2e-fixtures/images/ignore-more.rocket.config.js');
const keepSvgHtml = await readStartOutput(cli, 'ignores/index.html', {
formatHtml: true,
replaceImageHashes: true,
});
// ignores src="[...].svg" and src="[...]rocket-unresponsive.[...]"
expect(keepSvgHtml).to.equal(
[
'<p>Ignore SVG</p>',
'<p><img src="../_assets/logo.svg" alt="Logo stays svg" rocket-image="responsive" /></p>',
'<p>Ignore if contains <code>rocket-unresponsive.</code></p>',
'<p>',
' <img',
' src="../_assets/my-image.rocket-unresponsive.jpg"',
' alt="Logo stays svg"',
' rocket-image="responsive"',
' />',
'</p>',
'<p>Responsive</p>',
'<p>',
' <img src="../_assets/my-image.jpeg" alt="My Image Alternative Text" rocket-image="responsive" />',
'</p>',
].join('\n'),
);
});
it('renders multiple images in the correct order', async () => {
cli = await executeStart('e2e-fixtures/images/rocket.config.js');
const indexHtml = await readStartOutput(cli, 'two-images/index.html', {
formatHtml: true,
replaceImageHashes: true,
});
expect(indexHtml).to.equal(
[
'<h2 id="one">',
' <a aria-hidden="true" tabindex="-1" href="#one"><span class="icon icon-link"></span></a>one',
'</h2>',
'<p>',
' <picture>', ' <picture>',
' <source', ' <source',
' type="image/avif"', ' type="image/avif"',
' srcset="/images/d67643ad-600.avif 600w, /images/d67643ad-900.avif 900w"', ' srcset="/images/__HASH__-600.avif 600w, /images/__HASH__-900.avif 900w"',
' sizes="100vw"', ' sizes="100vw"',
' />', ' />',
' <source', ' <source',
' type="image/jpeg"', ' type="image/jpeg"',
' srcset="/images/d67643ad-600.jpeg 600w, /images/d67643ad-900.jpeg 900w"', ' srcset="/images/__HASH__-600.jpeg 600w, /images/__HASH__-900.jpeg 900w"',
' sizes="100vw"',
' />',
' <img',
' alt="one"',
' rocket-image="responsive"',
' src="/images/__HASH__-600.jpeg"',
' width="600"',
' height="316"',
' loading="lazy"',
' decoding="async"',
' />',
' </picture>',
'</p>',
'<h2 id="two">',
' <a aria-hidden="true" tabindex="-1" href="#two"><span class="icon icon-link"></span></a>two',
'</h2>',
'<p>',
' <picture>',
' <source',
' type="image/avif"',
' srcset="/images/__HASH__-600.avif 600w, /images/__HASH__-900.avif 900w"',
' sizes="100vw"',
' />',
' <source',
' type="image/jpeg"',
' srcset="/images/__HASH__-600.jpeg 600w, /images/__HASH__-900.jpeg 900w"',
' sizes="100vw"', ' sizes="100vw"',
' />', ' />',
' <img', ' <img',
' alt="two"', ' alt="two"',
' rocket-image="responsive"', ' rocket-image="responsive"',
' src="/images/d67643ad-600.jpeg"', ' src="/images/__HASH__-600.jpeg"',
' width="600"', ' width="600"',
' height="316"', ' height="316"',
' loading="lazy"', ' loading="lazy"',
@@ -111,7 +197,10 @@ describe('RocketCli images', () => {
it('can configure those responsive images', async () => { it('can configure those responsive images', async () => {
cli = await executeStart('e2e-fixtures/images/small.rocket.config.js'); cli = await executeStart('e2e-fixtures/images/small.rocket.config.js');
const indexHtml = await readStartOutput(cli, 'index.html', { formatHtml: true }); const indexHtml = await readStartOutput(cli, 'index.html', {
formatHtml: true,
replaceImageHashes: true,
});
expect(indexHtml).to.equal( expect(indexHtml).to.equal(
[ [
'<p>', '<p>',
@@ -119,18 +208,18 @@ describe('RocketCli images', () => {
' <picture>', ' <picture>',
' <source', ' <source',
' type="image/avif"', ' type="image/avif"',
' srcset="/images/d67643ad-30.avif 30w, /images/d67643ad-60.avif 60w"', ' srcset="/images/__HASH__-30.avif 30w, /images/__HASH__-60.avif 60w"',
' sizes="(min-width: 1024px) 30px, 60px"', ' sizes="(min-width: 1024px) 30px, 60px"',
' />', ' />',
' <source', ' <source',
' type="image/jpeg"', ' type="image/jpeg"',
' srcset="/images/d67643ad-30.jpeg 30w, /images/d67643ad-60.jpeg 60w"', ' srcset="/images/__HASH__-30.jpeg 30w, /images/__HASH__-60.jpeg 60w"',
' sizes="(min-width: 1024px) 30px, 60px"', ' sizes="(min-width: 1024px) 30px, 60px"',
' />', ' />',
' <img', ' <img',
' alt="My Image Alternative Text"', ' alt="My Image Alternative Text"',
' rocket-image="responsive"', ' rocket-image="responsive"',
' src="/images/d67643ad-30.jpeg"', ' src="/images/__HASH__-30.jpeg"',
' width="30"', ' width="30"',
' height="15"', ' height="15"',
' loading="lazy"', ' loading="lazy"',
@@ -146,25 +235,28 @@ describe('RocketCli images', () => {
it('will only render a figure & figcaption if there is a caption/title', async () => { it('will only render a figure & figcaption if there is a caption/title', async () => {
cli = await executeStart('e2e-fixtures/images/small.rocket.config.js'); cli = await executeStart('e2e-fixtures/images/small.rocket.config.js');
const indexHtml = await readStartOutput(cli, 'no-title/index.html', { formatHtml: true }); const indexHtml = await readStartOutput(cli, 'no-title/index.html', {
formatHtml: true,
replaceImageHashes: true,
});
expect(indexHtml).to.equal( expect(indexHtml).to.equal(
[ [
'<p>', '<p>',
' <picture>', ' <picture>',
' <source', ' <source',
' type="image/avif"', ' type="image/avif"',
' srcset="/images/d67643ad-30.avif 30w, /images/d67643ad-60.avif 60w"', ' srcset="/images/__HASH__-30.avif 30w, /images/__HASH__-60.avif 60w"',
' sizes="(min-width: 1024px) 30px, 60px"', ' sizes="(min-width: 1024px) 30px, 60px"',
' />', ' />',
' <source', ' <source',
' type="image/jpeg"', ' type="image/jpeg"',
' srcset="/images/d67643ad-30.jpeg 30w, /images/d67643ad-60.jpeg 60w"', ' srcset="/images/__HASH__-30.jpeg 30w, /images/__HASH__-60.jpeg 60w"',
' sizes="(min-width: 1024px) 30px, 60px"', ' sizes="(min-width: 1024px) 30px, 60px"',
' />', ' />',
' <img', ' <img',
' alt="My Image Alternative Text"', ' alt="My Image Alternative Text"',
' rocket-image="responsive"', ' rocket-image="responsive"',
' src="/images/d67643ad-30.jpeg"', ' src="/images/__HASH__-30.jpeg"',
' width="30"', ' width="30"',
' height="15"', ' height="15"',
' loading="lazy"', ' loading="lazy"',
@@ -178,15 +270,18 @@ describe('RocketCli images', () => {
it('will render an img with srcset and sizes if there is only one image format', async () => { it('will render an img with srcset and sizes if there is only one image format', async () => {
cli = await executeStart('e2e-fixtures/images/single-format.rocket.config.js'); cli = await executeStart('e2e-fixtures/images/single-format.rocket.config.js');
const indexHtml = await readStartOutput(cli, 'no-title/index.html', { formatHtml: true }); const indexHtml = await readStartOutput(cli, 'no-title/index.html', {
formatHtml: true,
replaceImageHashes: true,
});
expect(indexHtml).to.equal( expect(indexHtml).to.equal(
[ [
'<p>', '<p>',
' <img', ' <img',
' alt="My Image Alternative Text"', ' alt="My Image Alternative Text"',
' rocket-image="responsive"', ' rocket-image="responsive"',
' src="/images/d67643ad-30.jpeg"', ' src="/images/__HASH__-30.jpeg"',
' srcset="/images/d67643ad-30.jpeg 30w, /images/d67643ad-60.jpeg 60w"', ' srcset="/images/__HASH__-30.jpeg 30w, /images/__HASH__-60.jpeg 60w"',
' sizes="(min-width: 1024px) 30px, 60px"', ' sizes="(min-width: 1024px) 30px, 60px"',
' width="30"', ' width="30"',
' height="15"', ' height="15"',

View File

@@ -29,7 +29,13 @@ describe('RocketCli mergeTemplates', () => {
const indexHtml = await readStartOutput(cli, 'index.html'); const indexHtml = await readStartOutput(cli, 'index.html');
expect(trimWhiteSpace(indexHtml)).to.equal( expect(trimWhiteSpace(indexHtml)).to.equal(
['<p>first</p>', '<p>second</p>', '<p>30-third</p>', '<p>100-last</p>'].join('\n'), [
'<p>30-first</p>',
'<p>100-second</p>',
'<p>bar-third</p>',
'<p>foo-fourth</p>',
'<p>10100-last</p>',
].join('\n'),
); );
}); });

View File

@@ -108,15 +108,18 @@ describe('RocketCli preset', () => {
it('a preset can provide an adjustImagePresets() function', async () => { it('a preset can provide an adjustImagePresets() function', async () => {
cli = await executeStart('preset-fixtures/use-preset/rocket.config.js'); cli = await executeStart('preset-fixtures/use-preset/rocket.config.js');
const indexHtml = await readStartOutput(cli, 'index.html', { formatHtml: true }); const indexHtml = await readStartOutput(cli, 'index.html', {
formatHtml: true,
replaceImageHashes: true,
});
expect(indexHtml).to.equal( expect(indexHtml).to.equal(
[ [
'<p>', '<p>',
' <img', ' <img',
' alt="My Image Alternative Text"', ' alt="My Image Alternative Text"',
' rocket-image="responsive"', ' rocket-image="responsive"',
' src="/images/1f847765-30.jpeg"', ' src="/images/__HASH__-30.jpeg"',
' srcset="/images/1f847765-30.jpeg 30w, /images/1f847765-60.jpeg 60w"', ' srcset="/images/__HASH__-30.jpeg 30w, /images/__HASH__-60.jpeg 60w"',
' sizes="30px"', ' sizes="30px"',
' width="30"', ' width="30"',
' height="15"', ' height="15"',

View File

@@ -0,0 +1,66 @@
import chai from 'chai';
import chalk from 'chalk';
import { executeBuild, readStartOutput, setFixtureDir } from '@rocket/cli/test-helpers';
const { expect } = chai;
function getInjectServiceWorker(text) {
const scriptOpenTagStart = text.indexOf('<script type="module" inject-service-worker=""');
const scriptCloseTagEnd = text.indexOf('</script>', scriptOpenTagStart) + 9;
text = text.substring(scriptOpenTagStart, scriptCloseTagEnd);
return text;
}
function getServiceWorkerUrl(text) {
const matches = text.match(/window\.__rocketServiceWorkerUrl = '(.*?)';/);
return matches[1];
}
describe('RocketCli e2e', () => {
let cli;
before(() => {
// ignore colors in tests as most CIs won't support it
chalk.level = 0;
setFixtureDir(import.meta.url);
});
afterEach(async () => {
if (cli?.cleanup) {
await cli.cleanup();
}
});
it('will add a script to inject the service worker', async () => {
cli = await executeBuild('e2e-fixtures/service-worker/rocket.config.js');
const indexHtml = await readStartOutput(cli, 'index.html');
const indexInject = getInjectServiceWorker(indexHtml);
expect(indexInject).to.equal(
'<script type="module" inject-service-worker="" src="/_merged_assets/scripts/registerServiceWorker.js"></script>',
);
expect(getServiceWorkerUrl(indexHtml)).to.equal('/service-worker.js');
const subHtml = await readStartOutput(cli, 'sub/index.html');
const subInject = getInjectServiceWorker(subHtml);
expect(subInject).to.equal(
'<script type="module" inject-service-worker="" src="/_merged_assets/scripts/registerServiceWorker.js"></script>',
);
expect(getServiceWorkerUrl(subHtml)).to.equal('/service-worker.js');
});
// TODO: find a way to run these test either by forcing pathPrefix in start or skipping asset gathering for build or ...
it.skip('will add a script to inject the service worker', async () => {
cli = await executeBuild('e2e-fixtures/service-worker/pathPrefix.rocket.config.js');
const indexHtml = await readStartOutput(cli, 'index.html');
const indexInject = getInjectServiceWorker(indexHtml);
expect(indexInject).to.equal(
'<script type="module" inject-service-worker="" src="/my-prefix-folder/_merged_assets/scripts/registerServiceWorker.js"></script>',
);
expect(getServiceWorkerUrl(indexHtml)).to.equal('/my-prefix-folder/service-worker.js');
const subHtml = await readStartOutput(cli, 'sub/index.html');
const subInject = getInjectServiceWorker(subHtml);
expect(subInject).to.equal(
'<script type="module" inject-service-worker="" src="/my-prefix-folder/_merged_assets/scripts/registerServiceWorker.js"></script>',
);
expect(getServiceWorkerUrl(subHtml)).to.equal('/my-prefix-folder/service-worker.js');
});
});

View File

@@ -0,0 +1,6 @@
node_modules
## Rocket ignore files (need to be the full relative path to the folders)
docs/_merged_data/
docs/_merged_assets/
docs/_merged_includes/

View File

@@ -0,0 +1,3 @@
_assets
_includes
_data

View File

@@ -0,0 +1,3 @@
# Welcome to Your Rocket Site
Add your markdown content here.

View File

@@ -0,0 +1,7 @@
{
"type": "module",
"scripts": {
"start": "rocket start",
"docs": "rocket build"
}
}

View File

@@ -0,0 +1,5 @@
import { rocketLaunch } from '@rocket/launch';
export default {
presets: [rocketLaunch()],
};

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

View File

@@ -0,0 +1,5 @@
---
layout: layout-raw
---
![My Image Alternative Text](./_assets/my-image.jpg 'My Image Description')

View File

@@ -0,0 +1,33 @@
<svg fill="#e63946" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 511.998 511.998" xml:space="preserve">
<g>
<path d="M98.649,430.256c-46.365,28.67-71.17,30.939-78.916,23.51c-7.75-7.433-6.519-32.307,20.182-79.832
c24.953-44.412,65.374-96.693,113.818-147.211l-11.279-10.817C93.124,267.348,51.871,320.751,26.291,366.279
c-19.228,34.22-37.848,79.134-17.375,98.766c5.84,5.6,13.599,7.935,22.484,7.935c22.269,0,51.606-14.677,75.469-29.432
c44.416-27.464,96.044-70.919,145.373-122.362l-11.279-10.817C192.517,360.888,141.976,403.464,98.649,430.256z"/>
<rect x="238.112" y="272.64" transform="matrix(-0.7218 -0.6921 0.6921 -0.7218 237.9094 656.5383)" width="25.589" height="15.628"/>
<rect x="268.895" y="302.163" transform="matrix(-0.7218 -0.6921 0.6921 -0.7218 270.4774 728.6761)" width="25.589" height="15.628"/>
<rect x="232.827" y="268.929" transform="matrix(-0.7218 -0.6921 0.6921 -0.7218 297.4719 673.0591)" width="102.364" height="15.628"/>
<path d="M500.916,41.287c-7.769,1.59-76.412,16.062-93.897,34.294l-50.728,52.899l-114.703-3.629l-39.198,40.876l79.28,40.569
l-21.755,22.687l72.848,69.858l21.755-22.687l43.857,77.51l39.197-40.876l-8.433-114.451l50.727-52.899
c17.485-18.234,29.067-87.422,30.331-95.251l1.801-11.169L500.916,41.287z M228.209,161.383l19.842-20.692l93.688,2.964
l-48.775,50.864L228.209,161.383z M401.632,327.686l-35.822-63.308l48.776-50.865l6.886,93.482L401.632,327.686z
M332.298,276.743l-50.287-48.223L412.89,92.037l50.288,48.223L332.298,276.743z M473.009,128.036l-48.316-46.334
c14.54-8.427,44.787-17.217,68.076-22.632C488.336,82.567,480.82,113.155,473.009,128.036z"/>
<rect x="302.369" y="231.988" transform="matrix(-0.7218 -0.6921 0.6921 -0.7218 384.0262 633.9694)" width="34.12" height="15.628"/>
<rect x="411.311" y="127.35" transform="matrix(-0.6921 0.7218 -0.7218 -0.6921 807.9747 -74.331)" width="17.061" height="15.628"/>
<rect x="394.288" y="145.087" transform="matrix(-0.7218 -0.6921 0.6921 -0.7218 586.0206 542.7934)" width="15.628" height="17.06"/>
<rect x="376.571" y="163.565" transform="matrix(-0.7218 -0.6921 0.6921 -0.7218 542.7271 562.3462)" width="15.628" height="17.06"/>
<rect x="161.111" y="185.158" transform="matrix(0.7071 0.7071 -0.7071 0.7071 192.1943 -60.3323)" width="15.628" height="33.35"/>
<rect x="184.683" y="172.695" transform="matrix(0.707 0.7072 -0.7072 0.707 182.4625 -83.9076)" width="15.628" height="11.118"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

View File

@@ -0,0 +1,15 @@
---
layout: layout-raw
---
Ignore SVG
![Logo stays svg](./_assets/logo.svg)
Ignore if contains `rocket-unresponsive.`
![Logo stays svg](./_assets/my-image.rocket-unresponsive.jpg)
Responsive
![My Image Alternative Text](./_assets/my-image.jpeg)

View File

@@ -2,4 +2,10 @@
layout: layout-raw layout: layout-raw
--- ---
![one](./_assets/my-image.jpg)![two](./_assets/my-image.jpg) ## one
![one](./_assets/my-image.jpg)
## two
![two](./_assets/my-image.jpg)

View File

@@ -0,0 +1,10 @@
/** @type {Partial<import("../../../types/main").RocketCliOptions>} */
const config = {
imagePresets: {
responsive: {
ignore: ({ src }) =>
src.endsWith('.jpeg') || src.endsWith('svg') || src.includes('rocket-unresponsive.'),
},
},
};
export default config;

View File

@@ -0,0 +1 @@
**/*.njk

View File

@@ -0,0 +1 @@
module.exports = 'https://example.com';

View File

@@ -0,0 +1,5 @@
---
layout: layout-default
---
Content inside `docs/index.md`

View File

@@ -0,0 +1,5 @@
---
layout: layout-default
---
Content inside `docs/sub.md`

View File

@@ -0,0 +1,6 @@
/** @type {Partial<import("../../../types/main").RocketCliOptions>} */
const config = {
pathPrefix: '/my-prefix-folder/',
};
export default config;

View File

@@ -0,0 +1,3 @@
/** @type {Partial<import("../../../types/main").RocketCliOptions>} */
const config = {};
export default config;

View File

@@ -10,9 +10,10 @@ function cleanup(config) {
const configNoPaths = { ...config }; const configNoPaths = { ...config };
delete configNoPaths._inputDirCwdRelative; delete configNoPaths._inputDirCwdRelative;
delete configNoPaths.configFile; delete configNoPaths.configFile;
delete configNoPaths._presetPathes; delete configNoPaths._presetPaths;
delete configNoPaths.eleventy; delete configNoPaths.eleventy;
delete configNoPaths.outputDevDir; delete configNoPaths.outputDevDir;
delete configNoPaths.imagePresets.responsive.ignore;
return configNoPaths; return configNoPaths;
} }
@@ -23,11 +24,12 @@ describe('normalizeConfig', () => {
// testing pathes is always a little more complicted 😅 // testing pathes is always a little more complicted 😅
expect(config._inputDirCwdRelative).to.match(/empty\/docs$/); expect(config._inputDirCwdRelative).to.match(/empty\/docs$/);
expect(config._presetPathes[0]).to.match(/cli\/preset$/); expect(config._presetPaths[0]).to.match(/cli\/preset$/);
expect(config._presetPathes[1]).to.match(/empty\/docs$/); expect(config._presetPaths[1]).to.match(/empty\/docs$/);
expect(config.outputDevDir).to.match(/_site-dev$/); expect(config.outputDevDir).to.match(/_site-dev$/);
expect(cleanup(config)).to.deep.equal({ expect(cleanup(config)).to.deep.equal({
__before11tyFunctions: [],
command: 'help', command: 'help',
createSocialMediaImages: true, createSocialMediaImages: true,
devServer: {}, devServer: {},
@@ -69,6 +71,7 @@ describe('normalizeConfig', () => {
}); });
expect(cleanup(config)).to.deep.equal({ expect(cleanup(config)).to.deep.equal({
__before11tyFunctions: [],
command: 'help', command: 'help',
createSocialMediaImages: true, createSocialMediaImages: true,
devServer: { devServer: {
@@ -109,6 +112,7 @@ describe('normalizeConfig', () => {
}); });
expect(cleanup(config)).to.deep.equal({ expect(cleanup(config)).to.deep.equal({
__before11tyFunctions: [],
command: 'help', command: 'help',
createSocialMediaImages: true, createSocialMediaImages: true,
devServer: { devServer: {
@@ -154,6 +158,7 @@ describe('normalizeConfig', () => {
}); });
expect(cleanup(config)).to.deep.equal({ expect(cleanup(config)).to.deep.equal({
__before11tyFunctions: [],
command: 'help', command: 'help',
createSocialMediaImages: true, createSocialMediaImages: true,
devServer: {}, devServer: {},

View File

@@ -1,69 +1,78 @@
import { DevServerConfig } from '@web/dev-server'; import { DevServerConfig } from '@web/dev-server';
import { CheckHtmlLinksCliOptions } from 'check-html-links/dist-types/types/main';
export interface RocketPreset { import { WatchOptions } from 'chokidar';
path: string; import { ImagePreset, RocketPreset } from './preset';
export { ImagePreset, RocketPreset };
// TODO: improve all setup functions import { Eleventy } from '@11ty/eleventy';
setupUnifiedPlugins?: function[];
setupDevAndBuildPlugins: function[];
setupBuildPlugins: function[];
setupDevPlugins: function[];
setupCliPlugins: function[];
setupEleventyPlugins: function[];
setupEleventyComputedConfig: function[];
}
interface RocketStartConfig { interface RocketStartConfig {
createSocialMediaImages?: boolean; createSocialMediaImages?: boolean;
} }
type ImageFormat = 'avif' | 'webp' | 'jpg' | 'png' | 'svg'; type PresetKeys =
| 'before11ty'
| 'setupUnifiedPlugins'
| 'setupDevAndBuildPlugins'
| 'setupBuildPlugins'
| 'setupDevPlugins'
| 'setupCliPlugins'
| 'setupEleventyPlugins'
| 'setupEleventyComputedConfig';
interface ImagePreset { export interface RocketCliOptions extends Pick<RocketPreset, PresetKeys> {
widths: number[]; presets?: Array<RocketPreset>;
formats: ImageFormat[];
sizes: string;
}
export interface RocketCliOptions {
presets: Array<RocketPreset>;
pathPrefix?: string; pathPrefix?: string;
serviceWorkerName?: string; serviceWorkerName?: string;
inputDir: string; inputDir?: string;
outputDir: string; outputDir?: string;
emptyOutputDir?: boolean; emptyOutputDir?: boolean;
absoluteBaseUrl?: string; absoluteBaseUrl?: string;
watch: boolean; watch?: boolean;
createSocialMediaImages?: boolean; createSocialMediaImages?: boolean;
imagePresets: { imagePresets?: {
[key: string]: ImagePreset; [key: string]: ImagePreset;
}; };
chokidarConfig?: WatchOptions;
checkLinks?: Partial<CheckHtmlLinksCliOptions>;
start?: RocketStartConfig; start?: RocketStartConfig;
// TODO: improve all setup functions
setupUnifiedPlugins?: function[];
setupDevAndBuildPlugins: function[];
setupBuildPlugins: function[];
setupDevPlugins: function[];
setupCliPlugins: function[];
setupEleventyPlugins: function[];
setupEleventyComputedConfig: function[];
// advanced // advanced
devServer: DevServerConfig; devServer?: DevServerConfig;
eleventy: function; // TODO: improve eleventy?: (eleventyConfig: any) => void; // TODO: improve
plugins: RocketPlugin[]; plugins?: RocketPlugin[];
// rarely used // rarely used
command: string; command?: string;
configFile?: string; configFile?: string;
outputDevDir: string; outputDevDir?: string;
private _inputDirCwdRelative: string; _inputDirCwdRelative?: string;
private _presetPathes?: Array<string>; _presetPaths?: string[];
__before11tyFunctions?: (() => void | Promise<void>)[];
} }
export interface RocketPlugin { export type RocketPlugin = {
commands: Array<string>; // what can we do, typescript itself types the constructor as `Function`
} // eslint-disable-next-line @typescript-eslint/ban-types
constructor: Function & { pluginName: string };
commands: string[];
setupCommand?(config?: RocketCliOptions): Required<RocketCliOptions>;
setup?(opts: { config: RocketCliOptions; argv: string[]; eleventy: Eleventy }): Promise<void>;
inspectRenderedHtml?(opts: {
html: string;
inputPath: string;
outputPath: string;
layout: string;
title: string;
url: string;
data: any;
eleventy: Eleventy;
}): Promise<void>;
} & {
// later ts versions can do this
// [index: `${string}Command`]: () => void|Promise<void>;
[index: string]: () => void | Promise<void>;
};

Some files were not shown because too many files have changed in this diff Show More