Merge pull request #390 from vikejs/no-empty-ui

vikejs · Sep 20, 2024 · d6e9203 · d6e9203
2 parents 3644be3 + 68eea68
commit d6e9203
Show file tree

Hide file tree

Showing 26 changed files with 219 additions and 699 deletions.
diff --git a/boilerplates/eslint/files/eslint.config.js b/boilerplates/eslint/files/eslint.config.js
@@ -30,6 +30,7 @@ export default tseslint.config(
   {
     languageOptions: {
       parserOptions: {
+        warnOnUnsupportedTypeScriptVersion: false,
         sourceType: "module",
         ecmaVersion: "latest",
       },

diff --git a/boilerplates/plain-sentry/files/$package.json.ts b/boilerplates/plain-sentry/files/$package.json.ts
diff --git a/boilerplates/plain-sentry/files/pages/sentry/+Page.js b/boilerplates/plain-sentry/files/pages/sentry/+Page.js
diff --git a/boilerplates/plain-sentry/files/pages/sentry/+client.js b/boilerplates/plain-sentry/files/pages/sentry/+client.js
diff --git a/boilerplates/plain-sentry/files/sentry.browser.config.ts b/boilerplates/plain-sentry/files/sentry.browser.config.ts
diff --git a/boilerplates/plain-sentry/files/vite-env.d.ts b/boilerplates/plain-sentry/files/vite-env.d.ts
diff --git a/boilerplates/plain-sentry/package.json b/boilerplates/plain-sentry/package.json
diff --git a/boilerplates/plain-sentry/tsconfig.json b/boilerplates/plain-sentry/tsconfig.json
diff --git a/boilerplates/shared-plain/files/pages/index/+Page.ts b/boilerplates/shared-plain/files/pages/index/+Page.ts
diff --git a/boilerplates/shared-plain/files/renderer/+config.ts b/boilerplates/shared-plain/files/renderer/+config.ts
diff --git a/boilerplates/shared-plain/files/renderer/+onRenderHtml.ts b/boilerplates/shared-plain/files/renderer/+onRenderHtml.ts
diff --git a/boilerplates/shared-plain/package.json b/boilerplates/shared-plain/package.json
diff --git a/boilerplates/shared-plain/tsconfig.json b/boilerplates/shared-plain/tsconfig.json
diff --git a/packages/cli/index.ts b/packages/cli/index.ts
@@ -214,6 +214,21 @@ async function checkArguments(args: ParsedArgs<Args>) {
   }
 }
 
+function checkFlagsIncludesUiFramework(flags: string[]) {
+  const uiFlags: string[] = features.filter((fs) => fs.category === "UI Framework").map((fs) => fs.flag);
+  const uiFlagFound = flags.some((f) => uiFlags.includes(f));
+
+  if (!uiFlagFound) {
+    const lf = new Intl.ListFormat("en", {
+      type: "disjunction",
+    });
+    console.error(
+      `${red("⚠")} A ${yellow("UI Framework")} is required when using Bati. Choose one of ${lf.format(uiFlags.map((f) => bold(`--${f}`)))}`,
+    );
+    process.exit(5);
+  }
+}
+
 function checkFlagsExist(flags: string[]) {
   const inValidOptions = flags.reduce((acc: string[], flag: string) => {
     if (!Object.prototype.hasOwnProperty.call(defaultDef, flag) && !features.some((f) => f.flag === flag)) {
@@ -361,6 +376,7 @@ async function run() {
       ];
 
       checkFlagsExist(flags);
+      checkFlagsIncludesUiFramework(flags);
       checkRules(flags);
 
       // `enforce: "pre"` boilerplates first, then `enforce: undefined`, then `enforce: "post"`

diff --git a/packages/cli/turbo.json b/packages/cli/turbo.json
@@ -25,7 +25,6 @@
         "@batijs/hono#build",
         "@batijs/lucia-auth#build",
         "@batijs/mantine#build",
-        "@batijs/plain-sentry#build",
         "@batijs/prettier#build",
         "@batijs/prisma#build",
         "@batijs/react#build",
@@ -37,7 +36,6 @@
         "@batijs/shared#build",
         "@batijs/shared-db#build",
         "@batijs/shared-no-db#build",
-        "@batijs/shared-plain#build",
         "@batijs/shared-server#build",
         "@batijs/shared-todo#build",
         "@batijs/solid#build",

diff --git a/packages/core/src/parse/linters/linter-ts.ts b/packages/core/src/parse/linters/linter-ts.ts
@@ -66,6 +66,9 @@ export default function tsLinterConfig(meta: VikeMeta) {
       },
       languageOptions: {
         parser: tsParseForESLint,
+        parserOptions: {
+          warnOnUnsupportedTypeScriptVersion: false,
+        },
       },
       rules: {
         "batiTs/ts": "error",

diff --git a/packages/features/src/categories.ts b/packages/features/src/categories.ts
@@ -6,13 +6,15 @@ export const categories = [
     label: "Frontend Framework",
     group: categoriesGroups.Frontend,
     description: `Flexible, robust, community-driven, and fast Vite-based frontend framework.`,
+    required: true,
   },
   {
     label: "UI Framework",
     group: categoriesGroups.Frontend,
     description: `It’s recommended to choose a frontend lib to kickstart a new Vike project,
 as they each come with a wide range of integrations. You can at any time eject and take control over integration code
 so that it doesn’t get in your way.`,
+    required: true,
   },
   {
     label: "CSS",