refactor(create): collapse bundled-resolution lets + cover gitignore edge cases

Post-simplify cleanup:

- `bin.ts` — replace four parallel `let`s (`bundledLocalPath`,
  `bundledEntryName`, `bundledOrgScope`, `isBundledMonorepo`) with one
  `bundled: Extract<OrgResolution, { kind: 'bundled' }> | undefined`.
  Downstream uses `bundled?.<field>` everywhere; the `&& bundledOrgScope`
  guard at the inject-call drops since the type guarantees `scope` is
  set on the bundled variant. `isBundledMonorepo` is now a derived
  `bundled?.monorepo === true` constant. Reduces stateful surface area
  and tightens the link to the resolution shape.
- `utils.spec.ts` — three new `ensureGitignoreNodeModules` cases:
  CRLF line endings (no-op), `node_modules/sub` subpath (must not
  count as a match), and `!node_modules` un-ignore override (must
  not silently re-exclude).
- `create-org-bundled-monorepo/tarballs/README.md` — document the
  exact regeneration command. The mock manifest's `integrity` field
  locks the bytes, and macOS's default `tar` injects AppleDouble
  metadata that breaks the snap; spell out `COPYFILE_DISABLE=1` +
  `--no-mac-metadata` for future maintainers.

Author: fengmk2

packages/cli/snap-tests/create-org-bundled-monorepo/tarballs/README.md

@@ -0,0 +1,31 @@
+# Tarball regeneration
+
+`create-1.0.0.tgz` is committed binary. The mock manifest's
+`integrity: "sha512-…"` field locks the bytes — regenerating without
+matching the original bit-for-bit will break the snap-test.
+
+To regenerate (e.g. after editing one of the bundled template files):
+
+```sh
+mkdir -p /tmp/vp-bundled-monorepo-build/package/templates/workspace
+# … recreate the template files inside that workspace dir …
+
+cd /tmp/vp-bundled-monorepo-build
+COPYFILE_DISABLE=1 tar --no-mac-metadata -czf \
+  <repo>/packages/cli/snap-tests/create-org-bundled-monorepo/tarballs/create-1.0.0.tgz \
+  package/
+
+# Then update mock-manifest.json's `integrity` field:
+node -e "
+  const fs = require('node:fs');
+  const crypto = require('node:crypto');
+  const buf = fs.readFileSync(
+    '<repo>/packages/cli/snap-tests/create-org-bundled-monorepo/tarballs/create-1.0.0.tgz',
+  );
+  console.log('sha512-' + crypto.createHash('sha512').update(buf).digest('base64'));
+"
+```
+
+`COPYFILE_DISABLE=1` and `--no-mac-metadata` keep macOS from injecting
+`._*` AppleDouble files that pollute the extracted output and break the
+snap-test.

packages/cli/src/create/__tests__/utils.spec.ts

@@ -138,4 +138,23 @@ describe('ensureGitignoreNodeModules', () => {
     ensureGitignoreNodeModules(projectDir);
     expect(gitignore()).toBe(existing);
   });
+
+  it('handles CRLF line endings without re-appending', () => {
+    const existing = 'node_modules\r\ndist\r\n';
+    fs.writeFileSync(path.join(projectDir, '.gitignore'), existing);
+    ensureGitignoreNodeModules(projectDir);
+    expect(gitignore()).toBe(existing);
+  });
+
+  it('does not consider a `node_modules/sub` subpath as already excluded', () => {
+    fs.writeFileSync(path.join(projectDir, '.gitignore'), 'node_modules/sub\n');
+    ensureGitignoreNodeModules(projectDir);
+    expect(gitignore()).toBe('node_modules/sub\nnode_modules\n');
+  });
+
+  it('does not match `!node_modules` (an explicit un-ignore override)', () => {
+    fs.writeFileSync(path.join(projectDir, '.gitignore'), '!node_modules\n');
+    ensureGitignoreNodeModules(projectDir);
+    expect(gitignore()).toBe('!node_modules\nnode_modules\n');
+  });
 });

