npm - @jakubmazanec/carson-templates - Versions diffs - 7.1.0 → 7.2.0-unstable.b8904660 - Mend

@jakubmazanec/carson-templates 7.1.0 → 7.2.0-unstable.b8904660

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@jakubmazanec/carson-templates",
-  "version": "7.1.0",
+  "version": "7.2.0-unstable.b8904660",
   "description": "Collection of Carson templates.",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "semver": "^7.7.3"
   },
   "devDependencies": {
-    "@jakubmazanec/carson": "^3.0.0",
+    "@jakubmazanec/carson": "3.0.4-unstable.b8904660",
     "@jakubmazanec/eslint-config": "^4.1.0",
     "@jakubmazanec/fs-utils": "^0.2.0",
     "@types/fs-extra": "^11.0.4",
@@ -58,7 +58,7 @@
     "zen-observable": "^0.10.0"
   },
   "peerDependencies": {
-    "@jakubmazanec/carson": "^3.0.0"
+    "@jakubmazanec/carson": "3.0.4-unstable.b8904660"
   },
   "packageManager": "npm@11.3.0",
   "engines": {

package/templates/prettier.config.cjs.ejs CHANGED Viewed

@@ -3,10 +3,13 @@ to: 'prettier.config.cjs'
 strategy: overwrite
 ---
 <%
-let prettierConfig = {
-  ...PRETTIER_OPTIONS,
-  plugins: ['prettier-plugin-packagejson'],
-};
+let prettierConfig = lodash.merge(
+  {
+    ...PRETTIER_OPTIONS,
+    plugins: ['prettier-plugin-packagejson'],
+  },
+  project.config.overrides?.prettierConfig ?? {},
+);
 -%>
 /**
  * DO NOT EDIT!

package/templates/projects/carson-templates/eslint.config.js.ejs CHANGED Viewed

@@ -9,6 +9,7 @@ strategy: overwrite
  *
  * Run `npx carson update workspace` to regenerate.
  */
 import main, {nodejs, prettier} from '@jakubmazanec/eslint-config';
 export default [
@@ -18,4 +19,5 @@ export default [
   {
     ignores: <%- JSON.stringify(LINT_IGNORES, null, 2) %>,
   },
+  <%- project.config.overrides?.eslintConfig ? JSON.stringify(project.config.overrides.eslintConfig, null, 2) : '' %>
 ];

package/templates/projects/changesets-changelog/eslint.config.mjs.ejs CHANGED Viewed

@@ -19,4 +19,5 @@ export default [
   {
     ignores: <%- JSON.stringify(LINT_IGNORES, null, 2) %>,
   },
+  <%- project.config.overrides?.eslintConfig ? JSON.stringify(project.config.overrides.eslintConfig, null, 2) : '' %>
 ];

package/templates/projects/eslint-config/eslint.config.js.ejs CHANGED Viewed

@@ -24,4 +24,5 @@ export default [
       '@typescript-eslint/naming-convention': 'off',
     },
   },
+  <%- project.config.overrides?.eslintConfig ? JSON.stringify(project.config.overrides.eslintConfig, null, 2) : '' %>
 ];

package/templates/projects/library/eslint.config.js.ejs CHANGED Viewed

@@ -19,4 +19,5 @@ export default [
   {
     ignores: <%- JSON.stringify(LINT_IGNORES, null, 2) %>,
   },
+  <%- project.config.overrides?.eslintConfig ? JSON.stringify(project.config.overrides.eslintConfig, null, 2) : '' %>
 ];

package/templates/projects/react-library/prettier.config.cjs.ejs CHANGED Viewed

@@ -3,10 +3,13 @@ to: 'prettier.config.cjs'
 strategy: overwrite
 ---
 <%
