@tanstack/create 0.68.1 → 0.68.3

package/src/edge-template-file.ts

@@ -0,0 +1,204 @@
+import { render } from './edge-render.js'
+import { relativePath } from './edge-file-helpers.js'
+import { joinPaths } from './edge-path.js'
+import { formatCommand } from './utils.js'
+import {
+  getPackageManagerExecuteCommand,
+  getPackageManagerInstallCommand,
+  getPackageManagerScriptCommand,
+} from './package-manager.js'
+
+import type {
+  AddOn,
+  Environment,
+  Integration,
+  IntegrationWithSource,
+  Options,
+} from './types.js'
+
+function convertDotFilesAndPaths(path: string) {
+  return path
+    .split('/')
+    .map((segment) => segment.replace(/^_dot_/, '.'))
+    .join('/')
+}
+
+function normalizeSourceExtension(target: string, typescript: boolean) {
+  if (!typescript) {
+    return target
+  }
+
+  const normalizedTarget = target.replace(/\\/g, '/')
+
+  if (!normalizedTarget.startsWith('src/')) {
+    return target
+  }
+
+  if (normalizedTarget.endsWith('.js')) {
+    return `${target.slice(0, -3)}.ts`
+  }
+
+  if (normalizedTarget.endsWith('.jsx')) {
+    return `${target.slice(0, -4)}.tsx`
+  }
+
+  return target
+}
+
+export function createTemplateFile(environment: Environment, options: Options) {
+  function getPackageManagerAddScript(
+    packageName: string,
+    isDev: boolean = false,
+  ) {
+    return formatCommand(
+      getPackageManagerInstallCommand(
+        options.packageManager,
+        packageName,
+        isDev,
+      ),
+    )
+  }
+  function getPackageManagerRunScript(
+    scriptName: string,
+    args: Array<string> = [],
+  ) {
+    return formatCommand(
+      getPackageManagerScriptCommand(options.packageManager, [
+        scriptName,
+        ...args,
+      ]),
+    )
+  }
+  function getPackageManagerExecuteScript(
+    pkg: string,
+    args: Array<string> = [],
+  ) {
+    return formatCommand(
+      getPackageManagerExecuteCommand(options.packageManager, pkg, args),
+    )
+  }
+
+  class IgnoreFileError extends Error {
+    constructor() {
+      super('ignoreFile')
+      this.name = 'IgnoreFileError'
+    }
+  }
+
+  const integrations: Array<IntegrationWithSource> = []
+  for (const addOn of options.chosenAddOns) {
+    if (addOn.integrations) {
+      for (const integration of addOn.integrations) {
+        integrations.push({
+          ...integration,
+          _sourceId: addOn.id,
+          _sourceName: addOn.name,
+        })
+      }
+    }
+  }
+
+  const routes: Array<Required<AddOn>['routes'][number]> = []
+  for (const addOn of options.chosenAddOns) {
+    if (addOn.routes) {
+      routes.push(...addOn.routes)
+    }
+  }
+
+  const addOnEnabled = options.chosenAddOns.reduce<Record<string, boolean>>(
+    (acc, addOn) => {
+      acc[addOn.id] = true
+      return acc
+    },
+    {},
+  )
+
+  return async function templateFile(file: string, content: string) {
+    const localRelativePath = (path: string, stripExtension: boolean = false) =>
+      relativePath(file, path, stripExtension)
+
+    const integrationImportContent = (integration: Integration) =>
+      integration.import ||
+      `import ${integration.jsName} from '${localRelativePath(integration.path || '')}'`
+
+    const integrationImportCode = (integration: Integration) =>
+      integration.code || integration.jsName
+
+    const templateValues = {
+      packageManager: options.packageManager,
+      projectName: options.projectName,
+      typescript: true,
+      tailwind: true,
+      js: 'ts',
+      jsx: 'tsx',
+      fileRouter: options.mode === 'file-router',
+      codeRouter: options.mode === 'code-router',
+      routerOnly: options.routerOnly === true,
+      includeExamples: options.includeExamples !== false,
+      addOnEnabled,
+      addOnOption: options.addOnOptions,
+      addOns: options.chosenAddOns,
+      integrations,
+      routes,
+
+      getPackageManagerAddScript,
+      getPackageManagerRunScript,
+      getPackageManagerExecuteScript,
+
+      relativePath: (path: string, stripExtension: boolean = false) =>
+        relativePath(file, path, stripExtension),
+
+      integrationImportContent,
+      integrationImportCode,
+
+      renderTemplate: (templateContent: string) => {
+        return render(templateContent, templateValues)
+      },
+
+      ignoreFile: () => {
+        throw new IgnoreFileError()
+      },
+    }
+
+    let ignoreFile = false
+
+    if (file.endsWith('.ejs')) {
+      try {
+        content = render(content, templateValues)
+      } catch (error) {
+        if (error instanceof IgnoreFileError) {
+          ignoreFile = true
+        } else {
+          const message = error instanceof Error ? error.message : String(error)
+          environment.error(`EJS error in file ${file}`, message)
+          throw error
+        }
+      }
+    }
+
+    if (ignoreFile) {
+      return
+    }
+
+    let target = convertDotFilesAndPaths(file.replace('.ejs', ''))
+    target = normalizeSourceExtension(target, options.typescript)
+
+    const prefixMatch = target.match(/^(.+\/)?__([^_]+)__(.+)$/)
+    if (prefixMatch) {
+      const [, directory, , filename] = prefixMatch
+      target = (directory || '') + filename
+    }
+
+    let append = false
+    if (target.endsWith('.append')) {
+      append = true
+      target = target.replace('.append', '')
+    }
+
+    if (append) {
+      await environment.appendFile(joinPaths(options.targetDir, target), content)
+    } else {
+      await environment.writeFile(joinPaths(options.targetDir, target), content)
+    }
+  }
+}

