Support CSS options in Vite projects

.changeset/rare-bags-attack.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli-hydrogen': minor
+---
+
+Support Vite projects in `h2 setup css` command to setup Tailwind and vanilla-extract. Drop CSS setup support for classic Remix projects.

docs/preview/package.json

@@ -21,7 +21,7 @@
   "devDependencies": {
     "@remix-run/dev": "^2.10.1",
     "@remix-run/eslint-config": "^2.10.1",
-    "@tailwindcss/vite": "4.0.0-alpha.16",
+    "@tailwindcss/vite": "4.0.0-alpha.17",
     "@types/he": "^1.2.1",
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.2.7",

packages/cli/assets/tailwind/package.json

@@ -3,11 +3,6 @@
     "defaults"
   ],
   "devDependencies": {
-    "@tailwindcss/forms": "^0.5.3",
-    "@tailwindcss/typography": "^0.5.9",
-    "postcss": "^8.4.21",
-    "postcss-import": "^15.1.0",
-    "postcss-preset-env": "^8.2.0",
-    "tailwindcss": "^3.3.0"
+    "@tailwindcss/vite": "4.0.0-alpha.17"
   }
 }

packages/cli/assets/tailwind/tailwind.css

@@ -1,3 +1,6 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+/**
+ * Configure Tailwind v4 in this file using CSS variables and directives:
+ * https://tailwindcss.com/blog/tailwindcss-v4-alpha#css-first-configuration 
+ */
+
+@import 'tailwindcss';

packages/cli/assets/vanilla-extract/package.json

@@ -1,9 +1,8 @@
 {
-  "comment": "Remix version is automatically updated by the CLI",
   "dependencies": {
-    "@remix-run/css-bundle": "^1"
+    "@vanilla-extract/css": "^1.15.2"
   },
   "devDependencies": {
-    "@vanilla-extract/css": "^1.11.0"
+    "@vanilla-extract/vite-plugin": "^4.0.10"
   }
 }

packages/cli/oclif.manifest.json

@@ -1029,6 +1029,14 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "styling": {
+          "description": "Sets the styling strategy to use. One of `tailwind`, `vanilla-extract`, `css-modules`, `postcss`, `none`.",
+          "env": "SHOPIFY_HYDROGEN_FLAG_STYLING",
+          "name": "styling",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "markets": {
           "description": "Sets the URL structure to support multiple markets. Must be one of: `subfolders`, `domains`, `subdomains`, `none`. Example: `--markets subfolders`.",
           "env": "SHOPIFY_HYDROGEN_FLAG_I18N",
@@ -1457,12 +1465,12 @@
       "aliases": [],
       "args": {
         "strategy": {
-          "description": "The CSS strategy to setup. One of tailwind,css-modules,vanilla-extract,postcss",
+          "description": "The CSS strategy to setup. One of tailwind,vanilla-extract,css-modules,postcss",
           "name": "strategy",
           "options": [
             "tailwind",
-            "css-modules",
             "vanilla-extract",
+            "css-modules",
             "postcss"
           ]
         }

packages/cli/src/commands/hydrogen/init.test.ts

@@ -65,6 +65,7 @@ describe('init', () => {
       shortcut: true,
       quickstart: true,
       git: true,
+      styling: 'tailwind',
     });
   });
 
@@ -79,6 +80,7 @@ describe('init', () => {
           path: tmpDir,
           quickstart: true,
           language: 'ts',
+          styling: 'none',
         }),
       ).resolves.not.toThrow();
 

packages/cli/src/commands/hydrogen/init.ts

@@ -7,6 +7,10 @@ import {
   flagsToCamelObject,
 } from '../../lib/flags.js';
 import {checkCurrentCLIVersion} from '../../lib/check-cli-version.js';
+import {
+  STYLING_CHOICES,
+  type StylingChoice,
+} from '../../lib/setups/css/index.js';
 import {I18N_CHOICES, type I18nChoice} from '../../lib/setups/i18n/index.js';
 import {supressNodeExperimentalWarnings} from '../../lib/process.js';
 import {setupTemplate, type InitOptions} from '../../lib/onboarding/index.js';
@@ -38,6 +42,7 @@ export default class Init extends Command {
       description: 'Use mock.shop as the data source for the storefront.',
       env: 'SHOPIFY_HYDROGEN_FLAG_MOCK_DATA',
     }),
