Merge branch 'main' into php-84

railwayapp · Jan 16, 2025 · 098cb24 · 098cb24
2 parents b15a626 + 6e8a1b9
commit 098cb24
Show file tree

Hide file tree

Showing 171 changed files with 22,439 additions and 36 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -77,6 +77,7 @@ jobs:
   test-plan:
     name: Test Suite
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
@@ -118,6 +119,7 @@ jobs:
     name: Docker Tests
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix: ${{fromJson(needs.test-plan.outputs.matrix)}}
     if: "!contains(github.event.head_commit.message, '(cargo-release)')"
     steps:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nixpacks"
-version = "1.31.0"
+version = "1.32.0"
 edition = "2021"
 license = "MIT"
 authors = ["Railway <[email protected]>"]

diff --git a/docs/pages/docs/deploying/coolify.md b/docs/pages/docs/deploying/coolify.md
@@ -0,0 +1,9 @@
+---
+title: Coolify
+---
+
+# {% $markdoc.frontmatter.title %}
+
+Nixpacks is available as a builder on [Coolify](https://coolify.io/). Configure the builder on the service settings page.
+
+![](/images/coolify.png)
diff --git a/docs/pages/docs/providers/node.md b/docs/pages/docs/providers/node.md
@@ -105,3 +105,23 @@ Corepack will only be used on Node 16 and above.
 ## Bun Support
 
 We support Bun, but due to Bun being in alpha, it is unstable and very experimental.
+
+## SPA Application Support
+
+If we detect your application is using [Vite](https://vite.dev) and doesn't have a server, we will automatically compile your app and run it using [Caddy](https://caddyserver.com/)
+
+If you wish to turn off Caddy, you can set the environment variable `NIXPACKS_SPA_CADDY` to `false`.
+
+If you have an application that doesn't pass the requirements for automatically using [Caddy](https://caddyserver.com/), set the `NIXPACKS_SPA_OUT_DIR` variable to the out directory of your application.
+
+### Caddy requirements
+
+If your package.json has `vite` any of the following dependencies:
+
+- `react`
+- `vue`
+- `svelte` (but not `@sveltejs/kit`)
+- `preact`
+- `lit`
+- `solid-js`
+- `@builder.io/qwik`
diff --git a/docs/public/images/coolify.png b/docs/public/images/coolify.png
diff --git a/docs/sidebar.ts b/docs/sidebar.ts
@@ -65,14 +65,15 @@ export const sidebarItems: ISidebarSection[] = [
     text: "Deploying",
     links: [
       { text: "Railway", href: "/docs/deploying/railway" },
-      { text: "Stacktape", href: "/docs/deploying/stacktape" },
-      { text: "Flightcontrol", href: "/docs/deploying/flightcontrol" },
-      { text: "Easypanel", href: "/docs/deploying/easypanel" },
       { text: "Coherence", href: "/docs/deploying/coherence" },
-      { text: "PipeOps", href: "/docs/deploying/pipeops" },
+      { text: "Coolify", href: "/docs/deploying/coolify" },
+      { text: "Dokku", href: "/docs/deploying/dokku" },
       { text: "Dokploy", href: "/docs/deploying/dokploy" },
+      { text: "Easypanel", href: "/docs/deploying/easypanel" },
+      { text: "Flightcontrol", href: "/docs/deploying/flightcontrol" },
       { text: "GitHub Actions", href: "/docs/deploying/github-actions" },
-      { text: "Dokku", href: "/docs/deploying/dokku" },
+      { text: "PipeOps", href: "/docs/deploying/pipeops" },
+      { text: "Stacktape", href: "/docs/deploying/stacktape" },
     ],
   },
 ];
diff --git a/examples/node-vite-lit-ts/.gitignore b/examples/node-vite-lit-ts/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/examples/node-vite-lit-ts/index.html b/examples/node-vite-lit-ts/index.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + Lit + TS</title>
+    <link rel="stylesheet" href="./src/index.css" />
+    <script type="module" src="/src/my-element.ts"></script>
+  </head>
+  <body>
+    <my-element>
+      <h1>Vite + Lit</h1>
+    </my-element>
+  </body>
+</html>
diff --git a/examples/node-vite-lit-ts/package.json b/examples/node-vite-lit-ts/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "vite-lit-ts-starter",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "lit": "^3.2.1"
+  },
+  "devDependencies": {
+    "typescript": "~5.7.2",
+    "vite": "^6.0.7"
+  }
+}
diff --git a/examples/node-vite-lit-ts/public/vite.svg b/examples/node-vite-lit-ts/public/vite.svg
diff --git a/examples/node-vite-lit-ts/src/assets/lit.svg b/examples/node-vite-lit-ts/src/assets/lit.svg
diff --git a/examples/node-vite-lit-ts/src/index.css b/examples/node-vite-lit-ts/src/index.css
@@ -0,0 +1,38 @@
+:root {
+  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+}