Merge branch '2.x' into 3.x

adrum · adrum · commit 6dfb9f8fa1b6 · 2026-04-13T02:08:03.000-04:00
# Conflicts:
#	packages/create-inertiacore/stubs/react-ts/ClientApp/src/ssr.tsx
#	packages/create-inertiacore/stubs/vue-ts/ClientApp/src/App.ts
#	packages/create-inertiacore/stubs/vue-ts/ClientApp/src/ssr.ts
#	packages/create-inertiacore/stubs/vue-ts/ClientApp/vite.config.ssr.ts
#	packages/create-inertiacore/stubs/vue-ts/ClientApp/vite.config.ts
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -27,6 +27,7 @@ jobs:
       - name: Publish create-inertiacore
         working-directory: packages/create-inertiacore
         run: |
+          npm version "${GITHUB_REF_NAME#v}" --no-git-tag-version --allow-same-version
           npm install
           npm run build --if-present
           npm test --if-present
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,19 +13,25 @@ env:
   INERTIACORE_BYPASS_ENV_CHECK: 1
 
 jobs:
-  tests:
+  stubs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
-        node-version: [20.x, 22.x, latest]
+        node-version: [20.x, 22.x, lts/*]
+        stub: [react-ts, vue-ts, svelte-ts]
+
+    defaults:
+      run:
+        working-directory: packages/create-inertiacore/stubs/${{ matrix.stub }}/ClientApp
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -35,8 +41,5 @@ jobs:
       - name: ESLint
         run: npm run lint
 
-      - name: Execute tests
-        run: npm test
-
       - name: Run build
         run: npm run build
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ This repository contains examples of how to use [InertiaCore](https://github.com
 To create a new project using InertiaCore, run the following command:
 
 ```bash
-npx @inertiacore/create@latest
+npm init inertiacore@latest
 ```
 
 This will create a new project with the name you provide.
diff --git a/packages/create-inertiacore/package.json b/packages/create-inertiacore/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-inertiacore",
-    "version": "2.0.0",
+    "version": "0.0.0",
     "description": "InertiaCore Create",
     "type": "module",
     "homepage": "https://github.com/InertiaCore/kits",
@@ -13,9 +13,6 @@
     "publishConfig": {
         "access": "public"
     },
-    "scripts": {
-        "publish": "npm publish --access public"
-    },
     "bin": {
         "create-inertiacore": "bin/create.js"
     },
diff --git a/packages/create-inertiacore/stubs/react-ts/ClientApp/.prettierignore b/packages/create-inertiacore/stubs/react-ts/ClientApp/.prettierignore
@@ -0,0 +1,3 @@
+.prettierrc
+node_modules
+dist
diff --git a/packages/create-inertiacore/stubs/react-ts/ClientApp/tsconfig.json b/packages/create-inertiacore/stubs/react-ts/ClientApp/tsconfig.json
@@ -6,7 +6,7 @@
         "target": "esnext",
         "module": "esnext",
         "noEmit": true,
-        "moduleResolution": "node",
+        "moduleResolution": "bundler",
         "jsx": "react-jsx",
         "rootDir": "./src",
         "strict": true,
diff --git a/packages/create-inertiacore/stubs/svelte-ts/ClientApp/.prettierignore b/packages/create-inertiacore/stubs/svelte-ts/ClientApp/.prettierignore
@@ -0,0 +1,3 @@
+.prettierrc
+node_modules
+dist
diff --git a/packages/create-inertiacore/stubs/svelte-ts/ClientApp/.prettierrc b/packages/create-inertiacore/stubs/svelte-ts/ClientApp/.prettierrc
@@ -5,16 +5,8 @@
     "htmlWhitespaceSensitivity": "css",
     "printWidth": 80,
     "plugins": [
-        "prettier-plugin-svelte",
-        "prettier-plugin-organize-imports",
-        "prettier-plugin-tailwindcss"
+        "prettier-plugin-svelte"
     ],
-    "tailwindFunctions": [
-        "clsx",
-        "cn",
-        "cva"
-    ],
-    "tailwindStylesheet": "resources/css/app.css",
     "tabWidth": 4,
     "overrides": [
         {
diff --git a/packages/create-inertiacore/stubs/svelte-ts/ClientApp/package.json b/packages/create-inertiacore/stubs/svelte-ts/ClientApp/package.json
@@ -26,9 +26,7 @@
         "@inertiacore/vite-plugin": "^3.0.0",
         "@inertiajs/vite": "^3.0.3",
         "prettier": "^3.6.2",
-        "prettier-plugin-organize-imports": "^4.3.0",
         "prettier-plugin-svelte": "^3.4.0",
-        "prettier-plugin-tailwindcss": "^0.6.14",
         "typescript-eslint": "^8.44.0",
         "vite": "^8.0.0"
     }
diff --git a/packages/create-inertiacore/stubs/vue-ts/ClientApp/.prettierignore b/packages/create-inertiacore/stubs/vue-ts/ClientApp/.prettierignore
@@ -0,0 +1,3 @@
+.prettierrc
+node_modules
+dist
diff --git a/packages/create-inertiacore/stubs/vue-ts/ClientApp/eslint.config.js b/packages/create-inertiacore/stubs/vue-ts/ClientApp/eslint.config.js
@@ -1,29 +1,29 @@
-import prettier from "eslint-config-prettier/flat";
-import vue from "eslint-plugin-vue";
+import prettier from 'eslint-config-prettier/flat';
+import vue from 'eslint-plugin-vue';
 
 import {
-  defineConfigWithVueTs,
-  vueTsConfigs,
-} from "@vue/eslint-config-typescript";
+    defineConfigWithVueTs,
+    vueTsConfigs,
+} from '@vue/eslint-config-typescript';
 
 export default defineConfigWithVueTs(
-  vue.configs["flat/essential"],
-  vueTsConfigs.recommended,
-  {
-    ignores: [
-      "vendor",
-      "node_modules",
-      "public",
-      "bootstrap/ssr",
-      "tailwind.config.js",
-      "resources/js/components/ui/*",
-    ],
-  },
-  {
-    rules: {
-      "vue/multi-word-component-names": "off",
-      "@typescript-eslint/no-explicit-any": "off",
+    vue.configs['flat/essential'],
+    vueTsConfigs.recommended,
+    {
+        ignores: [
+            'vendor',
+            'node_modules',
+            'public',
+            'bootstrap/ssr',
+            'tailwind.config.js',
+            'resources/js/components/ui/*',
+        ],
     },
-  },
-  prettier
+    {
+        rules: {
+            'vue/multi-word-component-names': 'off',
+            '@typescript-eslint/no-explicit-any': 'off',
+        },
+    },
+    prettier,
 );
diff --git a/packages/create-inertiacore/stubs/vue-ts/ClientApp/src/Pages/Error/ServerError.vue b/packages/create-inertiacore/stubs/vue-ts/ClientApp/src/Pages/Error/ServerError.vue
@@ -53,7 +53,7 @@ defineProps<{
                         >
                             <Link
                                 href="/"
-                                class="inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
+                                class="inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-indigo-700 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-none"
                             >
                                 Go back home
                             </Link>
diff --git a/packages/create-inertiacore/stubs/vue-ts/ClientApp/tsconfig.json b/packages/create-inertiacore/stubs/vue-ts/ClientApp/tsconfig.json
@@ -1,24 +1,18 @@
 {
-    "include": [
-        "src/**/*"
-    ],
+    "include": ["src/**/*"],
     "compilerOptions": {
         "target": "esnext",
         "module": "esnext",
         "noEmit": true,
-        "moduleResolution": "node",
+        "moduleResolution": "bundler",
         "rootDir": "./src",
         "strict": true,
         "esModuleInterop": true,
         "skipLibCheck": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "@/*": [
-                "./src/*"
-            ],
+            "@/*": ["./src/*"]
         },
-        "types": [
-            "vite/client"
-        ]
+        "types": ["vite/client"]
     }
 }
diff --git a/packages/create-inertiacore/stubs/vue-ts/ClientApp/vite.config.ts b/packages/create-inertiacore/stubs/vue-ts/ClientApp/vite.config.ts
@@ -1,14 +1,14 @@
-import { defineConfig } from "vite";
+import inertiacore from '@inertiacore/vite-plugin';
+import inertia from '@inertiajs/vite';
+import tailwindcss from '@tailwindcss/vite';
 import vue from '@vitejs/plugin-vue';
-import inertiacore from "@inertiacore/vite-plugin";
-import inertia from "@inertiajs/vite";
-import tailwindcss from '@tailwindcss/vite'
+import { defineConfig } from 'vite';
 
 export default defineConfig({
     plugins: [
         tailwindcss(),
         inertiacore({
-            input: ["src/App.ts"],
+            input: ['src/App.ts'],
             refresh: true,
         }),
         inertia({
@@ -25,7 +25,7 @@ export default defineConfig({
     ],
     resolve: {
         alias: {
-            "@": "/src",
+            '@': '/src',
         },
     },
     build: {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.prettierrc`
	`2`	`+node_modules`
	`3`	`+dist`