+    ...commonFlags.styling,
     ...commonFlags.markets,
     ...commonFlags.shortcut,
     routes: Flags.boolean({
@@ -94,6 +99,17 @@ export async function runInit(
     );
   }
 
+  if (
+    options.styling &&
+    !STYLING_CHOICES.includes(options.styling as StylingChoice)
+  ) {
+    throw new AbortError(
+      `Invalid styling strategy: ${
+        options.styling
+      }. Must be one of ${STYLING_CHOICES.join(', ')}`,
+    );
+  }
+
   options.git ??= true;
 
   /**
@@ -109,6 +125,7 @@ export async function runInit(
     options.path ??= './hydrogen-quickstart';
     options.routes ??= true;
     options.shortcut ??= true;
+    options.styling ??= 'tailwind';
   }
 
   const showUpgrade = await checkCurrentCLIVersion();

packages/cli/src/commands/hydrogen/setup/css.ts

@@ -5,20 +5,25 @@ import {
   flagsToCamelObject,
 } from '../../../lib/flags.js';
 import Command from '@shopify/cli-kit/node/base-command';
-import {renderSuccess, renderTasks} from '@shopify/cli-kit/node/ui';
+import {
+  renderSuccess,
+  renderTasks,
+  renderWarning,
+} from '@shopify/cli-kit/node/ui';
 import {
   getPackageManager,
   installNodeModules,
 } from '@shopify/cli-kit/node/node-package-manager';
 import {Args} from '@oclif/core';
-import {getRemixConfig, hasRemixConfigFile} from '../../../lib/remix-config.js';
 import {
   setupCssStrategy,
   SETUP_CSS_STRATEGIES,
   CSS_STRATEGY_NAME_MAP,
+  CSS_STRATEGY_HELP_URL_MAP,
   type CssStrategy,
   renderCssPrompt,
 } from '../../../lib/setups/css/index.js';
+import {getViteConfig} from '../../../lib/vite-config.js';
 import {AbortError} from '@shopify/cli-kit/node/error';
 
 export default class SetupCSS extends Command {
@@ -64,21 +69,30 @@ export async function runSetupCSS({
   force?: boolean;
   installDeps: boolean;
 }) {
-  if (!(await hasRemixConfigFile(directory))) {
+  const viteConfig = await getViteConfig(directory).catch(() => null);
+  if (!viteConfig) {
     throw new AbortError(
-      'No remix.config.js file found. This command is not supported in Vite projects.',
+      'No Vite config found. This command is only supported in Vite projects.',
     );
   }
 
-  const remixConfigPromise = getRemixConfig(directory);
+  const {remixConfig} = viteConfig;
+
   const strategy = flagStrategy ? flagStrategy : await renderCssPrompt();
 
-  const remixConfig = await remixConfigPromise;
+  if (strategy === 'css-modules' || strategy === 'postcss') {
+    renderSuccess({
+      headline: `Vite works out of the box with ${CSS_STRATEGY_NAME_MAP[strategy]}.`,
+      body: `See the Vite documentation for more information:\n${CSS_STRATEGY_HELP_URL_MAP[strategy]}`,
+    });
+
+    return;
+  }
 
   const setupOutput = await setupCssStrategy(strategy, remixConfig, force);
   if (!setupOutput) return;
 
-  const {workPromise, generatedAssets, helpUrl} = setupOutput;
+  const {workPromise, generatedAssets, needsInstallDeps} = setupOutput;
 
   const tasks = [
     {
@@ -89,7 +103,9 @@ export async function runSetupCSS({
     },
   ];
 
-  if (installDeps) {
+  let isNpm = false;
+
+  if (installDeps && needsInstallDeps) {
     const gettingPkgManagerPromise = getPackageManager(
       remixConfig.rootDirectory,
     );
@@ -98,6 +114,8 @@ export async function runSetupCSS({
       title: 'Installing new dependencies',
       task: async () => {
         const packageManager = await gettingPkgManagerPromise;
+        isNpm = packageManager === 'npm' || packageManager === 'unknown';
+
         await installNodeModules({
           directory: remixConfig.rootDirectory,
           packageManager,
@@ -116,6 +134,19 @@ export async function runSetupCSS({
         ? 'You can now modify CSS configuration in the following files:\n' +
           generatedAssets.map((file) => `  - ${file}`).join('\n') +
           '\n'
-        : '') + `\nFor more information, visit ${helpUrl}.`,
+        : '') +
+      `\nFor more information, visit ${CSS_STRATEGY_HELP_URL_MAP[strategy]}`,
   });
+
+  // Due to a bug in NPM related to optional dependencies in Tailwind,
+  // we need to reinstall dependencies to fix node_modules:
+  // https://github.com/npm/cli/issues/4828
+  if (needsInstallDeps && isNpm && strategy === 'tailwind') {
+    renderWarning({
+      body: [
+        'Due to a bug in NPM, you might need to reinstall dependencies again.\nRun',
+        {command: 'npm install'},
+      ],
+    });
+  }
 }

packages/cli/src/lib/build.ts

@@ -22,9 +22,7 @@ export const ASSETS_STARTER_DIR_ROUTES = 'routes';
 
 export type AssetsDir =
   | 'tailwind'
-  | 'css-modules'
   | 'vanilla-extract'
-  | 'postcss'
   | 'vite'
   | 'i18n'
   | 'routes'

packages/cli/src/lib/flags.ts

@@ -5,6 +5,7 @@ import {renderInfo} from '@shopify/cli-kit/node/ui';
 import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn';
 import colors from '@shopify/cli-kit/node/colors';
 import type {CamelCasedProperties, PartialDeep} from 'type-fest';
+import {STYLING_CHOICES} from './setups/css/index.js';
 import {I18N_CHOICES} from './setups/i18n/index.js';
 
 export const DEFAULT_APP_PORT = 3000;
@@ -100,6 +101,15 @@ export const commonFlags = {
       dependsOn: ['codegen'],
     }),
   },
+  styling: {
+    styling: Flags.string({
+      description: `Sets the styling strategy to use. One of ${STYLING_CHOICES.map(
+        (item) => `\`${item}\``,
+      ).join(', ')}.`,
+      choices: STYLING_CHOICES,
+      env: 'SHOPIFY_HYDROGEN_FLAG_STYLING',
+    }),
+  },
   markets: {
     markets: Flags.string({
       description: `Sets the URL structure to support multiple markets. Must be one of: ${I18N_CHOICES.map(

packages/cli/src/lib/onboarding/common.ts

@@ -410,10 +410,6 @@ export async function handleLanguage(
   };
 }
 
-// Extract this in a variable to avoid TS issues.
-// TODO: Remove this when CSS is supported in Vite
-const isCssDisabled: boolean = true;
-
 /**
  * Prompts the user to select a CSS strategy.
  * @returns The chosen strategy name and a function that sets up the CSS strategy.
@@ -423,8 +419,6 @@ export async function handleCssStrategy(
   controller: AbortController,
   flagStyling?: StylingChoice,
 ) {
-  if (isCssDisabled) return {};
-
   const selection =
     flagStyling ??
     (await renderCssPrompt({
@@ -438,6 +432,11 @@ export async function handleCssStrategy(
     cssStrategy,
     async setupCss() {
       if (cssStrategy) {
+        if (cssStrategy === 'postcss' || cssStrategy === 'css-modules') {
+          // Nothing to do in Vite projects
+          return;
+        }
+
         const result = await setupCssStrategy(
           cssStrategy,
           {

packages/cli/src/lib/setups/css/assets.ts

@@ -3,15 +3,16 @@ import {joinPath} from '@shopify/cli-kit/node/path';
 import {renderConfirmationPrompt} from '@shopify/cli-kit/node/ui';
 import {type AssetsDir, getAssetsDir} from '../../build.js';
 
-export type CssStrategy = Extract<
-  AssetsDir,
-  'tailwind' | 'css-modules' | 'vanilla-extract' | 'postcss'
->;
+export type CssStrategy =
+  | 'tailwind'
+  | 'css-modules'
+  | 'vanilla-extract'
+  | 'postcss';
 
 export const SETUP_CSS_STRATEGIES: CssStrategy[] = [
   'tailwind',
-  'css-modules',
   'vanilla-extract',
+  'css-modules',
   'postcss',
 ];
 

packages/cli/src/lib/setups/css/common.ts

@@ -1,12 +1,10 @@
 export type CssSetupResult = {
   workPromise: Promise<unknown>;
   generatedAssets: string[];
-  helpUrl: string;
+  needsInstallDeps: boolean;
 };
 
 export type CssSetupConfig = {
   rootDirectory: string;
   appDirectory: string;
-  tailwind?: boolean;
-  postcss?: boolean;
 };