@dword-design/base 16.2.7 → 17.0.1

package/dist/get-generated-files/get-gitpod/index.d.ts

@@ -1,4 +1,5 @@
-export default function (): {
+import type { Base } from '@/src';
+declare const _default: (base: Base) => {
     image: {
         file: string;
     };
@@ -10,3 +11,4 @@ export default function (): {
         extensions: string[];
     };
 };
+export default _default;

package/dist/get-generated-files/get-gitpod/index.js

@@ -1,8 +1,8 @@
 import * as personalData from "@dword-design/personal-data";
 import endent from "endent";
 import parsePackagejsonName from "parse-packagejson-name";
-export default function () {
-  const packageName = parsePackagejsonName(this.packageConfig.name).fullName;
+export default base => {
+  const packageName = parsePackagejsonName(base.packageConfig.name).fullName;
   return {
     image: {
       file: ".gitpod.Dockerfile"
@@ -36,4 +36,4 @@ export default function () {
       extensions: ["https://sebastianlandwehr.com/vscode-extensions/karlito40.fix-irregular-whitespace-0.1.1.vsix", "https://sebastianlandwehr.com/vscode-extensions/adrianwilczynski.toggle-hidden-1.0.2.vsix", "octref.vetur@0.33.1", "Tobermory.es6-string-html", "zjcompt.es6-string-javascript"]
     }
   };
-}
+};

package/dist/get-generated-files/get-gitpod-dockerfile.d.ts

@@ -1 +1,3 @@
-export default function (): string;
+import type { Base } from '@/src';
+declare const _default: (base: Base) => string;
+export default _default;

package/dist/get-generated-files/get-gitpod-dockerfile.js

@@ -1,6 +1,5 @@
 import endent from "endent";
-export default function () {
-  return endent`
+export default base => endent`
     # Need to add :latest, otherwise old versions (e.g. of node) are installed
     FROM gitpod/workspace-full-vnc:latest
 
@@ -10,7 +9,7 @@ export default function () {
 
     # https://www.gitpod.io/docs/languages/javascript
     # https://github.com/gitpod-io/gitpod/issues/945
-    RUN bash -c 'source $HOME/.nvm/nvm.sh && nvm install ${this.config.nodeVersion}'
+    RUN bash -c 'source $HOME/.nvm/nvm.sh && nvm install ${base.config.nodeVersion}'
     RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix
 
     RUN yarn global add gitpod-env-per-project @babel/node @babel/core
@@ -21,5 +20,4 @@ export default function () {
 
     # Puppeteer dependencies
     RUN sudo apt-get update && sudo apt-get install -y libgtk-3-0 libx11-xcb1 libnss3 libxss1 libasound2 libgbm1 libxshmfence1\n
-  `;
-}
+`;

package/dist/get-generated-files/get-license-string.d.ts

@@ -1 +1,3 @@
-export default function (): string;
+import type { Base } from '@/src';
+declare const _default: (base: Base) => string;
+export default _default;

package/dist/get-generated-files/get-license-string.js

@@ -1,15 +1,15 @@
 import endent from "endent";
 import spdxParse from "spdx-expression-parse";
 import spdxList from "spdx-license-list/full.js";
-export default function () {
-  const parsed = spdxParse(this.packageConfig.license);
+export default base => {
+  const parsed = spdxParse(base.packageConfig.license);
   const license = spdxList[parsed.license];
   return endent`
     # License
 
     Unless stated otherwise all works are:
 
-    Copyright © ${this.packageConfig.author}
+    Copyright © ${base.packageConfig.author}
 
     and licensed under:
 
@@ -19,4 +19,4 @@ export default function () {
 
     ${license.licenseText}
   `;
-}
+};

package/dist/get-generated-files/get-lint-staged/index.d.ts

@@ -1,2 +1,5 @@
-import type { Configuration as LintStagedConfig } from 'lint-staged';
-export default function (): LintStagedConfig;
+import type { Base } from '@/src';
+declare const _default: (base: Base) => Record<string, string | string[]> | {
+    '*.{json,ts,vue}': string;
+};
+export default _default;

package/dist/get-generated-files/get-lint-staged/index.js

@@ -2,6 +2,4 @@ import mergeConfigs from "./merge-lint-staged-configs/index.js";
 const baseLintStagedConfig = {
   "*.{json,ts,vue}": "eslint --fix --config eslint.lint-staged.config.ts"
 };
-export default function () {
-  return this.config.lintStagedConfig ? mergeConfigs(baseLintStagedConfig, this.config.lintStagedConfig) : baseLintStagedConfig;
-}
+export default base => base.config.lintStagedConfig ? mergeConfigs(baseLintStagedConfig, base.config.lintStagedConfig) : baseLintStagedConfig;

package/dist/get-generated-files/get-lint-staged/merge-lint-staged-configs/index.d.ts

@@ -4,5 +4,5 @@ import type { Configuration } from 'lint-staged';
  * and merging commands for each normalized glob pattern.
  * Avoids race conditions by combining commands per unique glob.
  */
-declare const mergeConfigs: (configA: Configuration, configB: Configuration) => Configuration;
+declare const mergeConfigs: (configA: Configuration, configB: Configuration) => Record<string, string | string[]>;
 export default mergeConfigs;

package/dist/get-generated-files/get-lint-staged/merge-lint-staged-configs/index.js

@@ -13,7 +13,7 @@ const createBracePattern = expandedGlobs => {
   });
   if (globParts.includes(null)) return null;
   const prefix = globParts[0].prefix;
-  if (!globParts.every(part => part.prefix === prefix)) return null;
+  if (globParts.some(part => part.prefix !== prefix)) return null;
   const extensions = globParts.map(part => part.extension);
   return `${prefix}.{${extensions.join(",")}}`;
 };
@@ -34,15 +34,15 @@ const mergeConfigs = (configA, configB) => {
         if (!expandedMap.has(expandedGlob)) {
           expandedMap.set(expandedGlob, /* @__PURE__ */new Set());
         }
-        for (const cmd of commands) {
-          expandedMap.get(expandedGlob).add(cmd);
+        for (const command of commands) {
+          expandedMap.get(expandedGlob).add(command);
         }
       }
     }
   }
   const result = {};
   const processedExpanded = /* @__PURE__ */new Set();
-  const originalGlobs = [...originalToExpanded.keys()];
+  const originalGlobs = originalToExpanded.keys().toArray();
   for (const originalGlob of originalGlobs) {
     const expandedGlobs = originalToExpanded.get(originalGlob);
     const unprocessedExpanded = expandedGlobs.filter(eg => !processedExpanded.has(eg));
@@ -51,7 +51,7 @@ const mergeConfigs = (configA, configB) => {
       const firstCommands = expandedMap.get(firstExpanded);
       const sameCommandsExpanded = unprocessedExpanded.filter(eg => {
         const commands = expandedMap.get(eg);
-        return commands.size === firstCommands.size && [...firstCommands].every(cmd => commands.has(cmd));
+        return commands.size === firstCommands.size && [...firstCommands].every(command => commands.has(command));
       });
       if (sameCommandsExpanded.length > 1) {
         const pattern = createBracePattern(sameCommandsExpanded);
@@ -64,10 +64,11 @@ const mergeConfigs = (configA, configB) => {
     }
   }
   for (const [expandedGlob, commands] of expandedMap) {
-    if (!processedExpanded.has(expandedGlob)) {
-      const commandsArray = [...commands];
-      result[expandedGlob] = commandsArray.length === 1 ? commandsArray[0] : commandsArray;
+    if (processedExpanded.has(expandedGlob)) {
+      continue;
     }
+    const commandsArray = [...commands];
+    result[expandedGlob] = commandsArray.length === 1 ? commandsArray[0] : commandsArray;
   }
   return sortKeys(result);
 };

package/dist/get-generated-files/get-package-config/index.d.ts

@@ -1 +1,3 @@
-export default function (): any;
+import type { Base } from '@/src';
+declare const _default: (base: Base) => any;
+export default _default;

package/dist/get-generated-files/get-package-config/index.js

@@ -1,27 +1,26 @@
 import packageName from "depcheck-package-name";
 import { mapValues, pick, stubTrue } from "lodash-es";
 import sortKeys from "sort-keys";
-export default function () {
+export default base => {
   const commandNames = {
     checkUnknownFiles: true,
     commit: true,
     depcheck: true,
     lint: true,
     prepare: true,
+    test: true,
     typecheck: true,
-    verify: true,
-    ...(this.config.testInContainer && {
+    ...(base.config.testInContainer && {
       "test:raw": true
     }),
-    test: true,
-    ...mapValues(this.config.commands, stubTrue)
+    verify: true,
+    ...mapValues(base.config.commands, stubTrue)
   };
   return {
-    ...pick(this.packageConfig, Object.keys({
+    ...pick(base.packageConfig, Object.keys({
       baseConfig: true,
       bin: true,
       dependencies: true,
-      deploy: true,
       description: true,
       devDependencies: true,
       keywords: true,
@@ -34,22 +33,22 @@ export default function () {
       private: true,
       publishConfig: true
     })),
-    funding: "https://github.com/sponsors/dword-design",
-    publishConfig: {
-      access: "public"
-    },
-    type: "module",
-    version: this.packageConfig.version || "1.0.0",
-    ...(this.config.git && {
-      repository: `dword-design/${this.config.git.project}`
-    }),
     author: "Sebastian Landwehr <info@sebastianlandwehr.com>",
     engines: {
-      node: `>=${this.config.minNodeVersion ?? this.config.supportedNodeVersions[0]}${this.config.maxNodeVersion === null ? "" : `<${this.config.maxNodeVersion}`}`
+      node: `>=${base.config.minNodeVersion ?? base.config.supportedNodeVersions[0]}${base.config.maxNodeVersion === null ? "" : `<${base.config.maxNodeVersion}`}`
     },
     files: ["dist"],
+    funding: "https://github.com/sponsors/dword-design",
+    ...(base.config.git && {
+      repository: `dword-design/${base.config.git.project}`
+    }),
     license: "MIT",
-    ...this.config.packageConfig,
-    scripts: sortKeys(mapValues(commandNames, (handler, name) => this.packageConfig.name === "@dword-design/base" ? `${packageName`tsx`} src/cli.ts ${name}` : `base ${name}`))
+    publishConfig: {
+      access: "public"
+    },
+    scripts: sortKeys(mapValues(commandNames, (handler, name) => base.packageConfig.name === "@dword-design/base" ? `${packageName`tsx`} src/cli.ts ${name}` : `base ${name}`)),
+    type: "module",
+    ...base.config.packageConfig,
+    version: base.packageConfig.version || "1.0.0"
   };
-}
+};

package/dist/get-generated-files/get-readme-string/index.d.ts

@@ -1 +1,3 @@
-export default function (): any;
+import type { Base } from '@/src';
+declare const _default: (base: Base) => any;
+export default _default;

package/dist/get-generated-files/get-readme-string/index.js

@@ -3,8 +3,8 @@ import endent from "endent";
 import getProjectzReadmeSectionRegex from "get-projectz-readme-section-regex";
 import { readFileSync as safeReadFileSync } from "safe-readfile";
 import replacements from "./replacements.js";
-export default function () {
-  const readme = safeReadFileSync(pathLib.join(this.cwd, "README.md"), "utf8") || endent`
+export default base => {
+  const readme = safeReadFileSync(pathLib.join(base.cwd, "README.md"), "utf8") || endent`
       <!-- TITLE -->
 
       <!-- BADGES -->
@@ -18,11 +18,11 @@ export default function () {
   let result = readme;
   for (const [name, replacement] of Object.entries(replacements)) {
     const sectionName = name.toUpperCase();
-    result = result.replace(getProjectzReadmeSectionRegex(sectionName), endent`
+    result = result.replace(getProjectzReadmeSectionRegex(sectionName), () => endent`
         <!-- ${sectionName}/ -->
-        ${replacement.call(this)}
+        ${replacement(base)}
         <!-- /${sectionName} -->
       `);
   }
   return result;
-}
+};

package/dist/get-generated-files/get-readme-string/replacements.d.ts

@@ -1,8 +1,9 @@
+import type { Base } from '@/src';
 declare const _default: {
-    badges(): string;
-    description(): any;
-    install(): any;
-    license(): string;
-    title(): string;
+    badges: (base: Base) => string;
+    description: (base: Base) => any;
+    install: (base: Base) => any;
+    license: (base: Base) => string;
+    title: (base: Base) => string;
 };
 export default _default;

package/dist/get-generated-files/get-readme-string/replacements.js

@@ -3,81 +3,74 @@ import { last } from "lodash-es";
 import spdxParse from "spdx-expression-parse";
 import spdxList from "spdx-license-list/full.js";
 export default {
-  badges() {
-    return endent`
-      <p>
-        ${[...(this.config.npmPublish && !this.packageConfig.private ? [endent`
-                  <a href="https://npmjs.org/package/${this.packageConfig.name}">
-                    <img
-                      src="https://img.shields.io/npm/v/${this.packageConfig.name}.svg"
-                      alt="npm version"
-                    >
-                  </a>
-                `] : []), '<img src="https://img.shields.io/badge/os-linux%20%7C%C2%A0macos%20%7C%C2%A0windows-blue" alt="Linux macOS Windows compatible">', endent`
-            <a href="https://github.com/${this.packageConfig.repository}/actions">
-              <img
-                src="https://github.com/${this.packageConfig.repository}/workflows/build/badge.svg"
-                alt="Build status"
-              >
-            </a>
-          `, endent`
-            <a href="https://codecov.io/gh/${this.packageConfig.repository}">
-              <img
-                src="https://codecov.io/gh/${this.packageConfig.repository}/branch/master/graph/badge.svg${this.config.codecovGraphToken ? `?token=${this.config.codecovGraphToken}` : ""}"
-                alt="Coverage status"
-              >
-            </a>
-          `, endent`
-            <a href="https://david-dm.org/${this.packageConfig.repository}">
-              <img src="https://img.shields.io/david/${this.packageConfig.repository}" alt="Dependency status">
-            </a>
-          `, '<img src="https://img.shields.io/badge/renovate-enabled-brightgreen" alt="Renovate enabled">', "<br/>", endent`
-            <a href="https://gitpod.io/#https://github.com/${this.packageConfig.repository}">
-              <img
-                src="https://gitpod.io/button/open-in-gitpod.svg"
-                alt="Open in Gitpod"
-                width="114"
-              >
-            </a>
-          `, endent`
-            <a href="https://www.buymeacoffee.com/dword">
-              <img
-                src="https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg"
-                alt="Buy Me a Coffee"
-                width="114"
-              >
-            </a>
-          `, endent`
-            <a href="https://paypal.me/SebastianLandwehr">
-              <img
-                src="https://sebastianlandwehr.com/images/paypal.svg"
-                alt="PayPal"
-                width="163"
-              >
-            </a>
-          `, endent`
-            <a href="https://www.patreon.com/dworddesign">
-              <img
-                src="https://sebastianlandwehr.com/images/patreon.svg"
-                alt="Patreon"
-                width="163"
-              >
-            </a>
-          `].join("")}
-      </p>
-    `;
-  },
-  description() {
-    return this.packageConfig.description || "";
-  },
-  install() {
-    return this.config.readmeInstallString;
-  },
-  license() {
-    return [endent`
+  badges: base => endent`
+    <p>
+      ${[...(base.config.npmPublish && !base.packageConfig.private ? [endent`
+                <a href="https://npmjs.org/package/${base.packageConfig.name}">
+                  <img
+                    src="https://img.shields.io/npm/v/${base.packageConfig.name}.svg"
+                    alt="npm version"
+                  >
+                </a>
+              `] : []), '<img src="https://img.shields.io/badge/os-linux%20%7C%C2%A0macos%20%7C%C2%A0windows-blue" alt="Linux macOS Windows compatible">', endent`
+          <a href="https://github.com/${base.packageConfig.repository}/actions">
+            <img
+              src="https://github.com/${base.packageConfig.repository}/workflows/build/badge.svg"
+              alt="Build status"
+            >
+          </a>
+        `, endent`
+          <a href="https://codecov.io/gh/${base.packageConfig.repository}">
+            <img
+              src="https://codecov.io/gh/${base.packageConfig.repository}/branch/master/graph/badge.svg${base.config.codecovGraphToken ? `?token=${base.config.codecovGraphToken}` : ""}"
+              alt="Coverage status"
+            >
+          </a>
+        `, endent`
+          <a href="https://david-dm.org/${base.packageConfig.repository}">
+            <img src="https://img.shields.io/david/${base.packageConfig.repository}" alt="Dependency status">
+          </a>
+        `, '<img src="https://img.shields.io/badge/renovate-enabled-brightgreen" alt="Renovate enabled">', "<br/>", endent`
+          <a href="https://gitpod.io/#https://github.com/${base.packageConfig.repository}">
+            <img
+              src="https://gitpod.io/button/open-in-gitpod.svg"
+              alt="Open in Gitpod"
+              width="114"
+            >
+          </a>
+        `, endent`
+          <a href="https://www.buymeacoffee.com/dword">
+            <img
+              src="https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg"
+              alt="Buy Me a Coffee"
+              width="114"
+            >
+          </a>
+        `, endent`
+          <a href="https://paypal.me/SebastianLandwehr">
+            <img
+              src="https://sebastianlandwehr.com/images/paypal.svg"
+              alt="PayPal"
+              width="163"
+            >
+          </a>
+        `, endent`
+          <a href="https://www.patreon.com/dworddesign">
+            <img
+              src="https://sebastianlandwehr.com/images/patreon.svg"
+              alt="Patreon"
+              width="163"
+            >
+          </a>
+        `].join("")}
+    </p>
+  `,
+  description: base => base.packageConfig.description || "",
+  install: base => base.config.readmeInstallString,
+  license: base => [endent`
         ## Contribute
 
-        Are you missing something or want to contribute? Feel free to file an [issue](https://github.com/${this.packageConfig.repository}/issues) or a [pull request](https://github.com/${this.packageConfig.repository}/pulls)! ⚙️
+        Are you missing something or want to contribute? Feel free to file an [issue](https://github.com/${base.packageConfig.repository}/issues) or a [pull request](https://github.com/${base.packageConfig.repository}/pulls)! ⚙️
 
         ## Support
 
@@ -108,26 +101,23 @@ export default {
         </p>
 
         Thanks a lot for your support! ❤️
-      `, ...(this.config.seeAlso.length > 0 ? [endent`
+      `, ...(base.config.seeAlso.length > 0 ? [endent`
               ## See also
 
-              ${this.config.seeAlso.map(entry => {
-      const parts = entry.repository.split("/");
-      const owner = parts.length >= 2 ? parts[0] : "dword-design";
-      const name = last(parts);
-      return `* [${name}](https://github.com/${owner}/${name}): ${entry.description}`;
-    }).join("\n")}
-            `] : []), this.packageConfig.license ? [(() => {
-      const parsed = spdxParse(this.packageConfig.license);
-      const license = spdxList[parsed.license];
-      return endent`
+              ${base.config.seeAlso.map(entry => {
+    const parts = entry.repository.split("/");
+    const owner = parts.length >= 2 ? parts[0] : "dword-design";
+    const name = last(parts);
+    return `* [${name}](https://github.com/${owner}/${name}): ${entry.description}`;
+  }).join("\n")}
+            `] : []), base.packageConfig.license ? [(() => {
+    const parsed = spdxParse(base.packageConfig.license);
+    const license = spdxList[parsed.license];
+    return endent`
                 ## License
   
                 [${license.name}](${license.url}) © [Sebastian Landwehr](https://sebastianlandwehr.com)
               `;
-    })()] : []].join("\n\n");
-  },
-  title() {
-    return `# ${this.packageConfig.name}`;
-  }
+  })()] : []].join("\n\n"),
+  title: base => `# ${base.packageConfig.name}`
 };

package/dist/get-generated-files/get-release/index.d.ts

@@ -1,3 +1,5 @@
-export default function (): {
+import type { Base } from '@/src';
+declare const _default: (base: Base) => {
     plugins: any[];
 };
+export default _default;

package/dist/get-generated-files/get-release/index.js

@@ -1,12 +1,10 @@
 import packageName from "depcheck-package-name";
-export default function () {
-  return {
-    plugins: ["@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", packageName`@semantic-release/changelog`, this.config.npmPublish ? packageName`@semantic-release/npm` : [packageName`@semantic-release/npm`, {
-      npmPublish: false
-    }], this.config.deployAssets.length > 0 ? [packageName`@semantic-release/github`, {
-      assets: this.config.deployAssets
-    }] : packageName`@semantic-release/github`, [packageName`@semantic-release/git`, {
-      message: "chore: ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-    }], ...this.config.deployPlugins]
-  };
-}
+export default base => ({
+  plugins: ["@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", packageName`@semantic-release/changelog`, base.config.npmPublish ? packageName`@semantic-release/npm` : [packageName`@semantic-release/npm`, {
+    npmPublish: false
+  }], base.config.deployAssets.length > 0 ? [packageName`@semantic-release/github`, {
+    assets: base.config.deployAssets
+  }] : packageName`@semantic-release/github`, [packageName`@semantic-release/git`, {
+    message: "chore: ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+  }], ...base.config.deployPlugins]
+});

package/dist/get-generated-files/get-renovate/index.d.ts

@@ -1 +1,3 @@
-export default function (): any;
+import type { Base } from '@/src';
+declare const _default: (base: Base) => any;
+export default _default;

package/dist/get-generated-files/get-renovate/index.js

@@ -1,33 +1,31 @@
 import defu from "@dword-design/defu";
 import getRegexManagerString from "./get-regex-manager-string/index.js";
-export default function () {
-  return defu(this.config.renovateConfig, {
-    extends: [":semanticCommits", ":semanticPrefixFix"],
-    gitIgnoredAuthors: ["actions@github.com"],
-    "github-actions": {
-      enabled: false
-    },
-    labels: ["maintenance"],
-    lockFileMaintenance: {
-      automerge: true,
-      enabled: true,
-      ...(this.config.isLockFileFixCommitType ? {} : {
-        semanticCommitType: "chore"
-      })
-    },
-    rangeStrategy: "replace",
-    regexManagers: [{
-      datasourceTemplate: "github-tags",
-      fileMatch: [String.raw`\.ts$`],
-      matchStrings: [getRegexManagerString("gitHubAction", "(?<depName>.*?)@v(?<currentValue>.*?)")],
-      versioningTemplate: "npm"
-    }, {
-      datasourceTemplate: "node-version",
-      depNameTemplate: "node",
-      fileMatch: [String.raw`\.ts$`],
-      matchStrings: [getRegexManagerString("nodejsVersion", "(?<currentValue>.*?)")],
-      versioningTemplate: "node"
-    }],
-    semanticCommitScope: null
-  });
-}
+export default base => defu(base.config.renovateConfig, {
+  extends: [":semanticCommits", ":semanticPrefixFix"],
+  "github-actions": {
+    enabled: false
+  },
+  gitIgnoredAuthors: ["actions@github.com"],
+  labels: ["maintenance"],
+  lockFileMaintenance: {
+    automerge: true,
+    enabled: true,
+    ...(!base.config.isLockFileFixCommitType && {
+      semanticCommitType: "chore"
+    })
+  },
+  rangeStrategy: "replace",
+  regexManagers: [{
+    datasourceTemplate: "github-tags",
+    fileMatch: [String.raw`\.ts$`],
+    matchStrings: [getRegexManagerString("gitHubAction", "(?<depName>.*?)@v(?<currentValue>.*?)")],
+    versioningTemplate: "npm"
+  }, {
+    datasourceTemplate: "node-version",
+    depNameTemplate: "node",
+    fileMatch: [String.raw`\.ts$`],
+    matchStrings: [getRegexManagerString("nodejsVersion", "(?<currentValue>.*?)")],
+    versioningTemplate: "node"
+  }],
+  semanticCommitScope: null
+});

package/dist/get-generated-files/get-typescript/index.d.ts

@@ -1 +1,3 @@
-export default function (): any;
+import type { Base } from '@/src';
+declare const _default: (base: Base) => any;
+export default _default;

package/dist/get-generated-files/get-typescript/index.js

@@ -1,20 +1,18 @@
 import defu from "@dword-design/defu";
-export default function () {
-  return defu(this.config.typescriptConfig, {
-    compilerOptions: {
-      declaration: true,
-      esModuleInterop: true,
-      module: "ESNext",
-      moduleResolution: "bundler",
-      ...(this.config.hasTypescriptConfigRootAlias && {
-        paths: {
-          "@/*": ["./*"]
-        }
-      }),
-      skipLibCheck: true,
-      strict: true,
-      target: "ESNext"
-    },
-    exclude: ["test-results"]
-  });
-}
+export default base => defu(base.config.typescriptConfig, {
+  compilerOptions: {
+    declaration: true,
+    esModuleInterop: true,
+    module: "ESNext",
+    moduleResolution: "bundler",
+    ...(base.config.hasTypescriptConfigRootAlias && {
+      paths: {
+        "@/*": ["./*"]
+      }
+    }),
+    skipLibCheck: true,
+    strict: true,
+    target: "ESNext"
+  },
+  exclude: ["test-results"]
+});