Merge pull request #1139 from solidjs/vinxi

SolidStart Beta 2

.github/workflows/test.yml

@@ -1,103 +1,103 @@
-name: 🧪 Test
+# name: 🧪 Test
 
-on:
-  push:
-    branches:
-      - main
-      - dev
-      - release-*
-    tags-ignore:
-      - v*
-    paths-ignore:
-      - "docs/**"
-      - "docs.root.tsx"
-      - "components/**"
-      - "**/README.md"
-  pull_request:
-    paths-ignore:
-      - "docs/**"
-      - "**/*.md"
+# on:
+#   push:
+#     branches:
+#       - main
+#       - dev
+#       - release-*
+#     tags-ignore:
+#       - v*
+#     paths-ignore:
+#       - "docs/**"
+#       - "docs.root.tsx"
+#       - "components/**"
+#       - "**/README.md"
+#   pull_request:
+#     paths-ignore:
+#       - "docs/**"
+#       - "**/*.md"
 
-env:
-  CLOUDFLARE_API_TOKEN: ${{ secrets.CF_ACCOUNT_TOKEN }}
-  CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
+# env:
+#   CLOUDFLARE_API_TOKEN: ${{ secrets.CF_ACCOUNT_TOKEN }}
+#   CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
 
-jobs:
-  integration:
-    name: "👀 ${{ matrix.adapter }} (os: ${{ matrix.os }}, node: ${{ matrix.node-version }})"
+# jobs:
+#   integration:
+#     name: "👀 ${{ matrix.adapter }} (os: ${{ matrix.os }}, node: ${{ matrix.node-version }})"
 
-    strategy:
-      fail-fast: false
-      matrix:
-        node-version: [18, 20]
-        adapter:
-          - solid-start-node
-          # - solid-start-cloudflare-workers
-          # - solid-start-cloudflare-pages
-          - solid-start-deno
-        os:
-          - ubuntu-latest
-          # - macos-latest
-          - windows-latest
-        include:
-          - os: ubuntu-latest
-            playwright_binary_path: ~/.cache/ms-playwright
-          # - os: macos-latest
-          #   playwright_binary_path: ~/Library/Caches/ms-playwright
-          - os: windows-latest
-            playwright_binary_path: '~\\AppData\\Local\\ms-playwright'
+#     strategy:
+#       fail-fast: false
+#       matrix:
+#         node-version: [18, 20]
+#         adapter:
+#           - solid-start-node
+#           # - solid-start-cloudflare-workers
+#           # - solid-start-cloudflare-pages
+#           - solid-start-deno
+#         os:
+#           - ubuntu-latest
+#           # - macos-latest
+#           - windows-latest
+#         include:
+#           - os: ubuntu-latest
+#             playwright_binary_path: ~/.cache/ms-playwright
+#           # - os: macos-latest
+#           #   playwright_binary_path: ~/Library/Caches/ms-playwright
+#           - os: windows-latest
+#             playwright_binary_path: '~\\AppData\\Local\\ms-playwright'
 
-    runs-on: ${{ matrix.os }}
+#     runs-on: ${{ matrix.os }}
 
-    steps:
-      - uses: actions/checkout@v2
+#     steps:
+#       - uses: actions/checkout@v2
 
-      - uses: pnpm/action-setup@v2.2.2
-        with:
-          version: 8
+#       - uses: pnpm/action-setup@v2.2.2
+#         with:
+#           version: 8
 
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: "pnpm"
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+#       - name: Use Node.js ${{ matrix.node-version }}
+#         uses: actions/setup-node@v3
+#         with:
+#           node-version: ${{ matrix.node-version }}
+#           cache: "pnpm"
+#       - name: Install dependencies
+#         run: pnpm install --frozen-lockfile
 
-      - name: Use Deno
-        if: matrix.adapter == 'solid-start-deno'
-        uses: denoland/setup-deno@v1
-        with:
-          deno-version: v1.x
+#       - name: Use Deno
+#         if: matrix.adapter == 'solid-start-deno'
+#         uses: denoland/setup-deno@v1
+#         with:
+#           deno-version: v1.x
 
-      - name: 🕵️‍♂️ Get current Playwright version
-        id: playwright-version
-        shell: bash
-        run: |
-          playwright_version=1.38.1
-          echo "::set-output name=version::${playwright_version}"
+#       - name: 🕵️‍♂️ Get current Playwright version
+#         id: playwright-version
+#         shell: bash
+#         run: |
+#           playwright_version=1.38.1
+#           echo "::set-output name=version::${playwright_version}"
 
-      - name: 🤖 Cache Playwright binaries
-        uses: actions/cache@v3
-        id: playwright-cache
-        with:
-          path: ${{ matrix.playwright_binary_path }}
-          key: ${{ runner.os }}-${{ runner.arch }}-cache-playwright-${{ steps.playwright-version.outputs.version }}
+#       - name: 🤖 Cache Playwright binaries
+#         uses: actions/cache@v3
+#         id: playwright-cache
+#         with:
+#           path: ${{ matrix.playwright_binary_path }}
+#           key: ${{ runner.os }}-${{ runner.arch }}-cache-playwright-${{ steps.playwright-version.outputs.version }}
 
