Version Packages

Co-authored-by: Benny Powers <web@bennypowers.com>

README.md

@@ -19,6 +19,11 @@
       src="https://img.shields.io/badge/twitter-@modern_web_dev-1DA1F3?style=flat-square"
       alt="Follow @modern_web_dev on Twitter"
   /></a>
+  <a href="https://open.vscode.dev/modernweb-dev/rocket"
+    ><img
+      src="https://open.vscode.dev/badges/open-in-vscode.svg"
+      alt="Open in VS Code"
+  /></a>
 </p>
 
 <p align="center">

docs/.eleventyignore

@@ -0,0 +1 @@
+*.docs.md

docs/_assets/style.css

@@ -1,5 +1,39 @@
-:root {
-  --markdown-table-row-odd-background-color: #efefef;
+:not(rocket-navigation):not(:defined) {
+  opacity: 0;
+}
+
+rocket-navigation,
+header {
+  font-family: 'Montserrat', sans-serif;
+}
+
+code-tabs[collection="package-managers"] {
+  --code-tabs-icon-height: 18px;
+}
+
+.call-to-action {
+  background: var(--button-one) !important;
+  text-shadow: none !important;
+  border-radius: 5px !important;
+  padding-top: 15px !important;
+  padding-bottom: 15px !important;
+  border: none !important;
+}
+
+.call-to-action:hover,
+.call-to-action:focus,
+.call-to-action:active {
+  background: var(--button-one-hover) !important;
+}
+
+.call-to-action:nth-child(2) {
+  background: var(--button-two) !important;
+}
+
+.call-to-action:nth-child(2):hover,
+.call-to-action:nth-child(2):focus,
+.call-to-action:nth-child(2):active {
+  background: var(--button-two-hover) !important;
 }
 
 body[layout^='layout-home'] .markdown-body .call-to-action:nth-of-type(2) {
@@ -15,20 +49,3 @@ body[layout^='layout-home'] .markdown-body .call-to-action:nth-of-type(2) {
     transform: rotate(45deg);
   }
 }
-
-rocket-navigation {
-  font-family: 'Montserrat', sans-serif;
-}
-
-header {
-  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;
-}

docs/_assets/theme.css

@@ -0,0 +1,141 @@
+html {
+  --button-one-hover: #436eff;
+  --button-one: #2758ff;
+  --button-two-hover: #444;
+  --button-two: black;
+  --contrast-color-dark: #1d3557;
+  --contrast-color-light: #fff;
+  --footer-background: rgba(0, 0, 0, 0.02);
+  --header-color: white;
+  --markdown-link-color: #2758ff;
+  --markdown-syntax-background-color: #f9f9f9;
+  --markdown-table-row-odd-background-color: #efefef;
+  --owc-active-color: #2758ff;
+  --owc-hover-color: #436eff;
+  --page-background: white;
+  --primary-color-accent: #cee5f6;
+  --primary-color-darker: #1a5285;
+  --primary-color-lighter: #449ad7;
+  --primary-color: rgb(44, 62, 80);
+  --primary-lines-color: #ccc;
+  --primary-text-color: #2c3e50;
+  --primary-text-inverse-color: #eee;
+  --switch-unselected-color: #808080;
+  --switch-selected-color: #42b983;
+}
+
+@media (prefers-color-scheme: dark) {
+  html {
+    --header-color: #2f3136;
+    --footer-background: rgba(255, 255, 255, 0.1);
+    --page-background: #36393e;
+    --text-color: #eee;
+    --primary-text-color: #eee;
+    --primary-color: white;
+    --primary-color-lighter: #449ad7;
+    --primary-color-darker: #1a5285;
+    --primary-color-accent: #cee5f6;
+    --contrast-color-light: #fff;
+    --contrast-color-dark: #1d3557;
+    --primary-lines-color: #333;
+    --owc-active-color: #41ffb0;
+    --owc-hover-color: #6dffc2;
+    --button-one: #9b03fe;
+    --button-one-hover: #a724ff;
+    --button-two: black;
+    --button-two-hover: rgb(36, 36, 36);
+    --rocket-search-background-color: #4a4d52;
+    --rocket-search-highlight-color: #41ffb0;
+    --rocket-search-hover-background-color: #6b717a;
+    --rocket-search-fill-color: #fff;
+    --primary-text-inverse-color: #2c3e50;
+    --switch-unselected-color: #808080;
+    --switch-selected-color: #42b983;
+
+    /* Markdown */
+    --markdown-octicon-link: var(--primary-text-color);
+    --markdown-link-color: #41ffb0;
+    --markdown-divider-color: #e1e4e8;
+    --markdown-blockquote-border-color: #dfe2e5;
+    --markdown-blockquote-color: #90aac7;
+    --markdown-kbd-background-color: #fafbfc;
+    --markdown-kbd-border-color: #c6cbd1;
+    --markdown-kbd-border-bottom-color: #959da5;
+    --markdown-kbd-color: #444d56;
+    --markdown-heading-color-6: #6a737d;
+    --markdown-table-background-color: var(--markdown-syntax-background-color);
+    --markdown-table-row-odd-background-color: var(--markdown-kbd-color);
+    --markdown-table-border-color: transparent;
+    --markdown-code-background-color: rgba(27, 31, 35, 0.05);
+    --markdown-pre-background-color: rgb(49, 49, 49);
+
+    /* syntax */
+    --markdown-syntax-color: #f8f8f2;
+    --markdown-syntax-background-color: #2e3440;
+    --markdown-syntax-atrule-color: #88c0d0;
+    --markdown-syntax-attr-name-color: #a3be8c;
+    --markdown-syntax-attr-value-color: #88c0d0;
+    --markdown-syntax-builtin-color: #a3be8c;
+    --markdown-syntax-boolean-color: #81a1c1;
+    --markdown-syntax-class-name-color: #88c0d0;
+    --markdown-syntax-constant-color: #81a1c1;
+    --markdown-syntax-char-color: #a3be8c;
+    --markdown-syntax-deleted-color: #81a1c1;
+    --markdown-syntax-entity-color: #81a1c1;
+    --markdown-syntax-function-color: #88c0d0;
+    --markdown-syntax-inserted-color: #a3be8c;
+    --markdown-syntax-keyword-color: #81a1c1;
+    --markdown-syntax-number-color: #b48ead;
+    --markdown-syntax-operator-color: #81a1c1;
+    --markdown-syntax-property-color: #81a1c1;
+    --markdown-syntax-punctuation-color: #81a1c1;
+    --markdown-syntax-regex-color: #81a1c1;
+    --markdown-syntax-important-color: #81a1c1;
+    --markdown-syntax-selector-color: #a3be8c;
+    --markdown-syntax-symbol-color: #81a1c1;
+    --markdown-syntax-string-color: #a3be8c;
+    --markdown-syntax-tag-color: #81a1c1;
+    --markdown-syntax-url-color: #81a1c1;
+    --markdown-syntax-variable-color: #81a1c1;
+    --markdown-syntax-hotkey-selector-color: #d73a49;
+    --markdown-syntax-keyword-color: #22863a;
+    --markdown-syntax-background-color: rgb(27, 29, 35);
+    --markdown-syntax-atrule-color: rgb(198, 120, 221);
+    --markdown-syntax-attr-name-color: rgb(198, 120, 221);
+    --markdown-syntax-boolean-color: rgb(209, 154, 102);
+    --markdown-syntax-class-name-color: rgb(97, 175, 239);
+    --markdown-syntax-constant-color: rgb(220, 220, 170);
+    --markdown-syntax-entity-color: rgb(220, 220, 170);
+    --markdown-syntax-function-color: rgb(97, 175, 239);
+    --markdown-syntax-inserted-color: rgb(220, 220, 170);
+    --markdown-syntax-keyword-color: rgb(198, 120, 221);
+    --markdown-syntax-number-color: rgb(220, 220, 170);
+    --markdown-syntax-operator-color: rgb(220, 220, 170);
+    --markdown-syntax-property-color: rgb(220, 220, 170);
+    --markdown-syntax-punctuation-color: white;
+    --markdown-syntax-regex-color: rgb(209, 154, 102);
+    --markdown-syntax-selector-color: rgb(86, 156, 214);
+    --markdown-syntax-symbol-color: rgb(220, 220, 170);
+    --markdown-syntax-tag-color: rgb(86, 156, 214);
+    --markdown-syntax-url-color: rgb(220, 220, 170);
+    --markdown-syntax-variable-color: rgb(220, 220, 170);
+  }
+
+  .string {
+    color: rgb(152, 195, 121);
+  }
+
+  .comment {
+    color: #7d7d7d;
+  }
+
+  .language-css {
+    --markdown-syntax-string-color: #81a1c1;
+  }
+}
+
+body[layout='home'] .markdown-body .call-to-action:nth-of-type(2) {
+  --primary-color: #222;
+  --primary-color-lighter: #333;
+  --primary-color-darker: #000;
+}

docs/_includes/_joiningBlocks/head/45-stylesheets-custom.njk

@@ -0,0 +1 @@
+<link rel="stylesheet" href="{{ '/_assets/theme.css' | asset | url }}">

docs/docs/configuration/images.md

@@ -88,8 +88,10 @@ The default preset for regular markdown content is available as `responsive`.
 
 👉 `rocket.config.js`
 
+<!-- prettier-ignore-start -->
 ```js
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   imagePresets: {
     responsive: {
       widths: [300, 820],
@@ -97,8 +99,9 @@ export default {
       sizes: '(min-width: 1024px) 820px, calc(100vw - 20px)',
     },
   },
-};
+});
 ```
+<!-- prettier-ignore-end -->
 
 ## Ignoring Images
 
@@ -148,8 +151,10 @@ For this example we want to also ignore `.jpeg` files.
 
 👉 `rocket.config.js`
 
+<!-- prettier-ignore-start -->
 ```js
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   imagePresets: {
     responsive: {
       // ...
@@ -157,8 +162,9 @@ export default {
         src.endsWith('.jpeg') || src.endsWith('svg') || src.includes('rocket-unresponsive.'),
     },
   },
-};
+});
 ```
+<!-- prettier-ignore-end -->
 
 With that setting we get the following behavior
 
@@ -180,8 +186,10 @@ becomes
 
 You can add your own image preset like so
 
+<!-- prettier-ignore-start -->
 ```js
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   imagePresets: {
     'my-image-preset': {
       widths: [30, 60],
@@ -189,8 +197,9 @@ export default {
       sizes: '(min-width: 1024px) 30px, 60px',
     },
   },
-};
+});
 ```
+<!-- prettier-ignore-end -->
 
 Once that `imagePreset` is defined you can use it by adding it to any `img` tag.
 
@@ -232,15 +241,18 @@ If you want to add `webp` (or replace `avif` with it) you can do so by setting t
 
 👉 `rocket.config.js`
 
+<!-- prettier-ignore-start -->
 ```js
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   imagePresets: {
     responsive: {
       formats: ['avif', 'webp', 'jpeg'],
     },
   },
-};
+});
 ```
+<!-- prettier-ignore-end -->
 
 ## Default widths
 
@@ -262,16 +274,19 @@ If you want to add more widths you can add them to `widths`.
 
 👉 `rocket.config.js`
 
+<!-- prettier-ignore-start -->
 ```js
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   imagePresets: {
     responsive: {
       widths: [300, 600, 900, 1200, 1640],
       sizes: '(min-width: 1024px) 820px, calc(100vw - 20px)',
     },
   },
-};
+});
 ```
+<!-- prettier-ignore-end -->
 
 <inline-notification type="tip">
 

docs/docs/configuration/overview.md

@@ -4,22 +4,27 @@ The configuration file is `rocket.config.js` or `rocket.config.mjs`.
 
 The config files consist of the following parts:
 
+<!-- prettier-ignore-start -->
 ```js
 import { rocketLaunch } from '@rocket/launch';
 
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   presets: [rocketLaunch()],
   emptyOutputDir: true,
   pathPrefix: 'subfolder-only-for-build',
-};
+});
 ```
+<!-- prettier-ignore-end -->
 
 Rocket is primarily build around plugins for each of its systems.
 
 New plugins can be added and all default plugins can be adjusted or even removed by using the following functions.
 
+<!-- prettier-ignore-start -->
 ```js
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   // add remark/unified plugin to the Markdown processing (e.g. enable special code blocks)
   setupUnifiedPlugins: [],
 
@@ -40,8 +45,9 @@ export default {
 
   // add a plugin to the cli (e.g. a new command like "rocket my-command")
   setupCliPlugins: [],
-};
+});
 ```
+<!-- prettier-ignore-end -->
 
 ## Adding Rollup Plugins
 
@@ -55,19 +61,19 @@ You can accomplish this with Rollup and dev server plugins. Make sure to add bot
 
 For these cases you can use `setupDevAndBuildPlugins`, which will automatically add the plugin for you to both Rollup and dev-server:
 
+<!-- prettier-ignore-start -->
 ```js
 import json from '@rollup/plugin-json';
 import { addPlugin } from 'plugins-manager';
 
 /** @type {import('@rocket/cli').RocketCliOptions} */
-const config = {
+export default ({
   setupDevAndBuildPlugins: [
     addPlugin({ name: 'json', plugin: json, location: 'top', options: { my: 'settings' } }),
   ],
-};
-
-export default config;
+});
 ```
+<!-- prettier-ignore-end -->
 
 This will add the Rollup plugin `json` with the id `json` at the top of the plugin list of Rollup and the dev server. It needs to be at the top so further plugins down the line can work with JSON imports.
 For the Dev Server the plugins are automatically wrapped by `@web/dev-server-rollup`. Note that [not all Rollup plugins](https://modern-web.dev/docs/dev-server/plugins/rollup/#compatibility-with-rollup-plugins) will work with the dev-server.
@@ -76,25 +82,85 @@ For the Dev Server the plugins are automatically wrapped by `@web/dev-server-rol
 
 All plugins which are either default or are added via a preset can still be adjusted by using `adjustPluginOptions`.
 
+<!-- prettier-ignore-start -->
 ```js
 import { adjustPluginOptions } from 'plugins-manager';
 
 /** @type {import('@rocket/cli').RocketCliOptions} */
-const config = {
+export default ({
   setupDevAndBuildPlugins: [adjustPluginOptions('json', { my: 'overwrite settings' })],
-};
-
-export default config;
+});
 ```
+<!-- prettier-ignore-end -->
 
 ## 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.
 
+<!-- prettier-ignore-start -->
 ```js
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   async before11ty() {
     await copyDataFiles();
   },
-};
+});
 ```
+<!-- prettier-ignore-end -->
+
+## Advanced
+
+Sometimes you need even more control over specific settings.
+
+### Rollup
+
+For example if you wanna add an `acron` plugin to rollup
+
+<!-- prettier-ignore-start -->
+```js
+import { importAssertions } from 'acorn-import-assertions';
+
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
+  rollup: config => ({
+    ...config,
+    acornInjectPlugins: [importAssertions],
+  }),
+});
+```
+<!-- prettier-ignore-end -->
+
+### Eleventy
+
+For example to add custom filter you can access the eleventy config directly
+
+<!-- prettier-ignore-start -->
+```js
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
+  eleventy: eleventyConfig => {
+    eleventyConfig.addFilter('value', value => `prefix${value}`);
+  },
+});
+```
+<!-- prettier-ignore-end -->
+
+You even have access to the full rocketConfig if you for example want to create filters that behave differently during start/build.
+
+<!-- prettier-ignore-start -->
+```js
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
+  eleventy: (config, rocketConfig) => {
+    config.addFilter('conditional-resolve', value => {
+      if (rocketConfig.command === 'build') {
+        return `build:${value}`;
+      }
+      if (rocketConfig.command === 'start') {
+        return `start:${value}`;
+      }
+    });
+  },
+});
+```
+<!-- prettier-ignore-end -->

docs/docs/configuration/service-worker.md

@@ -12,11 +12,14 @@ Changing the service worker file name can be quite a hassle so you can adjust ge
 
 👉 `rocket.config.js`
 
+<!-- prettier-ignore-start -->
 ```js
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   serviceWorkerName: 'my-service-worker-name.js',
-};
+});
 ```
+<!-- prettier-ignore-end -->
 
 ## Meet the Service Worker
 

docs/docs/markdown-javascript/preview.md

@@ -72,15 +72,18 @@ excludeFromSearch: true
 
 Once you have that you need to configure it for the story renderer by setting it in your `rocket.config.js`.
 
+<!-- prettier-ignore-start -->
 ```js
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   setupUnifiedPlugins: [
     adjustPluginOptions('mdjsSetupCode', {
       simulationSettings: { simulatorUrl: '/simulator/' },
     }),
   ],
-};
+});
 ```
+<!-- prettier-ignore-end -->
 
 <inline-notification type="tip">
 

docs/docs/presets/blog.md

@@ -4,7 +4,7 @@ Enable writing blog posts within your Rocket site.
 
 ## Installation
 
-<code-tabs collection="package-managers" default-tab="npm">
+<code-tabs collection="package-managers" default-tab="npm" align="end">
 
 ```bash tab npm
 npm i @rocket/blog
@@ -24,10 +24,13 @@ pnpm add @rocket/blog
 
 👉 `rocket.config.js`
 
+<!-- prettier-ignore-start -->
 ```js
 import { rocketBlog } from '@rocket/blog';
 
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   presets: [rocketBlog()],
-};
+});
 ```
+<!-- prettier-ignore-end -->

docs/docs/presets/launch/custom-elements.txt

