diff --git a/.changeset/new-forks-report.md b/.changeset/new-forks-report.md new file mode 100644 index 0000000..c9df294 --- /dev/null +++ b/.changeset/new-forks-report.md @@ -0,0 +1,5 @@ +--- +'@mdjs/core': patch +--- + +Update `es-module-lexer` version. diff --git a/.changeset/new-forks-report2.md b/.changeset/new-forks-report2.md new file mode 100644 index 0000000..b86d831 --- /dev/null +++ b/.changeset/new-forks-report2.md @@ -0,0 +1,6 @@ +--- +'@mdjs/mdjs-preview': patch +'@mdjs/mdjs-story': patch +--- + +Update lit version & add a server template for `@rocket/cli@0.20+`. diff --git a/.changeset/old-falcons-sin.md b/.changeset/old-falcons-sin.md new file mode 100644 index 0000000..6e2b3c3 --- /dev/null +++ b/.changeset/old-falcons-sin.md @@ -0,0 +1,8 @@ +--- +'@rocket/launch': minor +'@rocket/search': minor +--- + +BREAKING CHANGE: New version built for @rocket/engine and @rocket/cli 0.20+ + +For more information see the [migration guide](https://github.com/modernweb-dev/rocket/blob/next/packages/cli/MIGRATION.md). diff --git a/.changeset/sharp-dingos-arrive.md b/.changeset/sharp-dingos-arrive.md new file mode 100644 index 0000000..4e87ec6 --- /dev/null +++ b/.changeset/sharp-dingos-arrive.md @@ -0,0 +1,5 @@ +--- +'@rocket/components': minor +--- + +Initial public beta version with multiple server renderable components based on [lit](https://lit.dev). diff --git a/.changeset/three-eagles-notice.md b/.changeset/three-eagles-notice.md new file mode 100644 index 0000000..ca46ef8 --- /dev/null +++ b/.changeset/three-eagles-notice.md @@ -0,0 +1,10 @@ +--- +'@rocket/cli': minor +--- + +BREAKING CHANGE: Complete rewrite introducing `@rocket/engine` +Introduces class based templates, server side rendering of web components and a file based routing. + +For more information see the [migration guide](https://github.com/modernweb-dev/rocket/blob/next/packages/cli/MIGRATION.md). + +The [legacy documentation](https://legacy.rocket.modern-web.dev/) is still available. diff --git a/.changeset/three-eagles-notice2.md b/.changeset/three-eagles-notice2.md new file mode 100644 index 0000000..fabce1f --- /dev/null +++ b/.changeset/three-eagles-notice2.md @@ -0,0 +1,6 @@ +--- +'@rocket/engine': minor +'@rocket/create': minor +--- + +Initial public beta version. diff --git a/.changeset/tiny-actors-flow.md b/.changeset/tiny-actors-flow.md new file mode 100644 index 0000000..f5e7d58 --- /dev/null +++ b/.changeset/tiny-actors-flow.md @@ -0,0 +1,5 @@ +--- +'@rocket/spark': minor +--- + +Initial public beta version for `@rocket/cli` 0.20+ diff --git a/README.md b/README.md index e73a6d5..7cfe715 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ > This project is in its BETA phase

- Rocket + + + Rocket Logo +

@@ -21,17 +20,17 @@ /> Open in VS Code

- Website + Website · - Guides + Documentation · - Documentation + Discord Community

@@ -43,7 +42,7 @@ - **Small:** No overblown tools or frontend frameworks, add JavaScript and/or Web Components only on pages where needed..

- Explore the Rocket Guides  ▶ + Getting Started With Rocket  ▶

## The Goal for Rocket @@ -55,21 +54,21 @@ You can still tweak every detail of every underlying tool that gets used. Rocket is part of the [Modern Web Family](https://twitter.com/modern_web_dev). +

+ Join our Discord Community  ▶ +

+ ## Quick Start ``` -mkdir test-rocket -cd test-rocket -npm init -y -npm i @rocket/cli@alpha @rocket/launch@alpha @11ty/eleventy-cache-assets typescript -npx rocket init +npx @rocket/create@latest ``` ## 🤝 Contributing We are always looking for contributors of all skill levels! If you're looking to ease your way into the project, try out a [good first issue](https://github.com/modernweb-dev/rocket/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22). -If you are interested in helping contribute to Modern Web, please take a look at our [Contributing Guide](https://github.com/modernweb-dev/rocket/blob/next/CONTRIBUTING.md). Also, feel free to drop into [slack](https://next.rocket.modern-web.dev/about/slack/) and say hi. 👋 +If you are interested in helping contribute to Modern Web, please take a look at our [Contributing Guide](https://github.com/modernweb-dev/rocket/blob/next/CONTRIBUTING.md). Also, feel free to drop into [discord](https://rocket.modern-web.dev/chat) and say hi. 👋 ### Financial Contributors diff --git a/assets/logo.png b/assets/logo.png deleted file mode 100644 index 20b4ffc..0000000 Binary files a/assets/logo.png and /dev/null differ diff --git a/examples/01-hydration-starter/package.json b/examples/01-hydration-starter/package.json index 529c1a2..911d82e 100644 --- a/examples/01-hydration-starter/package.json +++ b/examples/01-hydration-starter/package.json @@ -11,8 +11,8 @@ "start": "NODE_DEBUG=engine:rendering rocket start --open" }, "devDependencies": { - "@rocket/cli": "^0.20.0-alpha.17", - "@rocket/engine": "^0.1.0-alpha.23", + "@rocket/cli": "^0.19.0", + "@rocket/engine": "^0.1.0", "@webcomponents/template-shadowroot": "^0.1.0", "lit": "^2.2.5" }, diff --git a/examples/02-blog-starter/package.json b/examples/02-blog-starter/package.json index 7871101..9174a88 100644 --- a/examples/02-blog-starter/package.json +++ b/examples/02-blog-starter/package.json @@ -16,8 +16,8 @@ "start": "NODE_DEBUG=engine:rendering rocket start --open" }, "devDependencies": { - "@rocket/cli": "^0.20.0-alpha.17", - "@rocket/engine": "^0.1.0-alpha.23", + "@rocket/cli": "^0.19.0", + "@rocket/engine": "^0.1.0", "lit": "^2.2.5" }, "@rocket/template-name": "Blog Starter" diff --git a/examples/03-minimal-starter/package.json b/examples/03-minimal-starter/package.json index 01dd8b7..b312ea6 100644 --- a/examples/03-minimal-starter/package.json +++ b/examples/03-minimal-starter/package.json @@ -11,8 +11,8 @@ "start": "NODE_DEBUG=engine:rendering rocket start --open" }, "devDependencies": { - "@rocket/cli": "^0.20.0-alpha.17", - "@rocket/engine": "^0.1.0-alpha.23", + "@rocket/cli": "^0.19.0", + "@rocket/engine": "^0.1.0", "lit": "^2.2.5" }, "@rocket/template-name": "Minimal Starter" diff --git a/examples/04-sanity-minimal-starter/frontend/package.json b/examples/04-sanity-minimal-starter/frontend/package.json index 9412ff1..0d7a332 100644 --- a/examples/04-sanity-minimal-starter/frontend/package.json +++ b/examples/04-sanity-minimal-starter/frontend/package.json @@ -12,8 +12,8 @@ }, "devDependencies": { "@portabletext/to-html": "^1.0.3", - "@rocket/cli": "^0.20.0-alpha.15", - "@rocket/engine": "^0.1.0-alpha.21", + "@rocket/cli": "^0.19.0", + "@rocket/engine": "^0.1.0", "@sanity/block-content-to-markdown": "^0.0.5", "@sanity/client": "^3.1.0", "@sanity/image-url": "^1.0.1", diff --git a/examples/50-landing-theme-spark/package.json b/examples/50-landing-theme-spark/package.json index b90fac7..6f5498d 100644 --- a/examples/50-landing-theme-spark/package.json +++ b/examples/50-landing-theme-spark/package.json @@ -1,5 +1,5 @@ { - "name": "landing-theme-spark", + "name": "rocket-landing-theme-spark", "version": "0.0.1", "private": true, "description": "A landing page based on the spark theme", @@ -11,10 +11,10 @@ "start": "NODE_DEBUG=engine:rendering rocket start --open" }, "devDependencies": { - "@rocket/cli": "^0.20.0-alpha.17", - "@rocket/components": "^0.1.0-alpha.1", - "@rocket/engine": "^0.1.0-alpha.23", - "@rocket/spark": "^0.1.0-alpha.1", + "@rocket/cli": "^0.19.0", + "@rocket/components": "^0.1.0", + "@rocket/engine": "^0.1.0", + "@rocket/spark": "^0.1.0", "lit": "^2.2.5" }, "@rocket/template-name": "Landing Page (@rocket/spark Theme)", diff --git a/examples/51-docs-theme-launch/package.json b/examples/51-docs-theme-launch/package.json index b3b5144..f9d7120 100644 --- a/examples/51-docs-theme-launch/package.json +++ b/examples/51-docs-theme-launch/package.json @@ -11,10 +11,10 @@ "start": "NODE_DEBUG=engine:rendering rocket start --open" }, "devDependencies": { - "@rocket/cli": "^0.20.0-alpha.17", - "@rocket/engine": "^0.1.0-alpha.23", - "@rocket/launch": "^0.20.0-alpha.7", - "@rocket/search": "^0.6.0-alpha.0", + "@rocket/cli": "^0.19.0", + "@rocket/engine": "^0.1.0", + "@rocket/launch": "^0.20.0", + "@rocket/search": "^0.6.0", "lit": "^2.2.5" }, "@rocket/template-name": "Documentation Website (@rocket/launch Theme)", diff --git a/packages/cli/MIGRATION.md b/packages/cli/MIGRATION.md new file mode 100644 index 0000000..a596220 --- /dev/null +++ b/packages/cli/MIGRATION.md @@ -0,0 +1,38 @@ +# Migration + +## From 0.10.x to 0.20.x + +As 0.20.x is a rewrite of all the core logic which meant moving from eleventy to class based templates, server side rendering of web components and a file based routing this migration requires manual work. + +Most of the work however mostly applies if you adjusted templates/layouts or created your own presets/plugins. + +Especially for markdown based content not so much changed. +The biggest change is that the routing is now [file based](https://rocket.modern-web.dev/docs/basics/routing/) which means that your page structure is no longer in the title or frontmatter. + +e.g. + +👉 `docs/about-us/company/location.md` + +```md +# About Us >> Company >> Locations || 20 +``` + +becomes + +👉 `docs/about-us/company/20--location.rocket.md` + +```md +# Location +``` + +This task can be automated by + +1. update to latest `@rocket/cli` +2. rename `docs` to `site/pages` +3. run `npx rocket upgrade` + +This however will only extract the navigation data and rename the files. +To fully migrate you need to setup some files according to the [project structure](https://rocket.modern-web.dev/docs/basics/project-structure/). +At the minium a `site/pages/recursive.data.js` to define the default template. + +If you need more information or help be sure to check out our [discord](https://discord.gg/sTdpM2rkKJ) community. diff --git a/packages/cli/package.json b/packages/cli/package.json index 7c374e1..10bbfc1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@rocket/cli", - "version": "0.20.0-alpha.17", + "version": "0.19.0", "publishConfig": { "access": "public" }, @@ -53,7 +53,7 @@ ], "dependencies": { "@rocket/building-rollup": "^0.4.0", - "@rocket/engine": "^0.1.0-alpha.7", + "@rocket/engine": "^0.1.0", "@web/rollup-plugin-copy": "^0.3.0", "colorette": "^2.0.16", "commander": "^9.0.0", diff --git a/packages/cli/test-node/fixtures/04-open-graph/01-generate-image-and-inject-meta/site/pages/local.data.js b/packages/cli/test-node/fixtures/04-open-graph/01-generate-image-and-inject-meta/site/pages/local.data.js index a978594..eb1f535 100644 --- a/packages/cli/test-node/fixtures/04-open-graph/01-generate-image-and-inject-meta/site/pages/local.data.js +++ b/packages/cli/test-node/fixtures/04-open-graph/01-generate-image-and-inject-meta/site/pages/local.data.js @@ -24,7 +24,7 @@ export const openGraphLayout = data => html`

${pageTree.getPage(data.sourceRelativeFilePath)?.model?.name}

- + `; diff --git a/packages/cli/test-node/fixtures/04-open-graph/02-multiple-pages/site/pages/recursive.data.js b/packages/cli/test-node/fixtures/04-open-graph/02-multiple-pages/site/pages/recursive.data.js index a978594..eb1f535 100644 --- a/packages/cli/test-node/fixtures/04-open-graph/02-multiple-pages/site/pages/recursive.data.js +++ b/packages/cli/test-node/fixtures/04-open-graph/02-multiple-pages/site/pages/recursive.data.js @@ -24,7 +24,7 @@ export const openGraphLayout = data => html`

${pageTree.getPage(data.sourceRelativeFilePath)?.model?.name}

- + `; diff --git a/packages/components/README.md b/packages/components/README.md new file mode 100644 index 0000000..056107f --- /dev/null +++ b/packages/components/README.md @@ -0,0 +1 @@ +# Rocket Components diff --git a/packages/components/package.json b/packages/components/package.json index 2a53fb2..d41980f 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@rocket/components", - "version": "0.1.0-alpha.7", + "version": "0.1.0", "publishConfig": { "access": "public" }, diff --git a/packages/create/src/CreateCli.js b/packages/create/src/CreateCli.js index e870ce0..dbd84f6 100644 --- a/packages/create/src/CreateCli.js +++ b/packages/create/src/CreateCli.js @@ -9,7 +9,7 @@ import degit from 'degit'; import { generateGithubActionsDeployment } from './deployment-generator.js'; const EXAMPLES_PATH = `modernweb-dev/rocket/examples/`; -const TARGET_BRANCH = `#next`; +const TARGET_BRANCH = `#main`; const program = new Command(); const choices = await readFile(new URL('./choices.json', import.meta.url)).then(res => @@ -53,7 +53,7 @@ export class CreateCli { ` ( | ) to search or file a new issue`, ` (( )) `, ` (( : )) Follow us: https://twitter.com/modern_web_dev`, - ` (( )) Chat with us: https://next.rocket.modern-web.dev/chat`, + ` (( )) Chat with us: https://rocket.modern-web.dev/chat`, ` (( )) `, ` ( ) ${gray('Notes: You can exit any time with Ctrl+C or Esc')}`, ` . ${gray('A new folder "rocket-