Fix @jakubmazanec/carson-templates (#21)

jakubmazanec · Jul 25, 2023 · dbf0e41 · dbf0e41
1 parent 85e6f71
commit dbf0e41
Show file tree

Hide file tree

Showing 28 changed files with 60 additions and 17 deletions.
diff --git a/.carson/.snapshots b/.carson/.snapshots
diff --git a/.changeset/cuddly-toys-smoke.md b/.changeset/cuddly-toys-smoke.md
@@ -0,0 +1,13 @@
+---
+'@jakubmazanec/changesets-changelog': patch
+'@jakubmazanec/carson-templates': patch
+'@jakubmazanec/eslint-config': patch
+'@jakubmazanec/zod-utils': patch
+'@jakubmazanec/fs-utils': patch
+'@jakubmazanec/template': patch
+'@jakubmazanec/ts-utils': patch
+'@jakubmazanec/error': patch
+'@jakubmazanec/cli': patch
+---
+
+Updates Eddie template.
diff --git a/.changeset/poor-hornets-smile.md b/.changeset/poor-hornets-smile.md
@@ -0,0 +1,5 @@
+---
+'@jakubmazanec/carson-templates': patch
+---
+
+Template `workspace` now generates correct version of this template package.
diff --git a/.changeset/violet-bears-float.md b/.changeset/violet-bears-float.md
@@ -0,0 +1,5 @@
+---
+'@jakubmazanec/carson-templates': patch
+---
+
+Fixes syntax errors in templates.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,8 +23,8 @@
   },
   "devDependencies": {
     "@changesets/cli": "^2.25.2",
-    "@jakubmazanec/carson": "^0.0.0",
-    "@jakubmazanec/carson-templates": "^0.0.0",
+    "@jakubmazanec/carson": "^0.1.0",
+    "@jakubmazanec/carson-templates": "^0.1.0",
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.56",
     "@testing-library/jest-dom": "^5.16.5",

diff --git a/packages/carson-templates/.carson/.snapshots b/packages/carson-templates/.carson/.snapshots
diff --git a/packages/carson-templates/package.json b/packages/carson-templates/package.json
@@ -22,7 +22,7 @@
   ],
   "scripts": {
     "build": "swc src -d dist && tsc",
-    "clean": "del-cli dist *.tsbuildinfo",
+    "clean": "del-cli coverage dist *.tsbuildinfo",
     "document": "typedoc --options typedoc.config.cjs",
     "format": "prettier . --write --ignore-unknown --ignore-path ../../.prettierignore",
     "lint": "eslint .",

diff --git a/packages/carson-templates/src/main.ts b/packages/carson-templates/src/main.ts
@@ -1,16 +1,32 @@
 import {type Project, type Workspace} from '@jakubmazanec/carson';
+import fs from 'node:fs';
+import {createRequire} from 'node:module';
 import semver from 'semver';
 
 export {default as lodash} from 'lodash';
 export {default as semver} from 'semver';
 
+const TEMPLATE_PACKAGE_NAME = '@jakubmazanec/carson-templates';
 const MAIN_BRANCH_NAMES = new Set(['main', 'master']);
 const DEVELOPMENT_BRANCH_NAMES = new Set(['development', 'develop', 'dev']);
 
+let require = createRequire(import.meta.url);
+let templatesPackageVersion =
+  (
+    JSON.parse(
+      fs.readFileSync(require.resolve(`${TEMPLATE_PACKAGE_NAME}/package.json`), {
+        encoding: 'utf8',
+      }),
+    ) as {version?: string}
+  ).version ?? '1.0.0';
+let isTemplatesPackageVersionPrerelease = !!semver.prerelease(templatesPackageVersion)?.length;
+
 const DEPENDENCY_VERSIONS: Record<string, string> = {
   '@changesets/cli': '^2.0.0',
-  '@jakubmazanec/carson': '^0.0.0',
-  '@jakubmazanec/carson-templates': '^0.0.0',
+  '@jakubmazanec/carson': '^0.1.0',
+  [TEMPLATE_PACKAGE_NAME]: isTemplatesPackageVersionPrerelease
+    ? templatesPackageVersion
+    : `^${templatesPackageVersion}`,
   '@jest/globals': '^29.0.0',
   '@swc/cli': '^0.1.0',
   '@swc/core': '^1.0.0',
@@ -70,6 +86,10 @@ export function getDependencies(dependencies: string[], workspace: Workspace | W
   const projectNames = workspace.projects.map((project) => project.name);
 
   for (const [dependencyName, dependencyVersion] of Object.entries(result)) {
+    if (dependencyName === TEMPLATE_PACKAGE_NAME) {
+      continue;
+    }
+
     const installedDependency = workspace.allDependencies.find(
       (dependency) => dependencyName === dependency.name,
     );

diff --git a/packages/carson-templates/templates/projects/carson-templates/package.json.ejs b/packages/carson-templates/templates/projects/carson-templates/package.json.ejs
@@ -6,7 +6,7 @@ strategy: merge
 let packageJson = {
   repository: {
     type: 'git',
-    directory: '<%- project.relativePath %>',
+    directory: project.relativePath,
   },
   type: 'module',
   exports: {

diff --git a/packages/carson-templates/templates/projects/changesets-changelog/package.json.ejs b/packages/carson-templates/templates/projects/changesets-changelog/package.json.ejs
@@ -6,7 +6,7 @@ strategy: merge
 let packageJson = {
   repository: {
     type: 'git',
-    directory: '<%- project.relativePath %>',
+    directory: project.relativePath,
   },
   type: 'commonjs',
   exports: './dist/main.js',

diff --git a/packages/carson-templates/templates/projects/eslint-config/package.json.ejs b/packages/carson-templates/templates/projects/eslint-config/package.json.ejs
@@ -6,7 +6,7 @@ strategy: merge
 let packageJson = {
   repository: {
     type: 'git',
-    directory: '<%- project.relativePath %>',
+    directory: project.relativePath,
   },
   type: 'commonjs',
   exports: {

diff --git a/packages/changesets-changelog/.carson/.snapshots b/packages/changesets-changelog/.carson/.snapshots
diff --git a/packages/changesets-changelog/package.json b/packages/changesets-changelog/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "swc src -d dist && tsc",
-    "clean": "del-cli dist *.tsbuildinfo",
+    "clean": "del-cli coverage dist *.tsbuildinfo",
     "format": "prettier . --write --ignore-unknown --ignore-path ../../.prettierignore",
     "lint": "eslint .",
     "test": "jest --passWithNoTests",

diff --git a/packages/cli/.carson/.snapshots b/packages/cli/.carson/.snapshots
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "swc src -d dist && tsc",
-    "clean": "del-cli dist *.tsbuildinfo",
+    "clean": "del-cli coverage dist *.tsbuildinfo",
     "develop": "concurrently \"swc src -d dist --watch\" \"tsc --watch\"",
     "document": "typedoc --options typedoc.config.cjs",
     "format": "prettier . --write --ignore-unknown --ignore-path ../../.prettierignore",

diff --git a/packages/error/.carson/.snapshots b/packages/error/.carson/.snapshots
diff --git a/packages/error/package.json b/packages/error/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "swc src -d dist && tsc",
-    "clean": "del-cli dist *.tsbuildinfo",
+    "clean": "del-cli coverage dist *.tsbuildinfo",
     "document": "typedoc --options typedoc.config.cjs",
     "format": "prettier . --write --ignore-unknown --ignore-path ../../.prettierignore",
     "lint": "eslint .",

diff --git a/packages/eslint-config/.carson/.snapshots b/packages/eslint-config/.carson/.snapshots
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -24,7 +24,7 @@
   "scripts": {
     "build": "swc src -d dist && tsc",
     "check-rules": "ts-node --files --project tools/check-rules/tsconfig.json tools/check-rules/index.ts",
-    "clean": "del-cli dist *.tsbuildinfo",
+    "clean": "del-cli coverage dist *.tsbuildinfo",
     "format": "prettier . --write --ignore-unknown --ignore-path ../../.prettierignore",
     "lint": "eslint .",
     "test": "jest --passWithNoTests",

diff --git a/packages/fs-utils/.carson/.snapshots b/packages/fs-utils/.carson/.snapshots
diff --git a/packages/fs-utils/package.json b/packages/fs-utils/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "swc src -d dist && tsc",
-    "clean": "del-cli dist *.tsbuildinfo",
+    "clean": "del-cli coverage dist *.tsbuildinfo",
     "document": "typedoc --options typedoc.config.cjs",
     "format": "prettier . --write --ignore-unknown --ignore-path ../../.prettierignore",
     "lint": "eslint .",

diff --git a/packages/template/.carson/.snapshots b/packages/template/.carson/.snapshots
diff --git a/packages/template/package.json b/packages/template/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "swc src -d dist && tsc",
-    "clean": "del-cli dist *.tsbuildinfo",
+    "clean": "del-cli coverage dist *.tsbuildinfo",
     "document": "typedoc --options typedoc.config.cjs",
     "format": "prettier . --write --ignore-unknown --ignore-path ../../.prettierignore",
     "lint": "eslint .",

diff --git a/packages/ts-utils/.carson/.snapshots b/packages/ts-utils/.carson/.snapshots
diff --git a/packages/ts-utils/package.json b/packages/ts-utils/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "swc src -d dist && tsc",
-    "clean": "del-cli dist *.tsbuildinfo",
+    "clean": "del-cli coverage dist *.tsbuildinfo",
     "document": "typedoc --options typedoc.config.cjs",
     "format": "prettier . --write --ignore-unknown --ignore-path ../../.prettierignore",
     "lint": "eslint .",

diff --git a/packages/zod-utils/.carson/.snapshots b/packages/zod-utils/.carson/.snapshots
diff --git a/packages/zod-utils/package.json b/packages/zod-utils/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "swc src -d dist && tsc",
-    "clean": "del-cli dist *.tsbuildinfo",
+    "clean": "del-cli coverage dist *.tsbuildinfo",
     "document": "typedoc --options typedoc.config.cjs",
     "format": "prettier . --write --ignore-unknown --ignore-path ../../.prettierignore",
     "lint": "eslint .",