packages/cli/src/create/bin.ts

@@ -49,7 +49,11 @@ import {
 import type { ExecutionResult } from './command.ts';
 import { discoverTemplate, inferGitHubRepoName, inferParentDir, isGitHubUrl } from './discovery.ts';
 import { getInitialTemplateOptions } from './initial-template-options.ts';
-import { getConfiguredDefaultTemplate, resolveOrgManifestForCreate } from './org-resolve.ts';
+import {
+  getConfiguredDefaultTemplate,
+  type OrgResolution,
+  resolveOrgManifestForCreate,
+} from './org-resolve.ts';
 import {
   cancelAndExit,
   checkProjectDirExists,
@@ -442,10 +446,7 @@ async function main() {
   let selectedParentDir: string | undefined;
   let remoteTargetDir: string | undefined;
   let shouldSetupHooks = false;
-  let bundledLocalPath: string | undefined;
-  let bundledEntryName: string | undefined;
-  let bundledOrgScope: string | undefined;
-  let isBundledMonorepo = false;
+  let bundled: Extract<OrgResolution, { kind: 'bundled' }> | undefined;
   let skipShorthandExpansion = false;
   const installArgs = process.env.CI ? ['--no-frozen-lockfile'] : undefined;
 
@@ -469,10 +470,7 @@ async function main() {
       // into `@your-org/create-template-web`.
       skipShorthandExpansion = true;
     } else if (resolved.kind === 'bundled') {
-      bundledLocalPath = resolved.bundledLocalPath;
-      bundledEntryName = resolved.entryName;
-      bundledOrgScope = resolved.scope;
-      isBundledMonorepo = resolved.monorepo === true;
+      bundled = resolved;
     } else if (resolved.kind === 'escape-hatch') {
       selectedTemplateName = '';
     }
@@ -509,7 +507,8 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
   }
 
   const isBuiltinTemplate = selectedTemplateName.startsWith('vite:');
-  const isBundledTemplate = bundledLocalPath !== undefined;
+  const isBundledTemplate = bundled !== undefined;
+  const isBundledMonorepo = bundled?.monorepo === true;
   const isDirectScaffoldTemplate = isBuiltinTemplate || isBundledTemplate;
 
   // Remote templates (e.g., @tanstack/cli, custom templates) run their own
@@ -636,8 +635,8 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
     }
   }
 
-  const directScaffoldFallbackName = isBundledTemplate
-    ? `vite-plus-${bundledEntryName}`
+  const directScaffoldFallbackName = bundled
+    ? `vite-plus-${bundled.entryName}`
     : selectedTemplateName === BuiltinTemplate.monorepo
       ? 'vite-plus-monorepo'
       : `vite-plus-${selectedTemplateName.split(':')[1]}`;
@@ -800,7 +799,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
     selectedTemplateArgs,
     workspaceInfo,
     options.interactive,
-    bundledLocalPath,
+    bundled?.bundledLocalPath,
     skipShorthandExpansion,
   );
 
@@ -903,14 +902,14 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
     workspaceInfo.rootDir = fullPath;
     updateCreateProgress('Integrating monorepo');
     rewriteMonorepo(workspaceInfo, undefined, compactOutput);
-    if (isBundledMonorepo && bundledOrgScope) {
+    if (bundled?.monorepo) {
       // Wire `create.defaultTemplate: '<scope>'` into the new workspace's
       // vite.config.ts so a bare `vp create` from inside it opens the
       // same org's picker. Only triggers when the user just scaffolded
       // from `vp create @scope:<entry>` — for builtin `vite:monorepo`,
       // even a scoped package name doesn't imply the user wants that
       // scope as their template default.
-      injectCreateDefaultTemplate(fullPath, bundledOrgScope, compactOutput);
+      injectCreateDefaultTemplate(fullPath, bundled.scope, compactOutput);
     }
     if (shouldSetupHooks) {
       installGitHooks(fullPath, compactOutput);