package/src/edge.ts

@@ -0,0 +1,43 @@
+export { createApp } from './edge-create-app.js'
+export {
+  createMemoryEnvironment,
+  type MemoryEnvironmentOutput,
+} from './edge-environment.js'
+export {
+  getFrameworkById,
+  getFrameworkByName,
+  getFrameworks,
+} from './edge-frameworks.js'
+export {
+  finalizeAddOns,
+  getAllAddOns,
+  loadRemoteAddOn,
+  populateAddOnOptionsDefaults,
+} from './edge-add-ons.js'
+export { createSerializedOptions } from './options.js'
+export { CONFIG_FILE } from './constants.js'
+export {
+  DEFAULT_PACKAGE_MANAGER,
+  SUPPORTED_PACKAGE_MANAGERS,
+  getPackageManagerExecuteCommand,
+  getPackageManagerInstallCommand,
+  getPackageManagerScriptCommand,
+  translateExecuteCommand,
+} from './package-manager.js'
+
+export type {
+  AddOn,
+  AddOnOption,
+  AddOnOptions,
+  AddOnSelectOption,
+  AddOnSelection,
+  Environment,
+  FileBundleHandler,
+  Framework,
+  FrameworkDefinition,
+  Options,
+  SerializedOptions,
+  Starter,
+  StarterCompiled,
+} from './types.js'
+export type { PackageManager } from './package-manager.js'

package/src/frameworks/react/add-ons/storybook/info.json

@@ -7,14 +7,9 @@
   "type": "add-on",
   "category": "tooling",
   "color": "#FF4785",
-  "priority": 18,
-  "routes": [
-    {
-      "icon": "BookOpen",
-      "url": "/demo/storybook",
-      "name": "Storybook",
-      "path": "src/routes/demo.storybook.tsx",
-      "jsName": "StorybookDemo"
-    }
-  ]
+  "priority": 1,
+  "command": {
+    "command": "npx",
+    "args": ["storybook", "init", "-y", "--no-dev"]
+  }
 }

package/src/frameworks/react/project/base/_dot_gitignore

@@ -6,7 +6,6 @@ dist-ssr
 .env
 .nitro
 .tanstack
-src/routeTree.gen.ts
 .wrangler
 .output
 .vinxi

package/src/frameworks/react/project/base/package.json

@@ -7,6 +7,7 @@
   },
   "scripts": {
     "dev": "vite dev --port 3000",
+    "generate-routes": "tsr generate",
     "build": "vite build",
     "preview": "vite preview",
     "test": "vitest run"

package/src/frameworks/react/project/base/tsr.config.json

@@ -0,0 +1,3 @@
+{
+  "target": "react"
+}

package/src/frameworks/react/project/packages.json

@@ -15,6 +15,9 @@
     }
   },
   "file-router": {
+    "devDependencies": {
+      "@tanstack/router-cli": "^1.132.0"
+    },
     "dependencies": {
       "@tanstack/router-plugin": "^1.132.0"
     }

package/src/frameworks/solid/project/base/_dot_gitignore

@@ -6,7 +6,6 @@ dist-ssr
 .env
 .nitro
 .tanstack
-src/routeTree.gen.ts
 .wrangler
 .output
 .vinxi

package/src/frameworks/solid/project/base/package.json

@@ -4,6 +4,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite dev --port 3000",
+    "generate-routes": "tsr generate",
     "build": "vite build",
     "start": "node .output/server/index.mjs",
     "preview": "vite preview",

package/src/frameworks/solid/project/base/tsr.config.json

@@ -0,0 +1,3 @@
+{
+  "target": "solid"
+}

package/src/frameworks/solid/project/packages.json

@@ -11,6 +11,9 @@
     }
   },
   "file-router": {
+    "devDependencies": {
+      "@tanstack/router-cli": "^1.133.21"
+    },
     "dependencies": {
       "@tanstack/router-plugin": "^1.133.21"
     }