-let prettierConfig = {
-  ...PRETTIER_OPTIONS,
-  plugins: ['prettier-plugin-packagejson', 'prettier-plugin-tailwindcss'],
-};
+let prettierConfig = lodash.merge(
+  {
+    ...PRETTIER_OPTIONS,
+    plugins: ['prettier-plugin-packagejson', 'prettier-plugin-tailwindcss'],
+  },
+  project.config.overrides?.prettierConfig ?? {},
+);
 -%>
 /**
  * DO NOT EDIT!

package/templates/projects/remix-app/eslint.config.js.ejs CHANGED Viewed

@@ -26,4 +26,5 @@ export default [
   {
     ignores: <%- JSON.stringify(lintIgnores, null, 2) %>,
   },
+  <%- project.config.overrides?.eslintConfig ? JSON.stringify(project.config.overrides.eslintConfig, null, 2) : '' %>
 ];

package/templates/projects/remix-app/prettier.config.cjs.ejs CHANGED Viewed

@@ -3,10 +3,13 @@ to: 'prettier.config.cjs'
 strategy: overwrite
 ---
 <%
-let prettierConfig = {
-  ...PRETTIER_OPTIONS,
-  plugins: ['prettier-plugin-packagejson', 'prettier-plugin-tailwindcss'],
-};
+let prettierConfig = lodash.merge(
+  {
+    ...PRETTIER_OPTIONS,
+    plugins: ['prettier-plugin-packagejson', 'prettier-plugin-tailwindcss'],
+  },
+  project.config.overrides?.prettierConfig ?? {},
+);
 -%>
 /**
  * DO NOT EDIT!

package/templates/projects/remix-app/react-router.config.ts.ejs CHANGED Viewed

@@ -2,6 +2,15 @@
 to: 'react-router.config.ts'
 strategy: overwrite
 ---
+<%
+let reactRouterConfig = lodash.merge(
+  {
+    appDirectory: SOURCE_DIRECTORY,
+    ssr: true,
+  },
+  project.config.overrides?.reactRouterConfig ?? {},
+);
+-%>
 /**
  * DO NOT EDIT!
  * This file was autogenerated by Carson.
@@ -11,12 +20,5 @@ strategy: overwrite
  */
 import {type Config} from '@react-router/dev/config';
-import _ from 'lodash';
-export default _.merge(
-  {
-    appDirectory: <%- JSON.stringify(SOURCE_DIRECTORY) %>,
-    ssr: true,
-  },
-  <%- JSON.stringify(project.config.overrides?.reactRouterConfig ?? {}, null, 2) %>,
-) satisfies Config;
+export default <%- JSON.stringify(reactRouterConfig, null, 2) %> satisfies Config;

package/templates/typedoc.config.cjs.ejs CHANGED Viewed

@@ -3,9 +3,10 @@ to: 'typedoc.config.cjs'
 strategy: overwrite
 ---
 <%
-let typedocConfig = {
-  ...TYPEDOC_CONFIG
-};
+let typedocConfig = lodash.merge(
+  TYPEDOC_CONFIG,
+  project.config.overrides?.typedocConfig ?? {},
+);
 -%>
 /**
  * DO NOT EDIT!

package/templates/workspace/eslint.config.js.ejs CHANGED Viewed

@@ -19,4 +19,5 @@ export default [
   {
     ignores: <%- JSON.stringify(LINT_IGNORES, null, 2) %>,
   },
+  <%- workspace.config.overrides?.eslintConfig ? JSON.stringify(workspace.config.overrides.eslintConfig, null, 2) : '' %>
 ];

package/templates/workspace/prettier.config.cjs.ejs CHANGED Viewed

@@ -1,3 +1,22 @@
 ---
-extends: '../prettier.config.cjs.ejs'
+to: 'prettier.config.cjs'
+strategy: overwrite
 ---
+<%
+let prettierConfig = lodash.merge(
+  {
+    ...PRETTIER_OPTIONS,
+    plugins: ['prettier-plugin-packagejson'],
+  },
+  workspace.config.overrides?.prettierConfig ?? {},
+);
+-%>
+/**
+ * DO NOT EDIT!
+ * This file was autogenerated by Carson.
+ * Changes may cause incorrect behavior and will be lost when the file is regenerated.
+ *
+ * Run `npx carson update workspace` to regenerate.
+ */
+module.exports = <%- JSON.stringify(prettierConfig, null, 2) %>;

package/templates/workspace/renovate.json.ejs CHANGED Viewed

@@ -2,33 +2,41 @@
 to: 'renovate.json'
 strategy: overwrite
 ---
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    ":dependencyDashboard",
-    ":ignoreModulesAndTests",
-    "group:monorepos",
-    "group:recommended",
-    "replacements:all",
-    "workarounds:all"
-  ],
+<%
+let renovateConfig = lodash.merge(
+  {
+    $schema: 'https://docs.renovatebot.com/renovate-schema.json',
+    extends: [
+      ':dependencyDashboard',
+      ':ignoreModulesAndTests',
+      'group:monorepos',
+      'group:recommended',
+      'replacements:all',
+      'workarounds:all',
+    ],
+    enabledManagers: ['npm', 'nodenv', 'nvm', 'github-actions'],
+    rangeStrategy: 'bump',
+    minimumReleaseAge: '14 days',
+    packageRules: [
+      {
+        matchUpdateTypes: ['major', 'minor', 'patch'],
+        matchDepTypes: ['devDependencies'],
+      },
+      {
+        matchDepTypes: ['peerDependencies'],
+        rangeStrategy: 'replace',
+      },
+      {
+        matchDepTypes: ['overrides'],
+        enabled: false,
+      },
+    ],
+  },
+  workspace.config.overrides?.renovate ?? {},
+);
+-%>
+<%- JSON.stringify(renovateConfig, null, 2) %>
-  "enabledManagers": ["npm", "nodenv", "nvm", "github-actions"],
-  "rangeStrategy": "bump",
-  "minimumReleaseAge": "14 days",
-  "packageRules": [
-    {
-      "matchUpdateTypes": ["major", "minor", "patch"],
-      "matchDepTypes": ["devDependencies"]
-    },
-    {
-      "matchDepTypes": ["peerDependencies"],
-      "rangeStrategy": "replace"
-    },
-    {
-      "matchDepTypes": ["overrides"],
-      "enabled": false
-    }
-  ]
-}

