From dd8744eb5baf61314da8cb1b0ef6f5811064affb Mon Sep 17 00:00:00 2001 From: Scott Trinh Date: Fri, 12 Jan 2024 10:23:31 -0500 Subject: [PATCH] Move static base recipe files to template dir (#833) --- packages/create/src/recipes/_base/index.ts | 17 +++-------------- .../src/recipes/_base/template/.gitignore | 1 + .../eslint.config.js} | 0 .../{_package.json => template/package.json} | 2 +- .../{_tsconfig.json => template/tsconfig.json} | 0 5 files changed, 5 insertions(+), 15 deletions(-) create mode 100644 packages/create/src/recipes/_base/template/.gitignore rename packages/create/src/recipes/_base/{_eslint.config.js => template/eslint.config.js} (100%) rename packages/create/src/recipes/_base/{_package.json => template/package.json} (91%) rename packages/create/src/recipes/_base/{_tsconfig.json => template/tsconfig.json} (100%) diff --git a/packages/create/src/recipes/_base/index.ts b/packages/create/src/recipes/_base/index.ts index e4553c3b5..8fccb228b 100644 --- a/packages/create/src/recipes/_base/index.ts +++ b/packages/create/src/recipes/_base/index.ts @@ -7,14 +7,14 @@ import * as p from "@clack/prompts"; import { updatePackage } from "write-package"; -import * as utils from "../../utils.js"; +import { getPackageManager, copyTemplateFiles } from "../../utils.js"; import type { Framework, BaseRecipe, BaseOptions } from "../types.js"; const logger = debug("@edgedb/create:recipe:base"); const recipe: BaseRecipe = { async getOptions() { - const packageManager = utils.getPackageManager(); + const packageManager = getPackageManager(); logger({ packageManager }); const opts = await p.group( @@ -85,18 +85,7 @@ const recipe: BaseRecipe = { const dirname = path.dirname(new URL(import.meta.url).pathname); logger("Copying files"); - await fs.copyFile( - path.resolve(dirname, "./_eslint.config.js"), - path.resolve(projectDir, "eslint.config.js") - ); - await fs.copyFile( - path.resolve(dirname, "./_package.json"), - path.resolve(projectDir, "package.json") - ); - await fs.copyFile( - path.resolve(dirname, "./_tsconfig.json"), - path.resolve(projectDir, "tsconfig.json") - ); + await copyTemplateFiles(path.resolve(dirname, "./template"), projectDir); logger("Writing package.json"); await updatePackage(projectDir, { name: projectName }); diff --git a/packages/create/src/recipes/_base/template/.gitignore b/packages/create/src/recipes/_base/template/.gitignore new file mode 100644 index 000000000..c2658d7d1 --- /dev/null +++ b/packages/create/src/recipes/_base/template/.gitignore @@ -0,0 +1 @@ +node_modules/ diff --git a/packages/create/src/recipes/_base/_eslint.config.js b/packages/create/src/recipes/_base/template/eslint.config.js similarity index 100% rename from packages/create/src/recipes/_base/_eslint.config.js rename to packages/create/src/recipes/_base/template/eslint.config.js diff --git a/packages/create/src/recipes/_base/_package.json b/packages/create/src/recipes/_base/template/package.json similarity index 91% rename from packages/create/src/recipes/_base/_package.json rename to packages/create/src/recipes/_base/template/package.json index dc89b5280..f6e2428f8 100644 --- a/packages/create/src/recipes/_base/_package.json +++ b/packages/create/src/recipes/_base/template/package.json @@ -6,7 +6,7 @@ "edgedb": "1.x" }, "devDependencies": { - "@edgedb/generate": "1.x", + "@edgedb/generate": "^0.4.1", "@typescript-eslint/eslint-plugin": "6.x", "@typescript-eslint/parser": "6.x", "@eslint/eslintrc": "2.x", diff --git a/packages/create/src/recipes/_base/_tsconfig.json b/packages/create/src/recipes/_base/template/tsconfig.json similarity index 100% rename from packages/create/src/recipes/_base/_tsconfig.json rename to packages/create/src/recipes/_base/template/tsconfig.json