-      - name: 🖨️ Playwright info
-        shell: bash
-        run: |
-          echo "OS: ${{ matrix.os }}"
-          echo "Playwright version: ${{ steps.playwright-version.outputs.version }}"
-          echo "Playwright install dir: ${{ matrix.playwright_binary_path }}"
-          echo "Cache key: ${{ runner.os }}-${{ runner.arch }}-cache-playwright-${{ steps.playwright-version.outputs.version }}"
-          echo "Cache hit: ${{ steps.playwright-cache.outputs.cache-hit == 'true' }}"
+#       - name: 🖨️ Playwright info
+#         shell: bash
+#         run: |
+#           echo "OS: ${{ matrix.os }}"
+#           echo "Playwright version: ${{ steps.playwright-version.outputs.version }}"
+#           echo "Playwright install dir: ${{ matrix.playwright_binary_path }}"
+#           echo "Cache key: ${{ runner.os }}-${{ runner.arch }}-cache-playwright-${{ steps.playwright-version.outputs.version }}"
+#           echo "Cache hit: ${{ steps.playwright-cache.outputs.cache-hit == 'true' }}"
 
-      - name: 📥 Install Playwright
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: pnpm --filter solid-start-tests install:playwright
+#       - name: 📥 Install Playwright
+#         if: steps.playwright-cache.outputs.cache-hit != 'true'
+#         run: pnpm --filter solid-start-tests install:playwright
 
-      - name: 👀 Run Integration Tests
-        env:
-          START_ADAPTER: ${{ matrix.adapter }}
-        run: npm run test
+#       - name: 👀 Run Integration Tests
+#         env:
+#           START_ADAPTER: ${{ matrix.adapter }}
+#         run: npm run test

.gitignore

@@ -4,6 +4,7 @@ types/
 .turbo
 .nitro
 .output
+.vinxi
 
 packages/create-solid/bin
 *.log
@@ -45,3 +46,6 @@ netlify
 .vercel
 
 vite.config.ts.timestamp*
+
+.nitro
+.output

examples/movies/package.json → archived_examples/movies/package.json

@@ -16,11 +16,11 @@
   },
   "dependencies": {
     "@solid-primitives/scheduled": "1.1.0",
-    "@solidjs/meta": "^0.29.1",
+    "@solidjs/meta": "^0.29.2",
     "@solidjs/router": "^0.8.3",
     "nprogress": "^0.2.0",
     "solid-heroicons": "^3.2.4",
-    "solid-js": "^1.8.5",
+    "solid-js": "^1.8.6",
     "solid-start": "^0.3.10",
     "solid-start-netlify": "^0.3.10"
   },

examples/notes/package.json → archived_examples/notes/package.json

@@ -16,14 +16,14 @@
     "@cloudflare/kv-asset-handler": "^0.2.0",
     "@cloudflare/workers-types": "^3.19.0",
     "@iconify/json": "^2.2.102",
-    "@solidjs/meta": "^0.29.1",
+    "@solidjs/meta": "^0.29.2",
     "@solidjs/router": "^0.8.3",
     "@types/marked": "^4.3.1",
     "date-fns": "^2.30.0",
     "excerpts": "^0.0.3",
     "marked": "^4.3.0",
     "sanitize-html": "^2.11.0",
-    "solid-js": "^1.8.5",
+    "solid-js": "^1.8.6",
     "solid-start": "^0.3.10",
     "string_decoder": "^1.3.0",
     "unplugin-icons": "^0.14.15",

examples/with-authjs/package.json → archived_examples/with-authjs/package.json

@@ -18,9 +18,9 @@
   "dependencies": {
     "@auth/core": "^0.5.1",
     "@solid-auth/base": "^2.0.3",
-    "@solidjs/meta": "^0.29.1",
+    "@solidjs/meta": "^0.29.2",
     "@solidjs/router": "^0.8.3",
-    "solid-js": "^1.8.5",
+    "solid-js": "^1.8.6",
     "solid-start": "^0.3.10"
   },
   "engines": {

examples/with-vitest/package.json → archived_examples/with-vitest/package.json

@@ -11,15 +11,15 @@
   },
   "type": "module",
   "devDependencies": {
-    "@solidjs/meta": "^0.29.1",
+    "@solidjs/meta": "^0.29.2",
     "@solidjs/router": "^0.8.3",
     "@solidjs/testing-library": "^0.5.2",
     "@testing-library/jest-dom": "^5.17.0",
     "@types/testing-library__jest-dom": "^5.14.9",
     "@vitest/coverage-c8": "^0.26.3",
     "@vitest/ui": "^0.26.3",
     "jsdom": "^20.0.3",
-    "solid-js": "^1.8.5",
+    "solid-js": "^1.8.6",
     "solid-start": "^0.3.10",
     "solid-start-node": "^0.3.10",
     "typescript": "^4.9.5",

test/package.json → archived_test/package.json

@@ -24,12 +24,10 @@
     "polka": "1.0.0-next.22",
     "prettier": "^2.8.8",
     "sirv": "^2.0.3",
-    "solid-start": "workspace:*",
-    "solid-start-node": "workspace:*",
+    "@solidjs/start": "workspace:*",
     "strip-indent": "^4.0.0",
-    "undici": "^5.22.1",
     "vite": "^4.4.6",
-    "vitest": "^0.28.5",
+    "vitest": "^0.29.0",
     "wait-on": "^7.0.1"
   },
   "devDependencies": {

archived_test/template/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "test-node-template",
+  "scripts": {
+    "dev": "vinxi dev",
+    "build": "vinxi build",
+    "start": "node ./.output/server/index.mjs"
+  },
+  "type": "module",
+  "devDependencies": {
+    "@solidjs/meta": "^0.29.2",
+    "@solidjs/router": "^0.9.0",
+    "solid-js": "^1.8.7",
+    "typescript": "^4.9.5",
+    "vite": "^4.4.6"
+  },
+  "engines": {
+    "node": ">=18"
+  }
+}

archived_test/template/vite.config.ts

@@ -0,0 +1,3 @@
+import { defineConfig } from "@solidjs/start/config";
+
+export default defineConfig({});