@@ -0,0 +1,7 @@
+---
+layout: layout-api
+package: '@rocket/launch'
+module: inline-notification/index.js
+---
+
+# Presets >> Launch >> Custom Elements || 20

docs/docs/presets/launch/index.md

@@ -0,0 +1,3 @@
+# Presets >> Launch || 20
+
+- [Preset](./preset/)

docs/docs/presets/launch/preset.md

@@ -8,7 +8,7 @@ alerts:
     content: You **really** shouldn't!
 ---
 
-# Presets >> Launch || 20
+# Presets >> Launch >> Preset || 10
 
 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.
 
@@ -16,7 +16,7 @@ Rocket comes with a preset you will love. Simple, responsive and behaving like n
 
 Install `@rocket/launch` from the NPM repository using your favourite package manager.
 
-<code-tabs collection="package-managers" default-tab="npm">
+<code-tabs collection="package-managers" default-tab="npm" align="end">
 
 ```bash tab npm
 npm i @rocket/launch
@@ -36,13 +36,16 @@ pnpm add @rocket/launch
 
 👉 `rocket.config.js`
 
+<!-- prettier-ignore-start -->
 ```js
 import { rocketLaunch } from '@rocket/launch';
 
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   presets: [rocketLaunch()],
-};
+});
 ```
+<!-- prettier-ignore-end -->
 
 ## Data
 

docs/docs/presets/search.md

@@ -1,43 +0,0 @@
-# Presets >> Search || 30
-
-Add a search for all your static content.
-
-## Installation
-
-<code-tabs collection="package-managers" default-tab="npm">
-
-```bash tab npm
-npm i @rocket/search
-```
-
-```bash tab yarn
-yarn add @rocket/search
-```
-
-```bash tab pnpm
-pnpm add @rocket/search
-```
-
-</code-tabs>
-
-## Usage
-
-👉 `rocket.config.js`
-
-```js
-import { rocketSearch } from '@rocket/search';
-
-export default {
-  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 |

docs/docs/presets/search/custom-elements.txt

@@ -0,0 +1,9 @@
+---
+layout: layout-api
+package: '@rocket/search'
+modules:
+  - src/RocketSearch.js
+  - src/RocketSearchCombobox.js
+---
+
+# Presets >> Search >> Custom Elements || 20

docs/docs/presets/search/index.md

@@ -0,0 +1,3 @@
+# Presets >> Search || 10
+
+- [Preset](./preset/)

docs/docs/presets/search/preset.md

@@ -0,0 +1,36 @@
+# Presets >> Search >> Preset || 10
+
+Add a search for all your static content.
+
+## Installation
+
+<code-tabs collection="package-managers" default-tab="npm" align="end">
+
+```bash tab npm
+npm i @rocket/search
+```
+
+```bash tab yarn
+yarn add @rocket/search
+```
+
+```bash tab pnpm
+pnpm add @rocket/search
+```
+
+</code-tabs>
+
+## Usage
+
+👉 `rocket.config.js`
+
+<!-- prettier-ignore-start -->
+```js
+import { rocketSearch } from '@rocket/search';
+
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
+  presets: [rocketSearch()],
+});
+```
+<!-- prettier-ignore-end -->

docs/docs/tools/plugins-manager.md

@@ -3,16 +3,125 @@
 The Plugins Manager replaces the specific registration/execution (with options) in a given plugin system by an intend to use a plugin (with these options).
 This allows your users to adjust the options before actually applying the plugins.
 
+## Setup
+
+1. Install npm package
+   ```bash
+   npm i plugins-manager
+   ```
+2. Change your public API from an array of plugin "instances" to an array of setup functions
+   ```diff
+     import myPlugin from 'my-plugin';
+   + import { addPlugin } from 'plugins-manager';
+     export default {
+   -   plugins: [myPlugin],
+   +   setupPlugins: [addPlugin(myPlugin)]
+     }
+   ```
+3. Convert setup function to plugins
+
+   ```js
+   import { applyPlugins } from 'plugins-manager';
+
+   const finalConfig = applyPlugins(config); // "converts" setupPlugins to plugins
+
+   // work with plugins or pass it on to another tool
+   const bundle = await rollup(finalConfig);
+   ```
+
+## Usage
+
+As you users in most cases you will need to either add or adjust a given plugin in a config file.
+
+👉 `my-tool.config.js`
+
+```js
+import { addPlugin, adjustPluginOptions } from 'plugins-manager';
+import json from '@rollup/plugin-json';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+
+export default {
+  setupPlugins: [
+    // add a new plugin with optional plugin options
+    addPlugin(json, {
+      /* ... */
+    }),
+
+    // adjust the options of a plugin that is already registered
+    adjustPluginOptions(nodeResolve, {
+      /* ... */
+    }),
+  ],
+};
+```
+
+## Plugins can be functions or classes
+
+### Function Plugins
+
+```js
+function myPlugin({ lastName: 'initial-second' }) {
+  // ...
+}
+
+export default {
+  setupPlugins: [addPlugin(myPlugin)],
+};
+
+// function parameters are type safe
+addPlugin(myPlugin, { lastName: 'new name' }); // ts ok
+addPlugin(myPlugin, { otherProp: 'new name' }); // ts error
+```
+
+### Class Plugins
+
+The options are passed to the constructor.
+
+```js
+/**
+ * @typedef {object} MyClassOptions
+ * @property {string} lastName
+ */
+
+class MyClass {
+  /** @type {MyClassOptions} */
+  options = {
+    lastName: 'initial-second',
+  };
+
+  /**
+   * @param {Partial<MyClassOptions>} options
+   */
+  constructor(options = {}) {
+    this.options = { ...this.options, ...options };
+  }
+
+  // ...
+}
+
+export default {
+  setupPlugins: [addPlugin(MyClass)],
+};
+
+// constructor parameters are type safe
+addPlugin(MyClass, { lastName: 'new name' }); // ts ok
+addPlugin(MyClass, { otherProp: 'new name' }); // ts error
+```
+
 ## Problem
 
 Many plugin systems require you to either execute a plugin function like in `rollup`.
 
+<!-- prettier-ignore-start -->
 ```js
 import json from '@rollup/plugin-json';
-export default {
+
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   plugins: [json({ preferConst: true })],
-};
+});
 ```
+<!-- prettier-ignore-end -->
 
 or add it in a special way like in `eleventy`
 
@@ -44,18 +153,14 @@ This means if you wish to define default plugins and allow your user to override
 
 The plugins manager lets you orchestrate a set of "meta plugins" which are defined by
 
-- name
-- plugin
-- options
+- plugin (class or function)
+- it's options
 
 ```js
 import beep from '@rollup/plugin-beep';
 import url from '@rollup/plugin-url';
 
-let metaPlugins = [
-  { name: 'beep', plugin: beep },
-  { name: 'url', plugin: url, options: { limit: 10000 } },
-];
+let metaPlugins = [{ plugin: beep }, { plugin: url, options: { limit: 10000 } }];
 ```
 
 This array can be modified by adding/removing or adjusting options.
@@ -90,16 +195,13 @@ export default {
 
 ### Adding Helpers
 
-Doing array manipulations is kinda error-prone so we offer encourage to use an array of setup function. Where as each setup function can either add a new plugin (with a unique name) or adjust an already existing plugin.
+Doing array manipulations is kinda error-prone so we encourage to use an array of setup function. Where as each setup function can either add a new plugin (with a unique name) or adjust an already existing plugin.
 
 ```js
 import { addPlugin, adjustPluginOptions } from 'plugins-manager';
 
-const systemSetupFunctions = [
-  addPlugin({ name: 'first', plugin: first }),
-  addPlugin({ name: 'second', plugin: second }),
-];
-const userSetupFunctions = [adjustPluginOptions('first', { my: 'options' })];
+const systemSetupFunctions = [addPlugin(first), addPlugin(second)];
+const userSetupFunctions = [adjustPluginOptions(first, { my: 'options' })];
 ```
 
 Arrays of functions can by merged like so
@@ -111,9 +213,9 @@ const finalSetupFunctions = [...systemSetupFunctions, ...userSetupFunctions];
 and then converted to the final output.
 
 ```js
-import { metaPluginsToRollupPlugins } from 'plugins-manager';
+import { applyPlugins } from 'plugins-manager';
 
-const plugins = metaPluginsToRollupPlugins(finalSetupFunctions, metaPlugins);
+const plugins = applyPlugins(finalSetupFunctions, metaPlugins);
 ```
 
 ## Adding a Plugin
@@ -129,18 +231,27 @@ By default it adds at the bottom.
 import json from '@rollup/plugin-json';
 import { addPlugin } from 'plugins-manager';
 
-const userSetupFunctions = [
-  addPlugin({ name: 'json', plugin: json, options: { preferConst: true } }),
-];
+const userSetupFunctions = [addPlugin(json, { preferConst: true })];
 ```
 
 Example usage:
 
 ```js
-addPlugin({ name: 'json', plugin: json }); // Add at the bottom (default)
-addPlugin({ name: 'json', plugin: json, location: 'top' }); // Add at the top/beginning of the array
-addPlugin({ name: 'json', plugin: json, location: 'beep' }); // Add after (default) plugin 'beep'
-addPlugin({ name: 'json', plugin: json, location: 'beep', how: 'before' }); // Add before plugin 'beep'
+addPlugin(json); // Add at the bottom (default)
+addPlugin(json, {}, { location: 'top' }); // Add at the top/beginning of the array
+addPlugin(json, {}, { location: beep }); // Add after (default) plugin 'beep'
+addPlugin(json, {}, { location: beep, how: 'before' }); // Add before plugin 'beep'
+```
+
+This is type safe and typescript will throw an error if you pass the wrong type.
+
+```js
+function myPlugin({ myFlag = false } = {}) {
+  // ...
+}
+
+addPlugin(myPlugin, { myFlag: true }); // ts ok
+addPlugin(myPlugin, { notExisting: true }); // ts error
 ```
 
 ## Adjusting Plugin Options
@@ -150,12 +261,14 @@ Adjusting options means to either
 - flatly merge objects (e.g. only the first level will be preserved)
 - calling a function to do the merge yourself
 - setting the raw value (if not an object or function)
+- you need to have a reference to the plugin (which is used to auto complete the available options via typescript)
 
 ```js
+import json from '@rollup/plugin-json';
 import { adjustPluginOptions } from 'plugins-manager';
 
 const userSetupFunctions = [
-  adjustPluginOptions('json', { preferConst: false, anotherOption: 'format' }),
+  adjustPluginOptions(json, { preferConst: false, anotherOption: 'format' }),
 ];
 ```
 
@@ -163,36 +276,53 @@ Example usage:
 
 ```js
 // given
-addPlugin({
-  name: 'json',
-  plugin: json,
-  options: {
-    other: {
-      nested: 'other.nested',
-      nested2: 'other.nested2',
-    },
-    main: true,
+addPlugin(json, {
+  other: {
+    nested: 'other.nested',
+    nested2: 'other.nested2',
   },
+  main: true,
 });
 
 // merge objects flately
-adjustPluginOptions('json', { other: { nested: '--overwritten--' } });
+adjustPluginOptions(json, { other: { nested: '--overwritten--' } });
 // resulting options = { other: { nested: '--overwritten--' }, main: true }
 // NOTE: nested2 is removed
 
 // merge via function
-adjustPluginOptions('json', config => ({ other: { ...config.other, nested: '--overwritten--' } }));
+adjustPluginOptions(json, config => ({ other: { ...config.other, nested: '--overwritten--' } }));
 // resulting options = { other: { nested: '--overwritten--', nested2: 'other.nested2' }, main: true }
 
 // merge via function to override full options
-adjustPluginOptions('json', config => ({ only: 'this' }));
+adjustPluginOptions(json, config => ({ only: 'this' }));
 // resulting options = { only: 'this' }
 
 // setting a raw value
-adjustPluginOptions('json', false);
+adjustPluginOptions(json, false);
 // resulting options = false
 ```
 
+This is type safe and typescript will throw an error if you pass the wrong type.
+
+```js
+function myPlugin({ myFlag = false } = {}) {
+  // ...
+}
+
+adjustPluginOptions(myPlugin, { myFlag: true }); // ts ok
+adjustPluginOptions(myPlugin, { notExisting: true }); // ts error
+```
+
+## Remove Plugin
+
+Sometimes you would like to remove a default plugin from the config.
+
+```js
+export default {
+  setupPlugins: [removePlugin(json)],
+};
+```
+
 ## Converting metaPlugins to an Actual Plugin
 
 To execute all setup function you can use this little helper
@@ -223,25 +353,9 @@ Rollup has a more specific helper that handles
 Note: if you provide `config.plugins` then it will return that directly ignoring `setupPlugins`
 
 ```js
-import { metaConfigToRollupConfig } from 'plugins-manager';
+import { applyPlugins } from 'plugins-manager';
 
-const finalConfig = metaConfigToRollupConfig(currentConfig, defaultMetaPlugins);
-```
-
-Web Dev Server has a more specific helper that handles
-
-- `config.setupPlugins`
-- `config.setupRollupPlugins`
-
-Note: if you provide `config.plugins` then it will return that directly ignoring `setupPlugins` and `setupRollupPlugins`
-
-```js
-import { metaConfigToWebDevServerConfig } from 'plugins-manager';
-import { fromRollup } from '@web/dev-server-rollup';
-
-const finalConfig = metaConfigToWebDevServerConfig(currentConfig, defaultMetaPlugins, {
-  rollupWrapperFunction: fromRollup,
-});
+const finalConfig = applyPlugins(currentConfig, defaultMetaPlugins);
 ```
 
 Eleventy

docs/guides/configuration/getting-started.md

@@ -22,17 +22,17 @@ The Plugins Manager helps you register and execute your plugins across the vario
 
 If you want to add a plugin to the Markdown processing you can use `setupUnifiedPlugins`.
 
+<!-- prettier-ignore-start -->
 ```js
 import emoji from 'remark-emoji';
 import { addPlugin } from 'plugins-manager';
 
 /** @type {Partial<import('@rocket/cli').RocketCliOptions>} */
-const config = {
+export default ({
   setupUnifiedPlugins: [addPlugin({ location: 'markdown', name: 'emoji', plugin: emoji })],
-};
-
-export default config;
+});
 ```
+<!-- prettier-ignore-end -->
 
 For plugins that should handle the Markdown <abbr title="Abstract Syntax Tree">AST</abbr> you should use `addPlugin({ location: 'markdown', name: 'my-plugin', plugin: MyPlugin})`. <br>
 While for the rehype AST you should use `addPlugin({ location: 'remark2rehype', name: 'my-plugin', plugin: MyPlugin})`.

docs/guides/first-pages/getting-started.md

@@ -21,7 +21,7 @@ cd my-project
 
 Then initialize a package.json file
 
-<code-tabs collection="package-managers" default-tab="npm">
+<code-tabs collection="package-managers" default-tab="npm" align="end">
 
 ```bash tab npm
 npm init -y
@@ -39,7 +39,7 @@ pnpm init -y
 
 ### Step 2. Install dependencies
 
-<code-tabs collection="package-managers" default-tab="npm">
+<code-tabs collection="package-managers" default-tab="npm" align="end">
 
 ```bash tab npm
 npm install --save-dev @rocket/cli @rocket/launch
@@ -57,7 +57,7 @@ pnpm add -D @rocket/cli @rocket/launch
 
 ### Step 3. Bootstrap the project
 
-<code-tabs collection="package-managers" default-tab="npm">
+<code-tabs collection="package-managers" default-tab="npm" align="end">
 
 ```bash tab npm
 npx rocket bootstrap
@@ -92,13 +92,16 @@ If you don't want to use the `module` package type, make sure to rename the gene
 
 <code-tabs default-tab="rocket.config.js">
 
+<!-- prettier-ignore-start -->
 ```js tab rocket.config.js
 import { rocketLaunch } from '@rocket/launch';
 
-export default {
+/** @type {import('rocket/cli').RocketCliConfig} */
+export default ({
   presets: [rocketLaunch()],
-};
+});
 ```
+<!-- prettier-ignore-end -->
 
 ```md tab docs/index.md
 # Welcome to Your Rocket Site
@@ -145,7 +148,7 @@ Please note that the heading - text prefixed with `#` or `##` - is not optional
 
 Now you can launch your site locally with
 
-<code-tabs collection="package-managers" default-tab="npm">
+<code-tabs collection="package-managers" default-tab="npm" align="end">
 
 ```bash tab npm
 npm start

docs/guides/go-live/overview.md

@@ -42,11 +42,13 @@ eleventyExcludeFromCollections: true
 <?xml version="1.0" encoding="utf-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   {% raw %}{% for page in collections.all %}
+    {%- if page.url !== '/404.html' -%}
     <url>
       <loc>{{ rocketConfig.absoluteBaseUrl }}{{ page.url | url }}</loc>
       <lastmod>{{ page.date.toISOString() }}</lastmod>
       <changefreq>{{ page.data.changeFreq if page.data.changeFreq else "monthly" }}</changefreq>
     </url>
+    {%- endif -%}
   {% endfor %}{% endraw %}
 </urlset>
 ```

package.json

@@ -8,15 +8,16 @@
   },
   "type": "module",
   "scripts": {
-    "analyze": "node scripts/workspaces-scripts-bin.mjs analyze",
+    "analyze": "run-s analyze:* format:*",
+    "analyze:analyze": "node scripts/workspaces-scripts-bin.mjs analyze",
     "build": "npm run build:packages && npm run build:site",
     "build:packages": "node scripts/workspaces-scripts-bin.mjs build:package",
-    "build:site": "npm run rocket:build",
+    "build:site": "run-s analyze:* rocket:build",
     "changeset": "changeset",
     "debug": "web-test-runner --watch --config web-test-runner-chrome.config.mjs",
     "debug:firefox": "web-test-runner --watch --config web-test-runner-firefox.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": "run-s format:*",
     "format:eslint": "eslint --ext .ts,.js,.mjs,.cjs . --fix",
     "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:*",
@@ -32,7 +33,8 @@
     "setup": "npm run setup:ts-configs && npm run build:packages",
     "setup:patches": "npx patch-package",
     "setup:ts-configs": "node scripts/generate-ts-configs.mjs",
-    "start": "node packages/cli/src/cli.js start",
+    "xprestart": "yarn analyze",
+    "start": "node --trace-warnings packages/cli/src/cli.js start",
     "test": "yarn test:node && yarn test:web",
     "test:node": "mocha \"packages/*/test-node/**/*.test.{ts,js,mjs,cjs}\" --timeout 5000 --reporter dot --exit",
     "test:web": "web-test-runner",
@@ -46,7 +48,7 @@
   },
   "devDependencies": {
     "@changesets/cli": "^2.12.0",
-    "@custom-elements-manifest/analyzer": "^0.4.11",
+    "@custom-elements-manifest/analyzer": "^0.4.12",
     "@open-wc/testing": "^3.0.0-next.1",
     "@rollup/plugin-commonjs": "^17.0.0",
     "@rollup/plugin-json": "^4.1.0",
@@ -61,12 +63,12 @@
     "@web/test-runner": "^0.12.2",
     "@web/test-runner-commands": "^0.4.0",
     "@web/test-runner-playwright": "^0.8.0",
-    "cem-plugin-readme": "^0.1.2",
+    "cem-plugin-readme": "^0.1.3",
     "chai": "^4.2.0",
     "concurrently": "^5.3.0",
     "copyfiles": "^2.4.1",
     "deepmerge": "^4.2.2",
-    "esbuild": "^0.8.31",
+    "esbuild": "^0.12.15",
     "eslint": "^7.17.0",
     "eslint-config-prettier": "^7.1.0",
     "hanbi": "^0.4.1",
@@ -78,10 +80,12 @@
     "onchange": "^7.1.0",
     "prettier": "^2.2.1",
     "prettier-plugin-package": "^1.3.0",
+    "publish-docs": "^0.1.2",
     "puppeteer": "^9.0.0",
     "remark-emoji": "^2.1.0",
     "rimraf": "^3.0.2",
-    "rocket-preset-code-tabs": "^0.2.1",
+    "rocket-preset-code-tabs": "^0.2.6",
+    "rocket-preset-custom-elements-manifest": "^0.1.7",
     "rollup": "^2.36.1",
     "rollup-plugin-terser": "^7.0.2",
     "sinon": "^9.2.3",

packages/blog/CHANGELOG.md

@@ -1,5 +1,50 @@
 # @rocket/blog
 
+## 0.4.0
+
+### Minor Changes
+
+- 70bb7a1: BREAKING CHANGE: Update to latest plugins manager to get type safe options
+
+  There is no longer a name string as a key for a plugin. It is identified by it's function/class. You will need to adjust your code if you are adding or adjusting plugins.
+
+  ```diff
+  - addPlugin({ name: 'my-plugin', plugin: myPlugin, options: { myFlag: true }, location: 'top' });
+  + addPlugin(myPlugin, { myFlag: true }, { location: 'top' });
+  - adjustPluginOptions('my-plugin', { myFlag: true });
+  + adjustPluginOptions(myPlugin, { myFlag: true });
+  ```
+
+  For more details please see the [Changelog](https://github.com/modernweb-dev/rocket/blob/main/packages/plugins-manager/CHANGELOG.md#030) of the plugins-manager package.
+
+### Patch Changes
+
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+  - plugins-manager@0.3.0
+
+## 0.3.3
+
+### Patch Changes
+
+- e1089c5: add title to blog page
+
+## 0.3.2
+
+### Patch Changes
+
+- 00f4a91: alignment + spacings for article grids
+
+## 0.3.1
+
+### Patch Changes
+
+- a5661b8: Updates dependencies
+
 ## 0.3.0
 
 ### Minor Changes

packages/blog/package.json

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

packages/blog/preset/_assets/rocket-blog.css

@@ -20,6 +20,8 @@ body[layout='layout-blog-details'] #sidebar-nav li.anchor a:hover::before {
   flex-wrap: wrap;
   margin: calc(-1 * var(--gap)) 0 0 calc(-1 * var(--gap));
   width: calc(100% + var(--gap));
+
+  align-items: flex-start;
 }
 
 .articles article {
@@ -32,6 +34,12 @@ body[layout='layout-blog-details'] #sidebar-nav li.anchor a:hover::before {
 .articles article h2 {
   margin: 0;
   border: none;
+  padding-top: 1rem;
+}
+
+.articles article .thumbnail {
+  display: block;
+  height: 200px;
 }
 
 .articles article .read {
@@ -48,7 +56,7 @@ body[layout='layout-blog-details'] #sidebar-nav li.anchor a:hover::before {
 }
 
 @media screen and (min-width: 1024px) {
-	body[layout='layout-blog-details'] #sidebar {
+  body[layout='layout-blog-details'] #sidebar {
     display: block;
-	}
+  }
 }

packages/blog/preset/_includes/_joiningBlocks/_layoutBlogDetails/content/10-title.njk

@@ -1,3 +1,6 @@
+{% if title %}
+  <h1>{{title}}</h1>
+{% endif %}
 {% if cover_image %}
   <img src="{{ cover_image | url }}" alt="">
 {% endif %}

packages/blog/preset/_includes/_joiningBlocks/_layoutBlogOverview/content/30-articles.njk

@@ -3,8 +3,7 @@
     {% if post.data.published %}
       <article>
         {% if post.data.cover_image %}
-          <a href="{{ post.url | url }}">
-            <img src="{{ post.data.cover_image | url }}" alt="">
+          <a href="{{ post.url | url }}" class="thumbnail" style="background-image: url({{ post.data.cover_image | url }});">
           </a>
         {% endif %}
         <div class="content">

packages/blog/preset/_includes/_joiningBlocks/head/add-blog-css.njk

@@ -1 +1,9 @@
 <link rel="stylesheet" href="{{ '/_assets/rocket-blog.css' | asset | url }}">
+{%- if layout == 'layout-blog-overview' -%}
+  <style>
+    .articles article .thumbnail {
+      background-size: cover;
+      background-position: center;
+    }
+  </style>
+{%- endif -%}

packages/blog/preset/rocketBlog.js

@@ -47,6 +47,6 @@ export function rocketBlog({ section = SECTION, postCollection = POST_COLLECTION
 
   return {
     path: path.resolve(__dirname),
-    setupEleventyPlugins: [addPlugin({ name: 'rocket-blog', plugin: eleventyPluginRocketBlog })],
+    setupEleventyPlugins: [addPlugin(eleventyPluginRocketBlog)],
   };
 }

packages/building-rollup/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @rocket/building-rollup
 
+## 0.4.0
+
+### Minor Changes
+
+- 70bb7a1: BREAKING CHANGE: Update to latest plugins manager to get type safe options
+
+  There is no longer a name string as a key for a plugin. It is identified by it's function/class. You will need to adjust your code if you are adding or adjusting plugins.
+
+  ```diff
+  - addPlugin({ name: 'my-plugin', plugin: myPlugin, options: { myFlag: true }, location: 'top' });
+  + addPlugin(myPlugin, { myFlag: true }, { location: 'top' });
+  - adjustPluginOptions('my-plugin', { myFlag: true });
+  + adjustPluginOptions(myPlugin, { myFlag: true });
+  ```
+
+  For more details please see the [Changelog](https://github.com/modernweb-dev/rocket/blob/main/packages/plugins-manager/CHANGELOG.md#030) of the plugins-manager package.
+
 ## 0.3.1
 
 ### Patch Changes

packages/building-rollup/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocket/building-rollup",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "publishConfig": {
     "access": "public"
   },

packages/building-rollup/src/createBasicConfig.js

@@ -2,13 +2,13 @@ import resolve from '@rollup/plugin-node-resolve';
 import { terser } from 'rollup-plugin-terser';
 import babelPkg from '@rollup/plugin-babel';
 
-import { metaConfigToRollupConfig } from 'plugins-manager';
+import { applyPlugins } from 'plugins-manager';
 
 const { babel } = babelPkg;
 
 export function createBasicConfig(userConfig) {
   const { config, metaPlugins } = createBasicMetaConfig(userConfig);
-  return metaConfigToRollupConfig(config, metaPlugins);
+  return applyPlugins(config, metaPlugins);
 }
 
 export function createBasicMetaConfig(userConfig = { output: {} }) {
@@ -39,14 +39,12 @@ export function createBasicMetaConfig(userConfig = { output: {} }) {
 
   let metaPlugins = [
     {
-      name: 'node-resolve',
       plugin: resolve,
       options: {
         moduleDirectories: ['node_modules', 'web_modules'],
       },
     },
     {
-      name: 'babel',
       plugin: babel,
       options: {
         babelHelpers: 'bundled',
@@ -73,7 +71,6 @@ export function createBasicMetaConfig(userConfig = { output: {} }) {
       },
     },
     {
-      name: 'terser',
       plugin: terser,
     },
   ];

packages/building-rollup/src/createMpaConfig.js

@@ -1,10 +1,11 @@
 import { createSpaMetaConfig } from './createSpaConfig.js';
-import { adjustPluginOptions, metaConfigToRollupConfig } from 'plugins-manager';
+import { adjustPluginOptions, applyPlugins } from 'plugins-manager';
+import { rollupPluginHTML } from '@web/rollup-plugin-html';
 
 export function createMpaConfig(userConfig) {
   const { config, metaPlugins } = createMpaMetaConfig(userConfig);
 
-  const final = metaConfigToRollupConfig(config, metaPlugins);
+  const final = applyPlugins(config, metaPlugins);
   return final;
 }
 
@@ -12,7 +13,7 @@ export function createMpaMetaConfig(userConfig = { output: {}, setupPlugins: []
   const { config, metaPlugins } = createSpaMetaConfig(userConfig);
 
   config.setupPlugins = [
-    adjustPluginOptions('html', {
+    adjustPluginOptions(rollupPluginHTML, {
       flattenOutput: false,
     }),
     ...config.setupPlugins,

packages/building-rollup/src/createServiceWorkerConfig.js

@@ -3,13 +3,13 @@ import { terser } from 'rollup-plugin-terser';
 import babelPkg from '@rollup/plugin-babel';
 import replace from '@rollup/plugin-replace';
 
-import { metaConfigToRollupConfig } from 'plugins-manager';
+import { applyPlugins } from 'plugins-manager';
 
 const { babel } = babelPkg;
 
 export function createServiceWorkerConfig(userConfig) {
   const { config, metaPlugins } = createServiceWorkerMetaConfig(userConfig);
-  return metaConfigToRollupConfig(config, metaPlugins);
+  return applyPlugins(config, metaPlugins);
 }
 
 export function createServiceWorkerMetaConfig(userConfig = { output: {} }) {
@@ -33,21 +33,18 @@ export function createServiceWorkerMetaConfig(userConfig = { output: {} }) {
 
   let metaPlugins = [
     {
-      name: 'node-resolve',
       plugin: resolve,
       options: {
         moduleDirectories: ['node_modules', 'web_modules'],
       },
     },
     {
-      name: 'replace',
       plugin: replace,
       options: {
         'process.env.NODE_ENV': JSON.stringify(developmentMode ? 'development' : 'production'),
       },
     },
     {
-      name: 'babel',
       plugin: babel,
       options: {
         babelHelpers: 'bundled',
@@ -74,7 +71,6 @@ export function createServiceWorkerMetaConfig(userConfig = { output: {} }) {
       },
     },
     {
-      name: 'terser',
       plugin: terser,
       options: {
         mangle: {

packages/building-rollup/src/createSpaConfig.js

@@ -1,13 +1,13 @@
 import { rollupPluginHTML } from '@web/rollup-plugin-html';
 import { importMetaAssets } from '@web/rollup-plugin-import-meta-assets';
 import { polyfillsLoader } from '@web/rollup-plugin-polyfills-loader';
-import { metaConfigToRollupConfig } from 'plugins-manager';
+import { applyPlugins } from 'plugins-manager';
 
 import { createBasicMetaConfig } from './createBasicConfig.js';
 
 export function createSpaConfig(userConfig) {
   const { config, metaPlugins } = createSpaMetaConfig(userConfig);
-  return metaConfigToRollupConfig(config, metaPlugins);
+  return applyPlugins(config, metaPlugins);
 }
 
 export function createSpaMetaConfig(userConfig = { output: {} }) {
@@ -30,7 +30,6 @@ export function createSpaMetaConfig(userConfig = { output: {} }) {
   const spaMetaPlugins = [
     ...metaPlugins,
     {
-      name: 'html',
       plugin: rollupPluginHTML,
       options: {
         rootDir,
@@ -38,11 +37,9 @@ export function createSpaMetaConfig(userConfig = { output: {} }) {
       },
     },
     {
-      name: 'import-meta-assets',
       plugin: importMetaAssets,
     },
     {
-      name: 'polyfills-loader',
       plugin: polyfillsLoader,
       options: {
         polyfills: {},

packages/cli/CHANGELOG.md

@@ -1,5 +1,74 @@
 # @rocket/cli
 
+## 0.10.0
+
+### Minor Changes
+
+- 70bb7a1: BREAKING CHANGE: Update to latest plugins manager to get type safe options
+
+  There is no longer a name string as a key for a plugin. It is identified by it's function/class. You will need to adjust your code if you are adding or adjusting plugins.
+
+  ```diff
+  - addPlugin({ name: 'my-plugin', plugin: myPlugin, options: { myFlag: true }, location: 'top' });
+  + addPlugin(myPlugin, { myFlag: true }, { location: 'top' });
+  - adjustPluginOptions('my-plugin', { myFlag: true });
+  + adjustPluginOptions(myPlugin, { myFlag: true });
+  ```
+
+  For more details please see the [Changelog](https://github.com/modernweb-dev/rocket/blob/main/packages/plugins-manager/CHANGELOG.md#030) of the plugins-manager package.
+
+### Patch Changes
+
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+  - plugins-manager@0.3.0
+  - @rocket/eleventy-plugin-mdjs-unified@0.6.0
+  - @rocket/building-rollup@0.4.0
+
+## 0.9.11
+
+### Patch Changes
+
+- 7301a0f: Pass on rocketConfig to the eleventy function to enable conditional configurations/filters
+- 42418f2: Disable the service worker for local development
+- 5ac6aa6: Set the encoding of the simulator to utf8 via a html meta tag
+
+## 0.9.10
+
+### Patch Changes
+
+- 738941a: In `rocket.config.js` you can now supply a rollup config function.
+
+  ```js
+  export default {
+    rollup: config => {
+      // config will be the fully generated config object after all presets have been applied
+      if (config.plugins.includes('...')) {
+        // change some config options
+      }
+      return config;
+    },
+  };
+  ```
+
+## 0.9.9
+
+### Patch Changes
+
+- adf0f1d: use img openEnd to insert responsive image
+
+## 0.9.8
+
+### Patch Changes
+
+- a5661b8: Updates dependencies
+
 ## 0.9.7
 
 ### Patch Changes

packages/cli/index.cjs

@@ -1,10 +1,26 @@
 const { setComputedConfig, getComputedConfig } = require('./src/public/computedConfig.cjs');
-const { generateEleventyComputed } = require('./src/public/generateEleventyComputed.cjs');
+const {
+  generateEleventyComputed,
+  LayoutPlugin,
+  TitleMetaPlugin,
+  TitlePlugin,
+  EleventyNavigationPlugin,
+  SectionPlugin,
+  SocialMediaImagePlugin,
+  JoiningBlocksPlugin,
+} = require('./src/public/generateEleventyComputed.cjs');
 const { createSocialImage } = require('./src/public/createSocialImage.cjs');
 
 module.exports = {
   setComputedConfig,
   getComputedConfig,
   generateEleventyComputed,
+  LayoutPlugin,
+  TitleMetaPlugin,
+  TitlePlugin,
+  EleventyNavigationPlugin,
+  SectionPlugin,
+  SocialMediaImagePlugin,
+  JoiningBlocksPlugin,
   createSocialImage,
 };

packages/cli/index.js

@@ -1,3 +1,16 @@
 /** @typedef {import('@rocket/cli/types/main').RocketCliOptions} RocketCliOptions */
 
+export { setComputedConfig, getComputedConfig } from './src/public/computedConfig.cjs';
+export {
+  generateEleventyComputed,
+  LayoutPlugin,
+  TitleMetaPlugin,
+  TitlePlugin,
+  EleventyNavigationPlugin,
+  SectionPlugin,
+  SocialMediaImagePlugin,
+  JoiningBlocksPlugin,
+} from './src/public/generateEleventyComputed.cjs';
+export { createSocialImage } from './src/public/createSocialImage.cjs';
+
 export { RocketCli } from './src/RocketCli.js';

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocket/cli",
-  "version": "0.9.7",
+  "version": "0.10.0",
   "publishConfig": {
     "access": "public"
   },
@@ -57,9 +57,9 @@
   "dependencies": {
     "@11ty/eleventy": "^0.11.1",
     "@11ty/eleventy-img": "^0.9.0",
-    "@rocket/building-rollup": "^0.3.1",
+    "@rocket/building-rollup": "^0.4.0",
     "@rocket/core": "^0.1.2",
-    "@rocket/eleventy-plugin-mdjs-unified": "^0.5.1",
+    "@rocket/eleventy-plugin-mdjs-unified": "^0.6.0",
     "@rocket/eleventy-rocket-nav": "^0.3.0",
     "@rollup/plugin-babel": "^5.2.2",
     "@rollup/plugin-node-resolve": "^11.0.1",
@@ -72,7 +72,7 @@
     "command-line-usage": "^6.1.1",
     "fs-extra": "^9.0.1",
     "micromatch": "^4.0.2",
-    "plugins-manager": "^0.2.3",
+    "plugins-manager": "^0.3.0",
     "slash": "^3.0.0",
     "utf8": "^3.0.0",
     "workbox-window": "^6.1.5"

packages/cli/preset/_includes/_joiningBlocks/bottom/180-register-service-worker.njk

@@ -4,4 +4,6 @@
   window.__rocketServiceWorkerUrl = '{{ rocketServiceWorkerUrl | url }}';
 </script>
 
+{% if rocketConfig.command == 'build' %}
 <script type="module" inject-service-worker="" src="{{ '/_assets/scripts/registerServiceWorker.js' | asset | url }}"></script>
+{% endif %}

packages/cli/preset/_includes/layout-simulator.njk

@@ -1,6 +1,7 @@
 <html theme="light" platform="web" lang="en">
   <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="utf-8">
     <style type="text/css">
       body {
         margin: 0;

packages/cli/src/RocketBuild.js

@@ -5,6 +5,7 @@ import { rollup } from 'rollup';
 import fs from 'fs-extra';
 import path from 'path';
 import { copy } from '@web/rollup-plugin-copy';
+import { rollupPluginHTML } from '@web/rollup-plugin-html';
 
 import { createMpaConfig, createServiceWorkerConfig } from '@rocket/building-rollup';
 import { addPlugin, adjustPluginOptions } from 'plugins-manager';
@@ -25,18 +26,14 @@ async function buildAndWrite(config) {
 
 async function productionBuild(config) {
   const defaultSetupPlugins = [
-    addPlugin({
-      name: 'copy',
-      plugin: copy,
-      options: {
-        patterns: ['!(*.md|*.html)*', '_merged_assets/_static/**/*'],
-        rootDir: config.outputDevDir,
-      },
+    addPlugin(copy, {
+      patterns: ['!(*.md|*.html)*', '_merged_assets/_static/**/*'],
+      rootDir: config.outputDevDir,
     }),
   ];
   if (config.pathPrefix) {
     defaultSetupPlugins.push(
-      adjustPluginOptions('html', { absolutePathPrefix: config.pathPrefix }),
+      adjustPluginOptions(rollupPluginHTML, { absolutePathPrefix: config.pathPrefix }),
     );
   }
 
@@ -54,8 +51,8 @@ async function productionBuild(config) {
       ...config.setupBuildPlugins,
     ],
   });
-
-  await buildAndWrite(mpaConfig);
+  const finalConfig = typeof config.rollup === 'function' ? config.rollup(mpaConfig) : mpaConfig;
+  await buildAndWrite(finalConfig);
 
   const serviceWorkerSourcePath = path.resolve('docs/_merged_assets/service-worker.js');
   if (fs.existsSync(serviceWorkerSourcePath)) {

packages/cli/src/RocketStart.js

@@ -1,11 +1,61 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { startDevServer } from '@web/dev-server';
 import { fromRollup } from '@web/dev-server-rollup';
-import { metaConfigToWebDevServerConfig } from 'plugins-manager';
+import { executeSetupFunctions } from 'plugins-manager';
 
 /** @typedef {import('../types/main').RocketCliOptions} RocketCliOptions */
 /** @typedef {import('@web/dev-server').DevServerConfig} DevServerConfig */
 
+/**
+ * @param {any} config
+ * @param {MetaPluginWrapable[]} metaPlugins
+ * @param {object} [options]
+ * @param {function | null} [options.rollupWrapperFunction]
+ */
+export function metaConfigToWebDevServerConfig(
+  config,
+  metaPlugins,
+  { rollupWrapperFunction = null } = {},
+) {
+  if (config.plugins) {
+    delete config.setupPlugins;
+    delete config.setupRollupPlugins;
+    return config;
+  }
+
+  const metaPluginsNoWrap = metaPlugins.map(pluginObj => {
+    pluginObj.__noWrap = true;
+    return pluginObj;
+  });
+
+  const rollupPlugins = /** @type {MetaPluginWrapable[]} */ (executeSetupFunctions(
+    config.setupRollupPlugins,
+    [...metaPluginsNoWrap],
+  ));
+
+  const wrappedRollupPlugins = rollupPlugins.map(pluginObj => {
+    if (typeof rollupWrapperFunction === 'function' && pluginObj.__noWrap !== true) {
+      pluginObj.plugin = rollupWrapperFunction(pluginObj.plugin);
+    }
+    return pluginObj;
+  });
+
+  const _metaPlugins = executeSetupFunctions(config.setupPlugins, [...wrappedRollupPlugins]);
+
+  const plugins = _metaPlugins.map(pluginObj => {
+    if (pluginObj.options) {
+      return pluginObj.plugin(pluginObj.options);
+    } else {
+      return pluginObj.plugin();
+    }
+  });
+  config.plugins = plugins;
+
+  delete config.setupPlugins;
+  delete config.setupRollupPlugins;
+  return config;
+}
+
 export class RocketStart {
   static pluginName = 'RocketStart';
   commands = ['start'];

packages/cli/src/eleventy-plugins/insertResponsiveImages.cjs

@@ -33,7 +33,7 @@ function replaceBetween({ html, start, end, insert = '' }) {
   const i = start.line;
   const line = lines[i];
   const upToChange = line.slice(0, start.character);
-  const afterChange = line.slice(end.character - 4);
+  const afterChange = line.slice(end.character);
 
   lines[i] = `${upToChange}${insert}${afterChange}`;
   return lines.join('\n');
@@ -103,7 +103,8 @@ function getImages(html, { imagePresets }) {
     if (ev === SaxEventType.CloseTag) {
       const data = /** @type {Tag} */ (/** @type {any} */ (_data));
       if (data.name === 'img') {
-        const { openStart, closeEnd } = data;
+        // Img tag only has open tag.
+        const { openStart, openEnd } = data;
 
         const attributes = getAttributes(data);
         const presetName = getAttribute(data, 'rocket-image');
@@ -127,7 +128,7 @@ function getImages(html, { imagePresets }) {
               title,
               alt,
               openStart,
-              closeEnd,
+              openEnd,
             });
           }
         }
@@ -219,7 +220,7 @@ function updateHtml(html, changes) {
     newHtml = replaceBetween({
       html: newHtml,
       start: change.openStart,
-      end: change.closeEnd,
+      end: change.openEnd,
       insert: change.newHtml,
     });
   }

packages/cli/src/normalizeConfig.js

@@ -174,11 +174,7 @@ export async function normalizeConfig(inConfig) {
   config._presetPaths.push(path.resolve(_inputDirCwdRelative));
 
   /** @type {MetaPlugin[]} */
-  let pluginsMeta = [
-    { name: 'RocketStart', plugin: RocketStart },
-    { name: 'RocketBuild', plugin: RocketBuild },
-    { name: 'RocketLint', plugin: RocketLint },
-  ];
+  let pluginsMeta = [{ plugin: RocketStart }, { plugin: RocketBuild }, { plugin: RocketLint }];
 
   if (Array.isArray(config.setupCliPlugins)) {
     for (const setupFn of config.setupCliPlugins) {

packages/cli/src/public/generateEleventyComputed.cjs

@@ -5,8 +5,10 @@ const { createSocialImage: defaultCreateSocialImage } = require('./createSocialI
 const { getComputedConfig } = require('./computedConfig.cjs');
 const { executeSetupFunctions } = require('plugins-manager');
 
-function titleMetaPlugin() {
-  return async data => {
+class TitleMetaPlugin {
+  static dataName = 'titleMeta';
+
+  async execute(data) {
     if (data.titleMeta) {
       return data.titleMeta;
     }
@@ -17,29 +19,35 @@ function titleMetaPlugin() {
       return titleMetaFromContent;
     }
     return {};
-  };
+  }
 }
 
-function titlePlugin() {
-  return async data => {
+class TitlePlugin {
+  static dataName = 'title';
+
+  async execute(data) {
     if (data.title) {
       return data.title;
     }
     return data.titleMeta?.title;
-  };
+  }
 }
 
-function eleventyNavigationPlugin() {
-  return async data => {
+class EleventyNavigationPlugin {
+  static dataName = 'eleventyNavigation';
+
+  async execute(data) {
     if (data.eleventyNavigation) {
       return data.eleventyNavigation;
     }
     return data.titleMeta?.eleventyNavigation;
-  };
+  }
 }
 
-function sectionPlugin() {
-  return async data => {
+class SectionPlugin {
+  static dataName = 'section';
+
+  async execute(data) {
     if (data.section) {
       return data.section;
     }
@@ -52,11 +60,17 @@ function sectionPlugin() {
         return parts[1];
       }
     }
-  };
+  }
 }
 
-function layoutPlugin({ defaultLayout = 'layout-default' } = {}) {
-  return async data => {
+class LayoutPlugin {
+  static dataName = 'layout';
+
+  constructor({ defaultLayout = 'layout-default' } = {}) {
+    this.defaultLayout = defaultLayout;
+  }
+
+  async execute(data) {
     if (data.layout) {
       return data.layout;
     }
@@ -66,22 +80,29 @@ function layoutPlugin({ defaultLayout = 'layout-default' } = {}) {
         return 'layout-index';
       }
     }
-    return defaultLayout;
-  };
+    return this.defaultLayout;
+  }
 }
 
-function socialMediaImagePlugin(args = {}) {
-  const { createSocialImage = defaultCreateSocialImage, rocketConfig = {} } = args;
+class SocialMediaImagePlugin {
+  static dataName = 'socialMediaImage';
 
-  const cleanedUpArgs = { ...args };
-  delete cleanedUpArgs.createSocialImage;
+  constructor(args = {}) {
+    const { createSocialImage = defaultCreateSocialImage, rocketConfig = {} } = args;
 
-  return async data => {
+    this.cleanedUpArgs = { ...args };
+    delete this.cleanedUpArgs.createSocialImage;
+
+    this.rocketConfig = rocketConfig;
+    this.createSocialImage = createSocialImage;
+  }
+
+  async execute(data) {
     if (data.socialMediaImage) {
       return data.socialMediaImage;
     }
 
-    if (rocketConfig.createSocialMediaImages === false) {
+    if (this.rocketConfig.createSocialMediaImages === false) {
       return;
     }
 
@@ -95,15 +116,15 @@ function socialMediaImagePlugin(args = {}) {
     const section = data.section ? ' ' + data.section[0].toUpperCase() + data.section.slice(1) : '';
     const footer = `${data.site.name}${section}`;
 
-    const imgUrl = await createSocialImage({
+    const imgUrl = await this.createSocialImage({
       title,
       subTitle,
       footer,
       section,
-      ...cleanedUpArgs,
+      ...this.cleanedUpArgs,
     });
     return imgUrl;
-  };
+  }
 }
 
 function sortByOrder(a, b) {
@@ -146,26 +167,31 @@ async function dirToTree(sourcePath, extra = '') {
   return sortedTree;
 }
 
-function joiningBlocksPlugin(rocketConfig) {
-  const { _inputDirCwdRelative } = rocketConfig;
-  const partialsSource = path.resolve(_inputDirCwdRelative, '_merged_includes');
-  return async () => {
-    const joiningBlocks = await dirToTree(partialsSource, '_joiningBlocks');
+class JoiningBlocksPlugin {
+  static dataName = '_joiningBlocks';
+
+  constructor(rocketConfig) {
+    const { _inputDirCwdRelative } = rocketConfig;
+    this.partialsSource = path.resolve(_inputDirCwdRelative, '_merged_includes');
+  }
+
+  async execute() {
+    const joiningBlocks = await dirToTree(this.partialsSource, '_joiningBlocks');
     return joiningBlocks;
-  };
+  }
 }
 
 function generateEleventyComputed() {
   const rocketConfig = getComputedConfig();
 
   let metaPlugins = [
-    { name: 'titleMeta', plugin: titleMetaPlugin },
-    { name: 'title', plugin: titlePlugin },
-    { name: 'eleventyNavigation', plugin: eleventyNavigationPlugin },
-    { name: 'section', plugin: sectionPlugin },
-    { name: 'socialMediaImage', plugin: socialMediaImagePlugin, options: { rocketConfig } },
-    { name: '_joiningBlocks', plugin: joiningBlocksPlugin, options: rocketConfig },
-    { name: 'layout', plugin: layoutPlugin },
+    { plugin: TitleMetaPlugin, options: {} },
+    { plugin: TitlePlugin, options: {} },
+    { plugin: EleventyNavigationPlugin, options: {} },
+    { plugin: SectionPlugin, options: {} },
+    { plugin: SocialMediaImagePlugin, options: { rocketConfig } },
+    { plugin: JoiningBlocksPlugin, options: rocketConfig },
+    { plugin: LayoutPlugin, options: {} },
   ];
 
   const finalMetaPlugins = executeSetupFunctions(
@@ -176,13 +202,24 @@ function generateEleventyComputed() {
   const eleventyComputed = {};
   for (const pluginObj of finalMetaPlugins) {
     if (pluginObj.options) {
-      eleventyComputed[pluginObj.name] = pluginObj.plugin(pluginObj.options);
+      const inst = new pluginObj.plugin(pluginObj.options);
+      eleventyComputed[inst.constructor.dataName] = inst.execute.bind(inst);
     } else {
-      eleventyComputed[pluginObj.name] = pluginObj.plugin();
+      const inst = new pluginObj.plugin();
+      eleventyComputed[inst.constructor.dataName] = inst.execute.bind(inst);
     }
   }
 
   return eleventyComputed;
 }
 
-module.exports = { generateEleventyComputed };
+module.exports = {
+  generateEleventyComputed,
+  LayoutPlugin,
+  TitleMetaPlugin,
+  TitlePlugin,
+  EleventyNavigationPlugin,
+  SectionPlugin,
+  SocialMediaImagePlugin,
+  JoiningBlocksPlugin,
+};

packages/cli/src/shared/.eleventy.cjs

@@ -1,5 +1,6 @@
 const eleventyPluginMdjsUnified = require('@rocket/eleventy-plugin-mdjs-unified');
 const eleventyRocketNav = require('@rocket/eleventy-rocket-nav');
+const remark2rehype = require('remark-rehype');
 
 const { getComputedConfig } = require('../public/computedConfig.cjs');
 const rocketFilters = require('../eleventy-plugins/rocketFilters.cjs');
@@ -9,7 +10,7 @@ const { adjustPluginOptions } = require('plugins-manager');
 const image = require('./mdjsImageHandler.cjs');
 
 const defaultSetupUnifiedPlugins = [
-  adjustPluginOptions('remark2rehype', {
+  adjustPluginOptions(remark2rehype, {
     handlers: {
       image,
     },
@@ -23,28 +24,24 @@ module.exports = function (eleventyConfig) {
 
   let metaPlugins = [
     {
-      name: 'rocket-filters',
       plugin: rocketFilters,
       options: { _inputDirCwdRelative },
     },
     {
-      name: 'rocket-copy',
       plugin: rocketCopy,
       options: { _inputDirCwdRelative },
     },
     {
-      name: 'eleventy-plugin-mdjs-unified',
       plugin: eleventyPluginMdjsUnified,
       options: {
         setupUnifiedPlugins: [...defaultSetupUnifiedPlugins, ...config.setupUnifiedPlugins],
       },
     },
     {
-      name: 'eleventy-rocket-nav',
       plugin: eleventyRocketNav,
+      options: {},
     },
     {
-      name: 'rocket-collections',
       plugin: rocketCollections,
       options: { _inputDirCwdRelative },
     },
@@ -69,7 +66,7 @@ module.exports = function (eleventyConfig) {
   }
 
   if (config.eleventy) {
-    const returnValue = config.eleventy(eleventyConfig);
+    const returnValue = config.eleventy(eleventyConfig, config);
     if (returnValue) {
       const returnString = JSON.stringify(returnValue, null, 2);
       const msg = [

packages/cli/test-node/RocketCli.e2e.test.js

@@ -188,4 +188,39 @@ describe('RocketCli e2e', () => {
       errorMatch: /Found 1 missing reference targets/,
     });
   });
+
+  it('can completely take over the rollup config', async () => {
+    cli = await executeBuild('e2e-fixtures/rollup-override/rocket.config.js');
+
+    const indexHtml = await readBuildOutput(cli, 'index.html', {
+      stripToBody: true,
+      formatHtml: true,
+    });
+    expect(indexHtml).to.equal(
+      [
+        '<h1 id="importing-foo">',
+        '  <a aria-hidden="true" tabindex="-1" href="#importing-foo"><span class="icon icon-link"></span></a',
+        '  >Importing foo',
+        '</h1>',
+        '',
+        '<script type="module" src="./7338509a.js" mdjs-setup=""></script>',
+      ].join('\n'),
+    );
+  });
+
+  describe('can adjust the eleventy config while having access to the rocketConfig', () => {
+    it('testing start', async () => {
+      cli = await executeStart('e2e-fixtures/adjust-eleventy-config/rocket.config.js');
+      const indexHtml = await readStartOutput(cli, 'index.html');
+      expect(indexHtml).to.equal('<p><a href="start:/path/to/page/">link</a></p>');
+    });
+
+    it('testing build', async () => {
+      cli = await executeBuild('e2e-fixtures/adjust-eleventy-config/rocket.config.js');
+      const indexBuildHtml = await readBuildOutput(cli, 'index.html', {
+        stripToBody: true,
+      });
+      expect(indexBuildHtml).to.equal('<p><a href="build:/path/to/page/">link</a></p>');
+    });
+  });
 });

packages/cli/test-node/RocketCli.images.test.js

@@ -101,6 +101,52 @@ describe('RocketCli images', () => {
           '</p>',
         ].join('\n'),
       );
+
+      const tableHtml = await readStartOutput(cli, 'table/index.html', {
+        formatHtml: true,
+        replaceImageHashes: true,
+      });
+      expect(tableHtml).to.equal(
+        [
+          '<table>',
+          '  <thead>',
+          '    <tr>',
+          '      <th>Image</th>',
+          '    </tr>',
+          '  </thead>',
+          '  <tbody>',
+          '    <tr>',
+          '      <td>',
+          '        <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>',
+          '      </td>',
+          '    </tr>',
+          '  </tbody>',
+          '</table>',
+        ].join('\n'),
+      );
     });
 
     it('can configure more patterns to ignore', async () => {

packages/cli/test-node/RocketCli.preset.test.js

@@ -86,12 +86,6 @@ describe('RocketCli preset', () => {
         '    </div>',
         '',
         '    <footer id="main-footer"></footer>',
-        '',
-        '    <script',
-        '      type="module"',
-        '      inject-service-worker=""',
-        '      src="/_merged_assets/scripts/registerServiceWorker.js"',
-        '    ></script>',
         '  </body>',
         '</html>',
       ].join('\n'),

packages/cli/test-node/computed-config-fixtures/image-link/rocket.config.js

@@ -1,3 +1,4 @@
+import remark2rehype from 'remark-rehype';
 import { adjustPluginOptions } from 'plugins-manager';
 
 function image(h, node) {
@@ -10,7 +11,7 @@ function image(h, node) {
 /** @type {Partial<import("../../../types/main").RocketCliOptions>} */
 const config = {
   setupUnifiedPlugins: [
-    adjustPluginOptions('remark2rehype', {
+    adjustPluginOptions(remark2rehype, {
       handlers: {
         image,
       },

packages/cli/test-node/computed-config-fixtures/setup/addPlugin.rocket.config.js

@@ -1,8 +1,16 @@
 import { addPlugin } from 'plugins-manager';
 
+class Test {
+  static dataName = 'test';
+
+  execute() {
+    return 'test-value';
+  }
+}
+
 /** @type {Partial<import("../../../types/main").RocketCliOptions>} */
 const config = {
-  setupEleventyComputedConfig: [addPlugin({ name: 'test', plugin: () => 'test-value' })],
+  setupEleventyComputedConfig: [addPlugin(Test)],
 };
 
 export default config;

packages/cli/test-node/computed-config-fixtures/social-images-override/rocket.config.js

@@ -1,4 +1,5 @@
 import { adjustPluginOptions } from 'plugins-manager';
+import { SocialMediaImagePlugin } from '@rocket/cli';
 
 /** @type {Partial<import("../../../types/main").RocketCliOptions>} */
 const config = {
@@ -6,7 +7,7 @@ const config = {
     createSocialMediaImages: true,
   },
   setupEleventyComputedConfig: [
-    adjustPluginOptions('socialMediaImage', {
+    adjustPluginOptions(SocialMediaImagePlugin, {
       createSocialImageSvg: async () => {
         return `
           <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1200 630">

packages/cli/test-node/e2e-fixtures/adjust-eleventy-config/docs/.eleventyignore

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

packages/cli/test-node/e2e-fixtures/adjust-eleventy-config/docs/index.md

@@ -0,0 +1,5 @@
+---
+layout: layout-raw
+---
+
+<a href="{{ '/path/to/page/' | conditional-resolve }}">link</a>

packages/cli/test-node/e2e-fixtures/adjust-eleventy-config/rocket.config.js

@@ -0,0 +1,15 @@
+/** @type {Partial<import("../../../types/main").RocketCliOptions>} */
+const config = {
+  eleventy: (config, rocketConfig) => {
+    config.addFilter('conditional-resolve', value => {
+      if (rocketConfig.command === 'build') {
+        return `build:${value}`;
+      }
+      if (rocketConfig.command === 'start') {
+        return `start:${value}`;
+      }
+    });
+  },
+};
+
+export default config;

packages/cli/test-node/e2e-fixtures/images/docs/table.md

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

packages/cli/test-node/e2e-fixtures/rollup-override/docs/.eleventyignore

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

packages/cli/test-node/e2e-fixtures/rollup-override/docs/index.md

@@ -0,0 +1,11 @@
+---
+layout: layout-raw
+---
+
+# Importing foo
+
+```js script
+import { foo } from './not-foo.js';
+
+console.log(foo);
+```

packages/cli/test-node/e2e-fixtures/rollup-override/docs/not-foo.js

@@ -0,0 +1 @@
+export const notFoo = 'not-foo';

packages/cli/test-node/e2e-fixtures/rollup-override/rocket.config.js

@@ -0,0 +1,11 @@
+// @ts-no-check
+
+/** @type {Partial<import("../../../types/main").RocketCliOptions>} */
+const config = {
+  rollup: config => ({
+    ...config,
+    shimMissingExports: true,
+  }),
+};
+
+export default config;

packages/cli/test-node/e2e-fixtures/rollup-plugin/devbuild-build.rocket.config.js

@@ -1,11 +1,14 @@
 // @ts-no-check
 import json from '@rollup/plugin-json';
+import { rollupPluginHTML } from '@web/rollup-plugin-html';
 import { addPlugin, adjustPluginOptions } from 'plugins-manager';
 
 /** @type {Partial<import("../../../types/main").RocketCliOptions>} */
 const config = {
-  setupDevAndBuildPlugins: [addPlugin({ name: 'json', plugin: json, location: 'top' })],
-  setupBuildPlugins: [adjustPluginOptions('html', { absoluteBaseUrl: 'https://test-me.com' })],
+  setupDevAndBuildPlugins: [addPlugin(json, {}, { location: 'top' })],
+  setupBuildPlugins: [
+    adjustPluginOptions(rollupPluginHTML, { absoluteBaseUrl: 'https://test-me.com' }),
+  ],
 };
 
 export default config;

packages/cli/test-node/e2e-fixtures/rollup-plugin/devbuild.rocket.config.js

@@ -1,10 +1,9 @@
-// @ts-no-check
 import json from '@rollup/plugin-json';
 import { addPlugin } from 'plugins-manager';
 
 /** @type {Partial<import("../../../types/main").RocketCliOptions>} */
 const config = {
-  setupDevAndBuildPlugins: [addPlugin({ name: 'json', plugin: json, location: 'top' })],
+  setupDevAndBuildPlugins: [addPlugin(json, {}, { location: 'top' })],
   devServer: {
     mimeTypes: {
       // serve all json files as js

packages/cli/test-node/e2e-fixtures/unified-plugin/rocket.config.js

@@ -1,10 +1,11 @@
 // @ts-check
 import emoji from 'remark-emoji';
 import { addPlugin } from 'plugins-manager';
+import markdown from 'remark-parse';
 
 /** @type {Partial<import("../../../types/main").RocketCliOptions>} */
 const config = {
-  setupUnifiedPlugins: [addPlugin({ location: 'markdown', name: 'emoji', plugin: emoji })],
+  setupUnifiedPlugins: [addPlugin(emoji, {}, { location: markdown })],
 };
 
 export default config;

packages/cli/types/main.d.ts

@@ -40,6 +40,7 @@ export interface RocketCliOptions extends Pick<RocketPreset, PresetKeys> {
   start?: RocketStartConfig;
 
   // advanced
+  rollup?: (config: any) => void; // TODO: improve
   devServer?: DevServerConfig;
   eleventy?: (eleventyConfig: any) => void; // TODO: improve
   plugins?: RocketPlugin[];

packages/eleventy-plugin-mdjs-unified/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @rocket/eleventy-plugin-mdjs-unified
 
+## 0.6.0
+
+### Minor Changes
+
+- 70bb7a1: BREAKING CHANGE: Updating to latest version of `@mdjs/core` which requires the latest version of `plugins-manager`
+
+### Patch Changes
+
+- Updated dependencies [70bb7a1]
+  - @mdjs/core@0.9.0
+
+## 0.5.2
+
+### Patch Changes
+
+- 39f4fa7: Updates dependencies
+
 ## 0.5.1
 
 ### Patch Changes

packages/eleventy-plugin-mdjs-unified/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocket/eleventy-plugin-mdjs-unified",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "publishConfig": {
     "access": "public"
   },
@@ -31,7 +31,7 @@
     "mdjs"
   ],
   "dependencies": {
-    "@mdjs/core": "^0.8.1",
+    "@mdjs/core": "^0.9.0",
     "es-module-lexer": "^0.3.26",
     "unist-util-visit": "^2.0.3"
   },

packages/eleventy-plugin-mdjs-unified/src/eleventy-plugin-mdjs-unified.js

@@ -5,6 +5,7 @@ const fs = require('fs');
 const { mdjsProcess } = require('@mdjs/core');
 const visit = require('unist-util-visit');
 const { init, parse } = require('es-module-lexer');
+const markdown = require('remark-parse');
 
 // @ts-ignore
 const { parseTitle } = require('@rocket/core/title');
@@ -45,12 +46,12 @@ function cleanupTitleHeadline() {
  * @param {MdjsProcessPlugin[]} plugins
  */
 function addCleanupTitleHeadline(plugins) {
-  if (plugins.findIndex(plugin => plugin.name === 'cleanupTitleHeadline') === -1) {
+  if (plugins.findIndex(pluginObj => pluginObj.plugin === cleanupTitleHeadline) === -1) {
     // add plugins right after markdown
-    const markdownPluginIndex = plugins.findIndex(plugin => plugin.name === 'markdown');
+    const markdownPluginIndex = plugins.findIndex(pluginObj => pluginObj.plugin === markdown);
     plugins.splice(markdownPluginIndex + 1, 0, {
-      name: 'cleanupTitleHeadline',
       plugin: cleanupTitleHeadline,
+      options: {},
     });
   }
   return plugins;

packages/eleventy-plugin-mdjs-unified/test-node/fixtures/plugin-configure/.eleventy.cjs

@@ -1,8 +1,9 @@
+const htmlHeading = require('rehype-autolink-headings');
 const pluginMdjs = require('../../../index.js');
 
 function addClassAnchorToHtmlHeading(plugins) {
   return plugins.map(pluginObj => {
-    if (pluginObj.name === 'htmlHeading') {
+    if (pluginObj.plugin === htmlHeading) {
       return {
         ...pluginObj,
         options: {

packages/launch/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @rocket/launch
 
+## 0.6.0
+
+### Minor Changes
+
+- 70bb7a1: BREAKING CHANGE: Update to latest plugins manager to get type safe options
+
+  There is no longer a name string as a key for a plugin. It is identified by it's function/class. You will need to adjust your code if you are adding or adjusting plugins.
+
+  ```diff
+  - addPlugin({ name: 'my-plugin', plugin: myPlugin, options: { myFlag: true }, location: 'top' });
+  + addPlugin(myPlugin, { myFlag: true }, { location: 'top' });
+  - adjustPluginOptions('my-plugin', { myFlag: true });
+  + adjustPluginOptions(myPlugin, { myFlag: true });
+  ```
+
+  For more details please see the [Changelog](https://github.com/modernweb-dev/rocket/blob/main/packages/plugins-manager/CHANGELOG.md#030) of the plugins-manager package.
+
+## 0.5.6
+
+### Patch Changes
+
+- 0987a41: Fix styling in darkmode
+
+## 0.5.5
+
+### Patch Changes
+
+- 3d22fbb: Prevent styles from applying to lion components that are rendered in light dom
+
 ## 0.5.4
 
 ### Patch Changes

packages/launch/README.md

@@ -28,16 +28,22 @@ For docs please see our homepage [https://rocket.modern-web.dev/docs/presets/lau
 
 #### CSS Properties
 
-| Name                                           | Description |
-| ---------------------------------------------- | ----------- |
-| --inline-notification-tip-background-color     |             |
-| --inline-notification-tip-border-color         |             |
-| --inline-notification-warning-background-color |             |
-| --inline-notification-warning-border-color     |             |
-| --inline-notification-danger-background-color  |             |
-| --inline-notification-danger-border-color      |             |
-| --inline-notification-warning-heading-color    |             |
-| --inline-notification-danger-heading-color     |             |
+| Name                                           | Default                    | Description |
+| ---------------------------------------------- | -------------------------- | ----------- |
+| --inline-notification-tip-background-color     | `rgba(221, 221, 221, 0.3)` |             |
+| --inline-notification-tip-border-color         | `#42b983`                  |             |
+| --inline-notification-warning-background-color | `rgba(255, 229, 100, 0.2)` |             |
+| --inline-notification-warning-border-color     | `#e7c000`                  |             |
+| --inline-notification-danger-background-color  | `rgba(192, 0, 0, 0.1)`     |             |
+| --inline-notification-danger-border-color      | `#c00`                     |             |
+| --inline-notification-warning-heading-color    | `#b29400`                  |             |
+| --inline-notification-danger-heading-color     | `#900`                     |             |
+
+#### CSS Parts
+
+| Name  | Description       |
+| ----- | ----------------- |
+| title | the title heading |
 
 <hr/>
 

packages/launch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocket/launch",
-  "version": "0.5.4",
+  "version": "0.6.0",
   "publishConfig": {
     "access": "public"
   },

packages/launch/preset/_assets/markdown.css

@@ -1,7 +1,6 @@
 @font-face {
   font-family: octicons-link;
-  src:
-    url(data:font/woff;charset=utf-8;base64,d09GRgABAAAAAAZwABAAAAAACFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABEU0lHAAAGaAAAAAgAAAAIAAAAAUdTVUIAAAZcAAAACgAAAAoAAQAAT1MvMgAAAyQAAABJAAAAYFYEU3RjbWFwAAADcAAAAEUAAACAAJThvmN2dCAAAATkAAAABAAAAAQAAAAAZnBnbQAAA7gAAACyAAABCUM+8IhnYXNwAAAGTAAAABAAAAAQABoAI2dseWYAAAFsAAABPAAAAZwcEq9taGVhZAAAAsgAAAA0AAAANgh4a91oaGVhAAADCAAAABoAAAAkCA8DRGhtdHgAAAL8AAAADAAAAAwGAACfbG9jYQAAAsAAAAAIAAAACABiATBtYXhwAAACqAAAABgAAAAgAA8ASm5hbWUAAAToAAABQgAAAlXu73sOcG9zdAAABiwAAAAeAAAAME3QpOBwcmVwAAAEbAAAAHYAAAB/aFGpk3jaTY6xa8JAGMW/O62BDi0tJLYQincXEypYIiGJjSgHniQ6umTsUEyLm5BV6NDBP8Tpts6F0v+k/0an2i+itHDw3v2+9+DBKTzsJNnWJNTgHEy4BgG3EMI9DCEDOGEXzDADU5hBKMIgNPZqoD3SilVaXZCER3/I7AtxEJLtzzuZfI+VVkprxTlXShWKb3TBecG11rwoNlmmn1P2WYcJczl32etSpKnziC7lQyWe1smVPy/Lt7Kc+0vWY/gAgIIEqAN9we0pwKXreiMasxvabDQMM4riO+qxM2ogwDGOZTXxwxDiycQIcoYFBLj5K3EIaSctAq2kTYiw+ymhce7vwM9jSqO8JyVd5RH9gyTt2+J/yUmYlIR0s04n6+7Vm1ozezUeLEaUjhaDSuXHwVRgvLJn1tQ7xiuVv/ocTRF42mNgZGBgYGbwZOBiAAFGJBIMAAizAFoAAABiAGIAznjaY2BkYGAA4in8zwXi+W2+MjCzMIDApSwvXzC97Z4Ig8N/BxYGZgcgl52BCSQKAA3jCV8CAABfAAAAAAQAAEB42mNgZGBg4f3vACQZQABIMjKgAmYAKEgBXgAAeNpjYGY6wTiBgZWBg2kmUxoDA4MPhGZMYzBi1AHygVLYQUCaawqDA4PChxhmh/8ODDEsvAwHgMKMIDnGL0x7gJQCAwMAJd4MFwAAAHjaY2BgYGaA4DAGRgYQkAHyGMF8NgYrIM3JIAGVYYDT+AEjAwuDFpBmA9KMDEwMCh9i/v8H8sH0/4dQc1iAmAkALaUKLgAAAHjaTY9LDsIgEIbtgqHUPpDi3gPoBVyRTmTddOmqTXThEXqrob2gQ1FjwpDvfwCBdmdXC5AVKFu3e5MfNFJ29KTQT48Ob9/lqYwOGZxeUelN2U2R6+cArgtCJpauW7UQBqnFkUsjAY/kOU1cP+DAgvxwn1chZDwUbd6CFimGXwzwF6tPbFIcjEl+vvmM/byA48e6tWrKArm4ZJlCbdsrxksL1AwWn/yBSJKpYbq8AXaaTb8AAHja28jAwOC00ZrBeQNDQOWO//sdBBgYGRiYWYAEELEwMTE4uzo5Zzo5b2BxdnFOcALxNjA6b2ByTswC8jYwg0VlNuoCTWAMqNzMzsoK1rEhNqByEyerg5PMJlYuVueETKcd/89uBpnpvIEVomeHLoMsAAe1Id4AAAAAAAB42oWQT07CQBTGv0JBhagk7HQzKxca2sJCE1hDt4QF+9JOS0nbaaYDCQfwCJ7Au3AHj+LO13FMmm6cl7785vven0kBjHCBhfpYuNa5Ph1c0e2Xu3jEvWG7UdPDLZ4N92nOm+EBXuAbHmIMSRMs+4aUEd4Nd3CHD8NdvOLTsA2GL8M9PODbcL+hD7C1xoaHeLJSEao0FEW14ckxC+TU8TxvsY6X0eLPmRhry2WVioLpkrbp84LLQPGI7c6sOiUzpWIWS5GzlSgUzzLBSikOPFTOXqly7rqx0Z1Q5BAIoZBSFihQYQOOBEdkCOgXTOHA07HAGjGWiIjaPZNW13/+lm6S9FT7rLHFJ6fQbkATOG1j2OFMucKJJsxIVfQORl+9Jyda6Sl1dUYhSCm1dyClfoeDve4qMYdLEbfqHf3O/AdDumsjAAB42mNgYoAAZQYjBmyAGYQZmdhL8zLdDEydARfoAqIAAAABAAMABwAKABMAB///AA8AAQAAAAAAAAAAAAAAAAABAAAAAA==)
+  src: url(data:font/woff;charset=utf-8;base64,d09GRgABAAAAAAZwABAAAAAACFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABEU0lHAAAGaAAAAAgAAAAIAAAAAUdTVUIAAAZcAAAACgAAAAoAAQAAT1MvMgAAAyQAAABJAAAAYFYEU3RjbWFwAAADcAAAAEUAAACAAJThvmN2dCAAAATkAAAABAAAAAQAAAAAZnBnbQAAA7gAAACyAAABCUM+8IhnYXNwAAAGTAAAABAAAAAQABoAI2dseWYAAAFsAAABPAAAAZwcEq9taGVhZAAAAsgAAAA0AAAANgh4a91oaGVhAAADCAAAABoAAAAkCA8DRGhtdHgAAAL8AAAADAAAAAwGAACfbG9jYQAAAsAAAAAIAAAACABiATBtYXhwAAACqAAAABgAAAAgAA8ASm5hbWUAAAToAAABQgAAAlXu73sOcG9zdAAABiwAAAAeAAAAME3QpOBwcmVwAAAEbAAAAHYAAAB/aFGpk3jaTY6xa8JAGMW/O62BDi0tJLYQincXEypYIiGJjSgHniQ6umTsUEyLm5BV6NDBP8Tpts6F0v+k/0an2i+itHDw3v2+9+DBKTzsJNnWJNTgHEy4BgG3EMI9DCEDOGEXzDADU5hBKMIgNPZqoD3SilVaXZCER3/I7AtxEJLtzzuZfI+VVkprxTlXShWKb3TBecG11rwoNlmmn1P2WYcJczl32etSpKnziC7lQyWe1smVPy/Lt7Kc+0vWY/gAgIIEqAN9we0pwKXreiMasxvabDQMM4riO+qxM2ogwDGOZTXxwxDiycQIcoYFBLj5K3EIaSctAq2kTYiw+ymhce7vwM9jSqO8JyVd5RH9gyTt2+J/yUmYlIR0s04n6+7Vm1ozezUeLEaUjhaDSuXHwVRgvLJn1tQ7xiuVv/ocTRF42mNgZGBgYGbwZOBiAAFGJBIMAAizAFoAAABiAGIAznjaY2BkYGAA4in8zwXi+W2+MjCzMIDApSwvXzC97Z4Ig8N/BxYGZgcgl52BCSQKAA3jCV8CAABfAAAAAAQAAEB42mNgZGBg4f3vACQZQABIMjKgAmYAKEgBXgAAeNpjYGY6wTiBgZWBg2kmUxoDA4MPhGZMYzBi1AHygVLYQUCaawqDA4PChxhmh/8ODDEsvAwHgMKMIDnGL0x7gJQCAwMAJd4MFwAAAHjaY2BgYGaA4DAGRgYQkAHyGMF8NgYrIM3JIAGVYYDT+AEjAwuDFpBmA9KMDEwMCh9i/v8H8sH0/4dQc1iAmAkALaUKLgAAAHjaTY9LDsIgEIbtgqHUPpDi3gPoBVyRTmTddOmqTXThEXqrob2gQ1FjwpDvfwCBdmdXC5AVKFu3e5MfNFJ29KTQT48Ob9/lqYwOGZxeUelN2U2R6+cArgtCJpauW7UQBqnFkUsjAY/kOU1cP+DAgvxwn1chZDwUbd6CFimGXwzwF6tPbFIcjEl+vvmM/byA48e6tWrKArm4ZJlCbdsrxksL1AwWn/yBSJKpYbq8AXaaTb8AAHja28jAwOC00ZrBeQNDQOWO//sdBBgYGRiYWYAEELEwMTE4uzo5Zzo5b2BxdnFOcALxNjA6b2ByTswC8jYwg0VlNuoCTWAMqNzMzsoK1rEhNqByEyerg5PMJlYuVueETKcd/89uBpnpvIEVomeHLoMsAAe1Id4AAAAAAAB42oWQT07CQBTGv0JBhagk7HQzKxca2sJCE1hDt4QF+9JOS0nbaaYDCQfwCJ7Au3AHj+LO13FMmm6cl7785vven0kBjHCBhfpYuNa5Ph1c0e2Xu3jEvWG7UdPDLZ4N92nOm+EBXuAbHmIMSRMs+4aUEd4Nd3CHD8NdvOLTsA2GL8M9PODbcL+hD7C1xoaHeLJSEao0FEW14ckxC+TU8TxvsY6X0eLPmRhry2WVioLpkrbp84LLQPGI7c6sOiUzpWIWS5GzlSgUzzLBSikOPFTOXqly7rqx0Z1Q5BAIoZBSFihQYQOOBEdkCOgXTOHA07HAGjGWiIjaPZNW13/+lm6S9FT7rLHFJ6fQbkATOG1j2OFMucKJJsxIVfQORl+9Jyda6Sl1dUYhSCm1dyClfoeDve4qMYdLEbfqHf3O/AdDumsjAAB42mNgYoAAZQYjBmyAGYQZmdhL8zLdDEydARfoAqIAAAABAAMABwAKABMAB///AA8AAQAAAAAAAAAAAAAAAAABAAAAAA==)
     format('woff');
 }
 
@@ -121,7 +120,7 @@
   overflow: visible;
 }
 
-.markdown-body [type='checkbox'] {
+.markdown-body input[type='checkbox'] {
   box-sizing: border-box;
   padding: 0;
 }

packages/launch/preset/_assets/variables.css

@@ -5,6 +5,7 @@ html {
   --primary-color-accent: #cee5f6;
   --primary-text-color: #2c3e50;
   --primary-lines-color: #ccc;
+  --primary-text-inverse-color: #eee;
 
   /* Contrast colors */
   --contrast-color-light: #fff;
@@ -19,6 +20,10 @@ html {
   --primary-font-family: 'Open Sans', sans-serif;
   --secondary-font-family: 'Montserrat', sans-serif;
   --monospace-font-family: 'SFMono-Regular', 'Consolas', 'Liberation Mono', 'Menlo', 'Courier', monospace;
+
+  /* controls */
+  --switch-unselected-color: #808080;
+  --switch-selected-color: #42b983;
 }
 
 html.dark {
@@ -27,6 +32,7 @@ html.dark {
   --primary-color-darker: #a22831;
   --primary-color-accent: #cee5f6;
   --primary-text-color: #eee;
+  --primary-text-inverse-color: #2c3e50;
 
   /* Contrast colors */
   --contrast-color-light: #fff;
@@ -39,6 +45,10 @@ html.dark {
   /* typography */
   --text-color: white;
 
+  /* controls */
+  --switch-unselected-color: #808080;
+  --switch-selected-color: #42b983;
+
   /* markdown */
   --markdown-octicon-link: white;
   --markdown-syntax-background-color: #a0a0a0;

packages/launch/preset/rocketLaunch.js

@@ -2,12 +2,14 @@ import path from 'path';
 import { adjustPluginOptions } from 'plugins-manager';
 // import { addPlugin } from 'plugins-manager';
 import { fileURLToPath } from 'url';
+import { LayoutPlugin } from '@rocket/cli';
+import htmlHeading from 'rehype-autolink-headings';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 function addOcticonToHeadlines(plugins) {
   return plugins.map(pluginObj => {
-    if (pluginObj.name === 'htmlHeading') {
+    if (pluginObj.plugin === htmlHeading) {
       return {
         ...pluginObj,
         options: {
@@ -50,7 +52,7 @@ export function rocketLaunch() {
     path: path.resolve(__dirname),
     setupUnifiedPlugins: [addOcticonToHeadlines],
     setupEleventyComputedConfig: [
-      adjustPluginOptions('layout', { defaultLayout: 'layout-sidebar' }),
+      adjustPluginOptions(LayoutPlugin, { defaultLayout: 'layout-sidebar' }),
     ],
     adjustImagePresets: imagePresets => ({
       ...imagePresets,

packages/launch/test-node/RocketLaunch.preset.test.js

@@ -244,12 +244,6 @@ describe('RocketLaunch preset', () => {
         '    </footer>',
         '',
         '    <script type="module" src="/_merged_assets/scripts/init-navigation.js"></script>',
-        '',
-        '    <script',
-        '      type="module"',
-        '      inject-service-worker=""',
-        '      src="/_merged_assets/scripts/registerServiceWorker.js"',
-        '    ></script>',
         '  </body>',
         '</html>',
       ].join('\n'),
@@ -508,12 +502,6 @@ describe('RocketLaunch preset', () => {
         '    </footer>',
         '',
         '    <script type="module" src="/_merged_assets/scripts/init-navigation.js"></script>',
-        '',
-        '    <script',
-        '      type="module"',
-        '      inject-service-worker=""',
-        '      src="/_merged_assets/scripts/registerServiceWorker.js"',
-        '    ></script>',
         '  </body>',
         '</html>',
       ].join('\n'),

packages/mdjs-core/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Change Log
 
+## 0.9.0
+
+### Minor Changes
+
+- 70bb7a1: BREAKING CHANGE: Update to latest plugins manager to get type safe options
+
+  There is no longer a name string as a key for a plugin. It is identified by it's function/class. You will need to adjust your code if you are adding or adjusting plugins.
+
+  ```diff
+  - addPlugin({ name: 'my-plugin', plugin: myPlugin, options: { myFlag: true }, location: 'top' });
+  + addPlugin(myPlugin, { myFlag: true }, { location: 'top' });
+  - adjustPluginOptions('my-plugin', { myFlag: true });
+  + adjustPluginOptions(myPlugin, { myFlag: true });
+  ```
+
+  For more details please see the [Changelog](https://github.com/modernweb-dev/rocket/blob/main/packages/plugins-manager/CHANGELOG.md#030) of the plugins-manager package.
+
+### Patch Changes
+
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+- Updated dependencies [70bb7a1]
+  - plugins-manager@0.3.0
+
+## 0.8.2
+
+### Patch Changes
+
+- a5661b8: Updates dependencies
+
 ## 0.8.1
 
 ### Patch Changes

packages/mdjs-core/index.js

@@ -3,6 +3,7 @@
 /** @typedef {import('@mdjs/core/types/code').MdjsProcessPlugin} MdjsProcessPlugin */
 
 const { mdjsParse } = require('./src/mdjsParse.js');
+const { mdjsSetupCode } = require('./src/mdjsSetupCode.js');
 const { mdjsStoryParse } = require('./src/mdjsStoryParse.js');
 const { mdjsDocPage } = require('./src/mdjsDocPage.js');
 const { mdjsProcess } = require('./src/mdjsProcess.js');
@@ -14,4 +15,5 @@ module.exports = {
   mdjsDocPage,
   mdjsProcess,
   isMdjsContent,
+  mdjsSetupCode,
 };

packages/mdjs-core/index.mjs

@@ -1,5 +1,12 @@
 import cjsEntrypoint from './index.js';
 
-const { mdjsParse, mdjsStoryParse, mdjsDocPage, mdjsProcess, isMdjsContent } = cjsEntrypoint;
+const {
+  mdjsParse,
+  mdjsStoryParse,
+  mdjsDocPage,
+  mdjsProcess,
+  isMdjsContent,
+  mdjsSetupCode,
+} = cjsEntrypoint;
 
-export { mdjsParse, mdjsStoryParse, mdjsDocPage, mdjsProcess, isMdjsContent };
+export { mdjsParse, mdjsStoryParse, mdjsDocPage, mdjsProcess, isMdjsContent, mdjsSetupCode };

packages/mdjs-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mdjs/core",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "publishConfig": {
     "access": "public"
   },
@@ -49,7 +49,7 @@
     "@types/unist": "^2.0.3",
     "es-module-lexer": "^0.3.26",
     "github-markdown-css": "^4.0.0",
-    "plugins-manager": "^0.2.3",
+    "plugins-manager": "^0.3.0",
     "rehype-autolink-headings": "^5.0.1",
     "rehype-prism-template": "^0.4.1",
     "rehype-raw": "^5.0.0",

packages/mdjs-core/src/mdjsProcess.js

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-/** @typedef {import('@mdjs/core/types/code').Story} Story */
-/** @typedef {import('@mdjs/core/types/code').ParseResult} ParseResult */
-/** @typedef {import('@mdjs/core/types/code').ProcessResult} ProcessResult */
-/** @typedef {import('@mdjs/core/types/code').MdjsProcessPlugin} MdjsProcessPlugin */
+/** @typedef {import('../types/code').Story} Story */
+/** @typedef {import('../types/code').ParseResult} ParseResult */
+/** @typedef {import('../types/code').ProcessResult} ProcessResult */
+/** @typedef {import('../types/code').MdjsProcessPlugin} MdjsProcessPlugin */
 
 const unified = require('unified');
 const markdown = require('remark-parse');
@@ -22,23 +22,23 @@ const { mdjsSetupCode } = require('./mdjsSetupCode.js');
 
 /** @type {MdjsProcessPlugin[]} */
 const defaultMetaPlugins = [
-  { name: 'markdown', plugin: markdown },
-  { name: 'gfm', plugin: gfm },
-  { name: 'mdjsParse', plugin: mdjsParse },
-  { name: 'mdjsStoryParse', plugin: mdjsStoryParse },
-  { name: 'mdjsSetupCode', plugin: mdjsSetupCode },
+  { plugin: markdown, options: {} },
+  { plugin: gfm, options: {} },
+  { plugin: mdjsParse, options: {} },
+  { plugin: mdjsStoryParse, options: {} },
+  { plugin: mdjsSetupCode, options: {} },
   // @ts-ignore
-  { name: 'remark2rehype', plugin: remark2rehype, options: { allowDangerousHtml: true } },
+  { plugin: remark2rehype, options: { allowDangerousHtml: true } },
   // @ts-ignore
-  { name: 'rehypePrism', plugin: rehypePrism },
+  { plugin: rehypePrism, options: {} },
   // @ts-ignore
-  { name: 'raw', plugin: raw },
+  { plugin: raw, options: {} },
   // @ts-ignore
-  { name: 'htmlSlug', plugin: htmlSlug },
+  { plugin: htmlSlug, options: {} },
   // @ts-ignore
-  { name: 'htmlHeading', plugin: htmlHeading },
+  { plugin: htmlHeading, options: {} },
   // @ts-ignore
-  { name: 'htmlStringify', plugin: htmlStringify },
+  { plugin: htmlStringify, options: {} },
 ];
 
 /**
@@ -57,33 +57,8 @@ async function mdjsProcess(mdjs, { setupUnifiedPlugins = [] } = {}) {
 
   const metaPlugins = executeSetupFunctions(setupUnifiedPlugins, defaultMetaPlugins);
 
-  /**
-   * @param {string} code
-   */
-  async function highlightCode(code) {
-    // @ts-ignore
-    const codePlugins = metaPlugins.filter(pluginObj =>
-      ['markdown', 'remark2rehype', 'rehypePrism', 'htmlStringify'].includes(pluginObj.name),
-    );
-    const codeParser = unified();
-    // @ts-ignore
-    for (const pluginObj of codePlugins) {
-      codeParser.use(pluginObj.plugin, pluginObj.options);
-    }
-    const codeResult = await codeParser.process(code);
-    return codeResult.contents;
-  }
-
-  // @ts-ignore
   for (const pluginObj of metaPlugins) {
-    if (pluginObj.name === 'mdjsSetupCode') {
-      if (pluginObj.options && !pluginObj.options.highlightCode) {
-        pluginObj.options.highlightCode = highlightCode;
-      }
-      if (!pluginObj.options) {
-        pluginObj.options = { highlightCode };
-      }
-    }
+    // @ts-ignore
     parser.use(pluginObj.plugin, pluginObj.options);
   }
 

packages/mdjs-core/test-node/mdJsProcess.test.js

@@ -3,6 +3,8 @@
 const chai = require('chai');
 const { adjustPluginOptions } = require('plugins-manager');
 const { mdjsProcess } = require('../src/mdjsProcess.js');
+const { mdjsSetupCode } = require('../src/mdjsSetupCode.js');
+const { mdjsStoryParse } = require('../src/mdjsStoryParse.js');
 
 const { expect } = chai;
 
@@ -106,7 +108,7 @@ describe('mdjsProcess', () => {
 
     function replaceStoryTag(plugins) {
       return plugins.map(pluginObj => {
-        if (pluginObj.name === 'mdjsStoryParse') {
+        if (pluginObj.plugin === mdjsStoryParse) {
           return {
             ...pluginObj,
             options: {
@@ -136,7 +138,7 @@ describe('mdjsProcess', () => {
 
     function replaceStoryTag2(plugins) {
       return plugins.map(pluginObj => {
-        if (pluginObj.name === 'mdjsStoryParse') {
+        if (pluginObj.plugin === mdjsStoryParse) {
           return {
             ...pluginObj,
             options: {
@@ -202,7 +204,7 @@ describe('mdjsProcess', () => {
     ].join('\n');
     const result = await mdjsProcess(input, {
       setupUnifiedPlugins: [
-        adjustPluginOptions('mdjsSetupCode', {
+        adjustPluginOptions(mdjsSetupCode, {
           simulationSettings: { languages: [{ key: 'en', name: 'English' }] },
         }),
       ],

packages/mdjs-core/types/code.d.ts

@@ -31,4 +31,4 @@ export interface ParseResult {
   };
 }
 
-export type MdjsProcessPlugin = MetaPlugin<unified.Plugin, unified.Settings>;
+export type MdjsProcessPlugin = MetaPlugin<unified.Plugin>;

packages/mdjs-preview/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @mdjs/mdjs-preview
 
+## 0.5.2
+
+### Patch Changes
+
+- 0987a41: - Make [slot="content"] selector more specific
+- 0987a41: Fix styling in darkmode
+
 ## 0.5.1
 
 ### Patch Changes

packages/mdjs-preview/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mdjs/mdjs-preview",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "publishConfig": {
     "access": "public"
   },

packages/mdjs-preview/src/MdJsPreview.js

@@ -652,7 +652,7 @@ export class MdJsPreview extends ScopedElementsMixin(LitElement) {
 
       [part='copy-button']:hover {
         background-color: var(--primary-color, #3f51b5);
-        color: #fff;
+        color: var(--primary-text-inverse-color, #eee);
       }
 
       .switch {
@@ -668,7 +668,7 @@ export class MdJsPreview extends ScopedElementsMixin(LitElement) {
       [part='switch-button'] {
         display: inline-block;
         width: 44px;
-        background: #808080;
+        background: var(--switch-unselected-color, #808080);
         height: 25px;
         border-radius: 15px;
         position: relative;
@@ -687,7 +687,7 @@ export class MdJsPreview extends ScopedElementsMixin(LitElement) {
       }
 
       .switch.selected [part='switch-button'] {
-        background: var(--primary-color, #008000);
+        background: var(--switch-selected-color, #42b983);
       }
 
       .switch.selected [part='switch-button']::after {
@@ -699,7 +699,7 @@ export class MdJsPreview extends ScopedElementsMixin(LitElement) {
         margin: -5px 0 10px 0;
         text-align: right;
         font-size: 12px;
-        color: #333;
+        color: var(--primary-text-color, #2c3e50);
       }
 
       .settings-wrapper {
@@ -748,7 +748,7 @@ export class MdJsPreview extends ScopedElementsMixin(LitElement) {
 
       .simulation-toggle:hover {
         background-color: var(--primary-color, #3f51b5);
-        color: #fff;
+        color: var(--primary-text-inverse-color, #eee);
       }
 
       h3[slot='invoker'] button {
@@ -759,6 +759,7 @@ export class MdJsPreview extends ScopedElementsMixin(LitElement) {
         border: none;
         border-bottom: 1px solid #bbb;
         width: 100%;
+        color: var(--primary-text-color, #2c3e50);
         background: none;
         text-align: left;
         font-weight: bold;
@@ -780,7 +781,7 @@ export class MdJsPreview extends ScopedElementsMixin(LitElement) {
         border-bottom: none;
       }
 
-      [slot='content'] {
+      .options > [slot='content'] {
         border-bottom: 1px solid #bbb;
         padding: 10px;
       }
@@ -820,7 +821,7 @@ export class MdJsPreview extends ScopedElementsMixin(LitElement) {
 
       .segmented-control label.selected span {
         background: var(--primary-color, #3f51b5);
-        color: #fff;
+        color: var(--primary-text-inverse-color, #eee);
       }
 
       .segmented-control label:focus-within span {

packages/plugins-manager/CHANGELOG.md

@@ -1,5 +1,98 @@
 # plugins-manager
 
+## 0.3.0
+
+### Minor Changes
+
+- 70bb7a1: BREAKING CHANGE: `addPlugin` API changed
+
+  ```diff
+  - addPlugin({ name: 'my-plugin', plugin: myPlugin, options: { myFlag: true }, location: 'top' });
+  + addPlugin(myPlugin, { myFlag: true }, { location: 'top' });
+  ```
+
+  This is now type safe and typescript will throw an error if you pass the wrong type.
+
+  ```js
+  function myPlugin({ myFlag = false } = {}) {
+    // ...
+  }
+
+  addPlugin(myPlugin, { myFlag: true }); // ts ok
+  addPlugin(myPlugin, { notExisting: true }); // ts error
+  ```
+
+- 70bb7a1: BREAKING CHANGE: `adjustPluginOptions` API changed
+
+  ```diff
+  - adjustPluginOptions('my-plugin', { myFlag: true });
+  + adjustPluginOptions(myPlugin, { myFlag: true });
+  ```
+
+  This is now type safe and typescript will throw an error if you pass the wrong type.
+
+  ```js
+  function myPlugin({ myFlag = false } = {}) {
+    // ...
+  }
+
+  adjustPluginOptions(myPlugin, { myFlag: true }); // ts ok
+  adjustPluginOptions(myPlugin, { notExisting: true }); // ts error
+  ```
+
+- 70bb7a1: Add `removePlugin` functionality
+
+  ```js
+  export default {
+    setupPlugins: [removePlugin(json)],
+  };
+  ```
+
+- 70bb7a1: BREAKING CHANGE: `metaConfigToRollupConfig` has been renamed to `applyPlugins`
+
+  ```diff
+  - const finalConfig = metaConfigToRollupConfig(currentConfig, defaultMetaPlugins);
+  + const finalConfig = applyPlugins(currentConfig, defaultMetaPlugins);
+  ```
+
+- 70bb7a1: BREAKING CHANGE: `metaConfigToWebDevServerConfig` has been removed
+- 70bb7a1: Plugins can now be classes as well. The options are passed to the constructor.
+
+  ```js
+  /**
+   * @typedef {object} MyClassOptions
+   * @property {string} lastName
+   */
+
+  class MyClass {
+    /** @type {MyClassOptions} */
+    options = {
+      lastName: 'initial-second',
+    };
+
+    /**
+     * @param {Partial<MyClassOptions>} options
+     */
+    constructor(options = {}) {
+      this.options = { ...this.options, ...options };
+    }
+  }
+
+  export default {
+    setupPlugins: [addPlugin(MyClass)],
+  };
+
+  // constructor parameters are type safe
+  addPlugin(MyClass, { lastName: 'new name' }); // ts ok
+  addPlugin(MyClass, { otherProp: 'new name' }); // ts error
+  ```
+
+## 0.2.4
+
+### Patch Changes
+
+- 61bb700: Fix types
+
 ## 0.2.3
 
 ### Patch Changes

packages/plugins-manager/README.md

@@ -1,6 +1,3 @@
 # Plugins Manager
 
-The Plugins Manager replaces the specific registration/execution (with options) in a given plugin system by an intent to use a plugin (with these options).
-This allows your users to adjust the options before actually applying the plugins.
-
-For docs please see our homepage [https://rocket.modern-web.dev/docs/plugins-manager/overview/](https://rocket.modern-web.dev/docs/plugins-manager/overview/).
+[=> See Source <=](../../docs/docs/tools/plugins-manager.md)

packages/plugins-manager/index.js

@@ -1,7 +1,11 @@
-/** @typedef {import('./types/main').MetaPlugin} MetaPlugin */
+/**
+ * @template T
+ * @typedef {import('./types/main').MetaPlugin<T>} MetaPlugin
+ **/
+/** @typedef {import('./types/main').Plugin} Plugin */
 
 export { addPlugin } from './src/addPlugin.js';
+export { removePlugin } from './src/removePlugin.js';
 export { adjustPluginOptions } from './src/adjustPluginOptions.js';
-export { metaConfigToRollupConfig } from './src/metaConfigToRollupConfig.js';
-export { metaConfigToWebDevServerConfig } from './src/metaConfigToWebDevServerConfig.js';
+export { applyPlugins } from './src/applyPlugins.js';
 export { executeSetupFunctions } from './src/executeSetupFunctions.js';

packages/plugins-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plugins-manager",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "publishConfig": {
     "access": "public"
   },
@@ -25,7 +25,8 @@
     "build:package": "rimraf dist && esbuild --platform=node --format=cjs --bundle --outfile=dist/index.cjs ./index.js",
     "test": "mocha --timeout 5000 test-node/**/*.test.{js,cjs} test-node/*.test.{js,cjs}",
     "test:watch": "onchange 'src/**/*.{js,cjs}' 'test-node/**/*.{js,cjs}' -- npm test",
-    "types:copy": "copyfiles \"./types/**/*.d.ts\" dist-types/"
+    "types:copy": "copyfiles \"./types/**/*.d.ts\" dist-types/",
+    "prepublishOnly": "publish-docs --github-url https://github.com/modernweb-dev/rocket/ --git-root-dir ../../"
   },
   "files": [
     "*.js",

packages/plugins-manager/src/addPlugin.js

@@ -1,26 +1,19 @@
-/** @typedef {import('../types/main').MetaPlugin} MetaPlugin */
-
 /**
- * @template {Function} T
- * @param {import('../types/main').AddPluginOptions<T>} metaPluginAndOptions
+ * @template {import('../types/main').Plugin} T
+ * @param {T} plugin
+ * @param {import('../types/main').GetPluginOptions<T>} [options]
+ * @param {import('../types/main').ManagerOptions} [managerOptions]
  */
-export function addPlugin(metaPluginAndOptions) {
-  const {
-    name,
-    plugin,
-    options = undefined,
-    how = 'after',
-    location = 'bottom',
-  } = metaPluginAndOptions;
+export function addPlugin(plugin, options = {}, { how = 'after', location = 'bottom' } = {}) {
   /**
-   * @param {MetaPlugin[]} plugins
+   * @param {import('../types/main').MetaPlugin<T>[]} plugins
    */
   const addPluginFn = plugins => {
     if (plugins === undefined) {
       plugins = [];
     }
     // only add if name is not already in the meta plugin list
-    if (plugins.findIndex(pluginObj => pluginObj.name === name) === -1) {
+    if (plugins.findIndex(pluginObj => pluginObj.plugin === plugin) === -1) {
       let index = -1;
       let _how = how;
       switch (location) {
@@ -33,11 +26,12 @@ export function addPlugin(metaPluginAndOptions) {
           _how = 'fixed';
           break;
         default:
-          index = plugins.findIndex(plugin => plugin.name === location);
+          index = plugins.findIndex(pluginObj => pluginObj.plugin === location);
       }
       if (index < 0) {
+        const errorName = location === 'top' || location === 'bottom' ? location : location.name;
         throw new Error(
-          `Could not find a plugin with the name "${location}" to insert "${name}" ${how} it.`,
+          `Could not find a plugin with the name "${errorName}" to insert "${plugin.name}" ${how} it.`,
         );
       }
 
@@ -46,7 +40,6 @@ export function addPlugin(metaPluginAndOptions) {
       }
 
       plugins.splice(index, 0, {
-        name,
         plugin,
         options,
       });

packages/plugins-manager/src/adjustPluginOptions.js

@@ -1,4 +1,4 @@
-/** @typedef {import('../types/main').MetaPlugin} MetaPlugin */
+/** @typedef {import('../types/main').Plugin} Plugin */
 
 /**
  * @param {any} obj
@@ -8,23 +8,35 @@ function isObject(obj) {
 }
 
 /**
- * @param {string} pluginName
- * @param {any} mergeOptions
+ * @param {*} x
+ * @returns {x is function}
  */
-export function adjustPluginOptions(pluginName, mergeOptions) {
+function isFunction(x) {
+  return typeof x === 'function';
+}
+
+/**
+ * @template {import('../types/main').Plugin} T
+ * @param {T} plugin
+ * @param {import('../types/main').adjustPluginOptionsOptions<T>} mergeOptions
+ */
+export function adjustPluginOptions(plugin, mergeOptions) {
   /**
-   * @param {MetaPlugin[]} plugins
+   * @template {Function} T
+   * @param {import('../types/main').MetaPlugin<T>[]} plugins
    */
   const adjustPluginOptionsFn = plugins => {
-    const index = plugins.findIndex(plugin => plugin.name === pluginName);
+    const index = plugins.findIndex(pluginObj => pluginObj.plugin === plugin);
 
     if (index === -1) {
       throw new Error(
-        `Could not find a plugin with the name "${pluginName}" to adjust the options.`,
+        `Could not find a plugin with the name "${
+          plugin.name
+        }" to adjust it's options with:\n${JSON.stringify(mergeOptions, null, 2)}`,
       );
     }
 
-    if (typeof mergeOptions === 'function') {
+    if (isFunction(mergeOptions)) {
       plugins[index].options = mergeOptions(plugins[index].options);
     } else if (isObject(plugins[index].options)) {
       plugins[index].options = { ...plugins[index].options, ...mergeOptions };

packages/plugins-manager/src/applyPlugins.js

@@ -0,0 +1,46 @@
+import { executeSetupFunctions } from './executeSetupFunctions.js';
+
+/** @typedef {import('../types/main').Constructor} Constructor */
+/** @typedef {import('../types/main').AnyFn} AnyFn */
+
+/**
+ * @param {unknown} func
+ * @returns {boolean}
+ */
+function isClass(func) {
+  if (typeof func === 'function' && func.prototype) {
+    try {
+      func.arguments && func.caller;
+    } catch (error) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * @template {import('../types/main').Plugin} T
+ * @param {any} config
+ * @param {import('../types/main').MetaPlugin<T>[]} [defaultPlugins]
+ */
+export function applyPlugins(config, defaultPlugins = []) {
+  if (config.plugins) {
+    delete config.setupPlugins;
+    return config;
+  }
+  const _metaPlugins = executeSetupFunctions(config.setupPlugins, [...defaultPlugins]);
+
+  const plugins = _metaPlugins.map(pluginObj => {
+    if (isClass(pluginObj.plugin)) {
+      const ClassPlugin = /** @type {Constructor} */ (pluginObj.plugin);
+      return pluginObj.options ? new ClassPlugin(pluginObj.options) : new ClassPlugin();
+    } else {
+      const fnPlugin = /** @type {AnyFn} */ (pluginObj.plugin);
+      return pluginObj.options ? fnPlugin(pluginObj.options) : fnPlugin();
+    }
+  });
+  config.plugins = plugins;
+
+  delete config.setupPlugins;
+  return config;
+}

packages/plugins-manager/src/executeSetupFunctions.js

@@ -1,9 +1,8 @@
-/** @typedef {import('../types/main').MetaPlugin} MetaPlugin */
-
 /**
+ * @template T
  * @param {function[]} setupFunctions
- * @param {MetaPlugin[]} metaPlugins
- * @return {MetaPlugin[]}
+ * @param {import('../types/main').MetaPlugin<T>[]} metaPlugins
+ * @return {import('../types/main').MetaPlugin<T>[]}
  */
 export function executeSetupFunctions(setupFunctions, metaPlugins = []) {
   let _metaPlugins = [...metaPlugins];

packages/plugins-manager/src/metaConfigToRollupConfig.js

@@ -1,27 +0,0 @@
-/** @typedef {import('../types/main').MetaPlugin} MetaPlugin */
-
-import { executeSetupFunctions } from 'plugins-manager';
-
-/**
- * @param {any} config
- * @param {MetaPlugin[]} [metaPlugins]
- */
-export function metaConfigToRollupConfig(config, metaPlugins = []) {
-  if (config.plugins) {
-    delete config.setupPlugins;
-    return config;
-  }
-  const _metaPlugins = executeSetupFunctions(config.setupPlugins, [...metaPlugins]);
-
-  const plugins = _metaPlugins.map(pluginObj => {
-    if (pluginObj.options) {
-      return pluginObj.plugin(pluginObj.options);
-    } else {
-      return pluginObj.plugin();
-    }
-  });
-  config.plugins = plugins;
-
-  delete config.setupPlugins;
-  return config;
-}

packages/plugins-manager/src/metaConfigToWebDevServerConfig.js

@@ -1,53 +0,0 @@
-/** @typedef {import('../types/main').MetaPluginWrapable} MetaPluginWrapable */
-
-import { executeSetupFunctions } from 'plugins-manager';
-
-/**
- * @param {any} config
- * @param {MetaPluginWrapable[]} metaPlugins
- * @param {object} [options]
- * @param {function | null} [options.rollupWrapperFunction]
- */
-export function metaConfigToWebDevServerConfig(
-  config,
-  metaPlugins,
-  { rollupWrapperFunction = null } = {},
-) {
-  if (config.plugins) {
-    delete config.setupPlugins;
-    delete config.setupRollupPlugins;
-    return config;
-  }
-
-  const metaPluginsNoWrap = metaPlugins.map(pluginObj => {
-    pluginObj.__noWrap = true;
-    return pluginObj;
-  });
-
-  const rollupPlugins = /** @type {MetaPluginWrapable[]} */ (executeSetupFunctions(
-    config.setupRollupPlugins,
-    [...metaPluginsNoWrap],
-  ));
-
-  const wrappedRollupPlugins = rollupPlugins.map(pluginObj => {
-    if (typeof rollupWrapperFunction === 'function' && pluginObj.__noWrap !== true) {
-      pluginObj.plugin = rollupWrapperFunction(pluginObj.plugin);
-    }
-    return pluginObj;
-  });
-
-  const _metaPlugins = executeSetupFunctions(config.setupPlugins, [...wrappedRollupPlugins]);
-
-  const plugins = _metaPlugins.map(pluginObj => {
-    if (pluginObj.options) {
-      return pluginObj.plugin(pluginObj.options);
-    } else {
-      return pluginObj.plugin();
-    }
-  });
-  config.plugins = plugins;
-
-  delete config.setupPlugins;
-  delete config.setupRollupPlugins;
-  return config;
-}

packages/plugins-manager/src/removePlugin.js

@@ -0,0 +1,23 @@
+/** @typedef {import('../types/main').Plugin} Plugin */
+
+/**
+ * @param {import('../types/main').Plugin} plugin
+ */
+export function removePlugin(plugin) {
+  /**
+   * @template {Function} T
+   * @param {import('../types/main').MetaPlugin<T>[]} plugins
+   */
+  const removePluginFn = plugins => {
+    const index = plugins.findIndex(pluginObj => pluginObj.plugin === plugin);
+
+    if (index === -1) {
+      throw new Error(`Could not find a plugin with the name "${plugin.name}" to remove.`);
+    }
+
+    plugins.splice(index, 1);
+
+    return plugins;
+  };
+  return removePluginFn;
+}

packages/plugins-manager/test-node/addPlugin.test.js

@@ -1,82 +1,93 @@
 import chai from 'chai';
 
-import { addPlugin, metaConfigToRollupConfig } from 'plugins-manager';
+import { addPlugin, applyPlugins } from '../index.js';
 
 const { expect } = chai;
 
 describe('addPlugin', () => {
-  const insertPlugin = (options = 'insert') => `-- ${options}Plugin --`;
-  const oneExistingPlugin = [{ name: 'first', plugin: () => 'firstPlugin' }];
+  const insertPlugin = ({ firstName = 'first', lastName = 'last' } = {}) =>
+    `-- ${firstName} ${lastName} Plugin --`;
+  const firstPlugin = () => 'firstPlugin';
+  const secondPlugin = () => 'secondPlugin';
+  const thirdPlugin = () => 'thirdPlugin';
+
+  /**
+   * @template T
+   * @type {import('../types/main.js').MetaPlugin<T>[]}
+   */
+  const oneExistingPlugin = [{ plugin: firstPlugin, options: {} }];
+  /**
+   * @template T
+   * @type {import('../types/main.js').MetaPlugin<T>[]}
+   */
   const threeExistingPlugins = [
-    { name: 'first', plugin: () => 'firstPlugin' },
-    { name: 'second', plugin: () => 'secondPlugin' },
-    { name: 'third', plugin: () => 'thirdPlugin' },
+    { plugin: firstPlugin, options: {} },
+    { plugin: secondPlugin, options: {} },
+    { plugin: thirdPlugin, options: {} },
   ];
 
   it('adds plugins at the bottom by default', async () => {
-    const config = metaConfigToRollupConfig({
-      setupPlugins: [addPlugin({ name: 'insert', plugin: insertPlugin })],
+    const config = applyPlugins({
+      setupPlugins: [addPlugin(insertPlugin)],
     });
-    expect(config.plugins).to.deep.equal(['-- insertPlugin --']);
+    expect(config.plugins).to.deep.equal(['-- first last Plugin --']);
 
-    const config2 = metaConfigToRollupConfig(
+    const config2 = applyPlugins(
       {
-        setupPlugins: [addPlugin({ name: 'insert', plugin: insertPlugin })],
+        setupPlugins: [addPlugin(insertPlugin)],
       },
       oneExistingPlugin,
     );
-    expect(config2.plugins).to.deep.equal(['firstPlugin', '-- insertPlugin --']);
+    expect(config2.plugins).to.deep.equal(['firstPlugin', '-- first last Plugin --']);
   });
 
   it('can add at the top', async () => {
-    const config = metaConfigToRollupConfig(
+    const config = applyPlugins(
       {
-        setupPlugins: [addPlugin({ name: 'insert', plugin: insertPlugin, location: 'top' })],
+        setupPlugins: [addPlugin(insertPlugin, undefined, { location: 'top' })],
       },
       oneExistingPlugin,
     );
-    expect(config.plugins).to.deep.equal(['-- insertPlugin --', 'firstPlugin']);
+    expect(config.plugins).to.deep.equal(['-- first last Plugin --', 'firstPlugin']);
   });
 
   it('handles inserting "before" the 0 index ', async () => {
-    const config = metaConfigToRollupConfig(
+    const config = applyPlugins(
       {
-        setupPlugins: [
-          addPlugin({ name: 'insert', plugin: insertPlugin, location: 'top', how: 'before' }),
-        ],
+        setupPlugins: [addPlugin(insertPlugin, undefined, { location: 'top', how: 'before' })],
       },
       oneExistingPlugin,
     );
-    expect(config.plugins).to.deep.equal(['-- insertPlugin --', 'firstPlugin']);
+    expect(config.plugins).to.deep.equal(['-- first last Plugin --', 'firstPlugin']);
   });
 
   it('adds after a given location by default', async () => {
-    const config = metaConfigToRollupConfig(
+    const config = applyPlugins(
       {
-        setupPlugins: [addPlugin({ name: 'insert', plugin: insertPlugin, location: 'second' })],
+        setupPlugins: [addPlugin(insertPlugin, undefined, { location: secondPlugin })],
       },
       threeExistingPlugins,
     );
     expect(config.plugins).to.deep.equal([
       'firstPlugin',
       'secondPlugin',
-      '-- insertPlugin --',
+      '-- first last Plugin --',
       'thirdPlugin',
     ]);
   });
 
   it('can adds before a given location', async () => {
-    const config = metaConfigToRollupConfig(
+    const config = applyPlugins(
       {
         setupPlugins: [
-          addPlugin({ name: 'insert', plugin: insertPlugin, location: 'second', how: 'before' }),
+          addPlugin(insertPlugin, undefined, { location: secondPlugin, how: 'before' }),
         ],
       },
       threeExistingPlugins,
     );
     expect(config.plugins).to.deep.equal([
       'firstPlugin',
-      '-- insertPlugin --',
+      '-- first last Plugin --',
       'secondPlugin',
       'thirdPlugin',
     ]);
@@ -84,16 +95,18 @@ describe('addPlugin', () => {
 
   it('throws if given location does not exist', async () => {
     expect(() => {
-      metaConfigToRollupConfig({
-        setupPlugins: [addPlugin({ name: 'insert', plugin: insertPlugin, location: 'not-found' })],
+      applyPlugins({
+        setupPlugins: [addPlugin(insertPlugin, undefined, { location: firstPlugin })],
       });
-    }).to.throw('Could not find a plugin with the name "not-found" to insert "insert" after it.');
+    }).to.throw(
+      'Could not find a plugin with the name "firstPlugin" to insert "insertPlugin" after it.',
+    );
   });
 
   it('accepts options', async () => {
-    const config = metaConfigToRollupConfig({
-      setupPlugins: [addPlugin({ name: 'insert', plugin: insertPlugin, options: 'extra' })],
+    const config = applyPlugins({
+      setupPlugins: [addPlugin(insertPlugin, { firstName: 'newFirst' })],
     });
-    expect(config.plugins).to.deep.equal(['-- extraPlugin --']);
+    expect(config.plugins).to.deep.equal(['-- newFirst last Plugin --']);
   });
 });

packages/plugins-manager/test-node/adjustPluginOptions.test.js

@@ -1,33 +1,43 @@
+// @ts-check
+
 import chai from 'chai';
 
-import { adjustPluginOptions, metaConfigToRollupConfig } from 'plugins-manager';
+import { adjustPluginOptions, applyPlugins } from '../index.js';
 
 const { expect } = chai;
 
 describe('adjustPluginOptions', () => {
+  const firstPlugin = ({ flag = 'default-flag' } = {}) => `firstPlugin-${flag}`;
+
+  /**
+   * @param {object} options
+   * @param {object} [options.other]
+   * @param {string} [options.other.nested]
+   * @param {string} [options.other.nested2]
+   * @returns
+   */
+  const secondPlugin = ({ other = { nested: 'other.nested', nested2: 'other.nested2' } } = {}) =>
+    `secondPlugin-${other.nested}-${other.nested2}`;
+  const thirdPlugin = ({ name = 'name' }) => `thirdPlugin-${name}`;
+
   const defaultCurrentMetaPlugins = [
+    { plugin: firstPlugin, options: { flag: 'firstSettings' } },
     {
-      name: 'first',
-      plugin: options => `firstPlugin-${options.flag}`,
-      options: { flag: 'firstSettings' },
-    },
-    {
-      name: 'second',
-      plugin: options => `secondPlugin-${options.other.nested}-${options.other.nested2}`,
+      plugin: secondPlugin,
       options: { other: { nested: 'other.nested', nested2: 'other.nested2' } },
     },
-    { name: 'third', plugin: options => `thirdPlugin-${options}`, options: 'aString' },
+    { plugin: thirdPlugin, options: { name: 'name' } },
   ];
   function newCurrentMetaPlugins() {
     return defaultCurrentMetaPlugins.map(obj => ({ ...obj }));
   }
 
   it('will merge options objects (flatly)', async () => {
-    const config = metaConfigToRollupConfig(
+    const config = applyPlugins(
       {
         setupPlugins: [
-          adjustPluginOptions('first', { flag: '#mod#FirstSettings' }),
-          adjustPluginOptions('second', { other: { nested: '#mod#other.nested' } }),
+          adjustPluginOptions(firstPlugin, { flag: '#mod#FirstSettings' }),
+          adjustPluginOptions(secondPlugin, { other: { nested: '#mod#other.nested' } }),
         ],
       },
       newCurrentMetaPlugins(),
@@ -35,14 +45,14 @@ describe('adjustPluginOptions', () => {
     expect(config.plugins).to.deep.equal([
       'firstPlugin-#mod#FirstSettings',
       'secondPlugin-#mod#other.nested-undefined',
-      'thirdPlugin-aString',
+      'thirdPlugin-name',
     ]);
   });
 
   it('will override non object settings', async () => {
-    const config = metaConfigToRollupConfig(
+    const config = applyPlugins(
       {
-        setupPlugins: [adjustPluginOptions('third', '#mod#aString')],
+        setupPlugins: [adjustPluginOptions(thirdPlugin, { name: '#mod#aString' })],
       },
       newCurrentMetaPlugins(),
     );
@@ -54,11 +64,11 @@ describe('adjustPluginOptions', () => {
   });
 
   it('accepts a function as a setting to manually merge objects', async () => {
-    const config = metaConfigToRollupConfig(
+    const config = applyPlugins(
       {
         setupPlugins: [
-          adjustPluginOptions('second', config => ({
-            other: { ...config.other, nested: '#mod#other.nested' },
+          adjustPluginOptions(secondPlugin, config => ({
+            other: { ...config?.other, nested: '#mod#other.nested' },
           })),
         ],
       },
@@ -67,15 +77,76 @@ describe('adjustPluginOptions', () => {
     expect(config.plugins).to.deep.equal([
       'firstPlugin-firstSettings',
       'secondPlugin-#mod#other.nested-other.nested2',
-      'thirdPlugin-aString',
+      'thirdPlugin-name',
     ]);
   });
 
-  it('throws if given location does not exist', async () => {
+  it('throws if given plugin does not exist', async () => {
     expect(() => {
-      metaConfigToRollupConfig({
-        setupPlugins: [adjustPluginOptions('not-found', '#mod#aString')],
+      applyPlugins({
+        setupPlugins: [adjustPluginOptions(firstPlugin, { flag: 'newFlag' })],
       });
-    }).to.throw('Could not find a plugin with the name "not-found" to adjust the options.');
+    }).to.throw(
+      [
+        'Could not find a plugin with the name "firstPlugin" to adjust it\'s options with:',
+        '{',
+        '  "flag": "newFlag"',
+        '}',
+      ].join('\n'),
+    );
+  });
+
+  it('works with classes', async () => {
+    class FirstClass {
+      constructor({ firstName = 'initial-first' } = {}) {
+        this.options = { firstName };
+      }
+
+      render() {
+        return `[[ firstName: ${this.options.firstName} ]]`;
+      }
+    }
+
+    /**
+     * @typedef {object} SecondClassOptions
+     * @property {string} lastName
+     */
+
+    class SecondClass {
+      /** @type {SecondClassOptions} */
+      options = {
+        lastName: 'initial-second',
+      };
+
+      /**
+       * @param {Partial<SecondClassOptions>} options
+       */
+      constructor(options = {}) {
+        this.options = { ...this.options, ...options };
+      }
+
+      render() {
+        return `[[ lastName: ${this.options.lastName} ]]`;
+      }
+    }
+
+    const config = applyPlugins(
+      {
+        setupPlugins: [
+          adjustPluginOptions(SecondClass, { lastName: 'set-via-adjustPluginOptions' }),
+        ],
+      },
+      [
+        { plugin: FirstClass, options: {} },
+        { plugin: SecondClass, options: {} },
+      ],
+    );
+
+    expect(
+      config.plugins.map(/** @param {FirstClass | SecondClass} cls */ cls => cls.render()),
+    ).to.deep.equal([
+      '[[ firstName: initial-first ]]',
+      '[[ lastName: set-via-adjustPluginOptions ]]',
+    ]);
   });
 });

packages/plugins-manager/test-node/applyPlugins.test.js

@@ -0,0 +1,92 @@
+import chai from 'chai';
+
+import { applyPlugins, addPlugin } from '../index.js';
+
+const { expect } = chai;
+
+describe('applyPlugins', () => {
+  const insertPlugin = () => `-- insertPlugin --`;
+  /**
+   * @template T
+   * @type {import('../types/main.js').MetaPlugin<T>[]}
+   */
+  const oneExistingPlugin = [{ plugin: () => 'firstPlugin', options: {} }];
+  /**
+   * @template T
+   * @type {import('../types/main.js').MetaPlugin<T>[]}
+   */
+  const threeExistingPlugin = [
+    { plugin: () => 'firstPlugin', options: {} },
+    { plugin: () => 'secondPlugin', options: {} },
+    { plugin: () => 'thirdPlugin', options: {} },
+  ];
+
+  it('converts meta config by executing the plugins and assigning it to the config', async () => {
+    const config = applyPlugins({}, threeExistingPlugin);
+    expect(config.plugins).to.deep.equal(['firstPlugin', 'secondPlugin', 'thirdPlugin']);
+  });
+
+  it('incorporates "setupPlugin" functions in the config & removes "setupPlugins"', async () => {
+    const config = applyPlugins(
+      {
+        setupPlugins: [addPlugin(insertPlugin)],
+      },
+      oneExistingPlugin,
+    );
+    expect(config.plugins).to.deep.equal(['firstPlugin', '-- insertPlugin --']);
+    expect(config.setupPlugins).to.be.undefined;
+  });
+
+  it('a provided plugins property will always win even if it is an empty array', async () => {
+    const config = applyPlugins({
+      setupPlugins: [addPlugin(insertPlugin)],
+      plugins: [],
+    });
+    expect(config.plugins).to.deep.equal([]);
+    expect(config.setupPlugins).to.be.undefined;
+  });
+
+  it('prefers a user set config.plugins', async () => {
+    const config = applyPlugins(
+      {
+        setupPlugins: [addPlugin(insertPlugin)],
+        plugins: ['user-set'],
+      },
+      threeExistingPlugin,
+    );
+    expect(config.plugins).to.deep.equal(['user-set']);
+    expect(config.setupPlugins).to.be.undefined;
+  });
+
+  it('works with classes', async () => {
+    class FirstClass {
+      constructor({ firstName = 'initial-first' } = {}) {
+        this.options = { firstName };
+      }
+
+      render() {
+        return `[[ firstName: ${this.options.firstName} ]]`;
+      }
+    }
+    class SecondClass {
+      constructor({ lastName = 'initial-second' } = {}) {
+        this.options = { lastName };
+      }
+
+      render() {
+        return `[[ lastName: ${this.options.lastName} ]]`;
+      }
+    }
+
+    const config = applyPlugins({
+      setupPlugins: [
+        addPlugin(FirstClass),
+        addPlugin(SecondClass, { lastName: 'set-via-addPlugin' }),
+      ],
+    });
+
+    expect(
+      config.plugins.map(/** @param {FirstClass | SecondClass} cls */ cls => cls.render()),
+    ).to.deep.equal(['[[ firstName: initial-first ]]', '[[ lastName: set-via-addPlugin ]]']);
+  });
+});