package/templates/workspace/tsconfig.json.ejs CHANGED Viewed

@@ -3,14 +3,17 @@ to: 'tsconfig.json'
 strategy: overwrite
 ---
 <%
-let tsconfig = {
-  compilerOptions: {
-    ...TSCONFIG_COMPILER_OPTIONS,
+let tsconfig = lodash.merge(
+  {
+    compilerOptions: {
+      ...TSCONFIG_COMPILER_OPTIONS,
       noEmit: true,
       rootDir: '.',
+    },
+    include: ['./*', './tools/**/*'],
   },
-  include: ['./*', './tools/**/*'],
-};
+  workspace.config.overrides?.tsconfig ?? {},
+);
 -%>
 //
 // DO NOT EDIT!

package/templates/workspace/turbo.json.ejs CHANGED Viewed

@@ -3,54 +3,57 @@ to: 'turbo.json'
 strategy: overwrite
 ---
 <%
-let turboConfig = {
-  $schema: 'https://turborepo.org/schema.json',
-  tasks: {
-    build: {
-      dependsOn: ['^build', 'codegen'],
-      outputs: [`${BUILD_DIRECTORY}/**`],
-    },
-    clean: {
-      cache: false,
-    },
-    codegen: {
-      cache: false,
-    },
-    develop: {
-      dependsOn: ['^build', 'codegen'],
-      cache: false,
-      persistent: true,
-    },
-    document: {
-      dependsOn: ['^build', 'codegen'],
-      outputs: ['docs/**'],
-    },
-    format: {
-      cache: false,
-    },
-    lint: {
-      dependsOn: ['^build', 'codegen'],
-      outputs: [],
-    },
-    test: {
-      dependsOn: ['^build', 'codegen', 'typecheck', 'lint'],
-      outputs: ['coverage/**'],
-    },
-    typecheck: {
-      dependsOn: ['^build', 'codegen'],
-      outputs: [],
+let turboConfig = lodash.merge(
+  {
+    $schema: 'https://turborepo.org/schema.json',
+    tasks: {
+      build: {
+        dependsOn: ['^build', 'codegen'],
+        outputs: [`${BUILD_DIRECTORY}/**`],
+      },
+      clean: {
+        cache: false,
+      },
+      codegen: {
+        cache: false,
+      },
+      develop: {
+        dependsOn: ['^build', 'codegen'],
+        cache: false,
+        persistent: true,
+      },
+      document: {
+        dependsOn: ['^build', 'codegen'],
+        outputs: ['docs/**'],
+      },
+      format: {
+        cache: false,
+      },
+      lint: {
+        dependsOn: ['^build', 'codegen'],
+        outputs: [],
+      },
+      test: {
+        dependsOn: ['^build', 'codegen', 'typecheck', 'lint'],
+        outputs: ['coverage/**'],
+      },
+      typecheck: {
+        dependsOn: ['^build', 'codegen'],
+        outputs: [],
+      },
     },
+    globalEnv: ['CI'],
+    globalDependencies: [
+      '.editorconfig',
+      '.prettierignore',
+      'eslint.config.js',
+      'prettier.config.cjs',
+      'tsconfig.json',
+      'tsconfig.typecheck.json',
+    ],
   },
-  globalEnv: ['CI'],
-  globalDependencies: [
-    '.editorconfig',
-    '.prettierignore',
-    'eslint.config.js',
-    'prettier.config.cjs',
-    'tsconfig.json',
-    'tsconfig.typecheck.json',
-  ],
-};
+  workspace.config.overrides?.turbo ?? {},
+);
 if (workspace.projects.some((project) => project.config.deployment?.appName)) {
   turboConfig.globalEnv.push('VITE_APP_URL');