refactor resolveOutDir in typescript/utils

packages/core/strapi/lib/commands/admin-create.js

@@ -94,9 +94,7 @@ async function createAdmin({ email, password, firstname, lastname }) {
   const appDir = process.cwd();
 
   const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const compiledDirectoryPath = isTSProject
+  const outDir = await tsUtils.resolveOutDir(appDir);
-    ? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
-    : null;
 
   if (isTSProject)
     await tsUtils.compile(appDir, {
@@ -104,7 +102,7 @@ async function createAdmin({ email, password, firstname, lastname }) {
       configOptions: { options: { incremental: true } },
     });
 
-  const distDir = isTSProject ? compiledDirectoryPath : appDir;
+  const distDir = isTSProject ? outDir : appDir;
 
   const app = await strapi({ appDir, distDir }).load();
 

packages/core/strapi/lib/commands/admin-reset.js

@@ -46,9 +46,7 @@ async function changePassword({ email, password }) {
   const appDir = process.cwd();
 
   const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const compiledDirectoryPath = isTSProject
+  const outDir = await tsUtils.resolveOutDir(appDir);
-    ? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
-    : null;
 
   if (isTSProject)
     await tsUtils.compile(appDir, {
@@ -56,7 +54,7 @@ async function changePassword({ email, password }) {
       configOptions: { options: { incremental: true } },
     });
 
-  const distDir = isTSProject ? compiledDirectoryPath : appDir;
+  const distDir = isTSProject ? outDir : appDir;
 
   const app = await strapi({ appDir, distDir }).load();
 

packages/core/strapi/lib/commands/build.js

@@ -11,16 +11,14 @@ module.exports = async ({ optimization, forceBuild = true }) => {
   const srcDir = process.cwd();
 
   const useTypeScriptServer = await tsUtils.isUsingTypeScript(srcDir);
-  const compiledDirectoryPath = useTypeScriptServer
+  const outDir = await tsUtils.resolveOutDir(srcDir);
-    ? tsUtils.resolveConfigOptions(`${srcDir}/tsconfig.json`).options.outDir
-    : null;
 
   // Typescript
   if (useTypeScriptServer) {
     await buildTypeScript({ srcDir, watch: false });
 
     // Update the dir path for the next steps
-    buildDestDir = compiledDirectoryPath;
+    buildDestDir = outDir;
   }
 
   await buildAdmin({

packages/core/strapi/lib/commands/configurationDump.js

@@ -16,16 +16,14 @@ module.exports = async function({ file: filePath, pretty }) {
   const appDir = process.cwd();
 
   const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const compiledDirectoryPath = isTSProject
+  const outDir = await tsUtils.resolveOutDir(appDir);
-    ? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
-    : null;
   if (isTSProject)
     await tsUtils.compile(appDir, {
       watch: false,
       configOptions: { options: { incremental: true } },
     });
 
-  const distDir = isTSProject ? compiledDirectoryPath : appDir;
+  const distDir = isTSProject ? outDir : appDir;
 
   const app = await strapi({ appDir, distDir }).load();
 

packages/core/strapi/lib/commands/configurationRestore.js

@@ -17,9 +17,7 @@ module.exports = async function({ file: filePath, strategy = 'replace' }) {
   const appDir = process.cwd();
 
   const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const compiledDirectoryPath = isTSProject
+  const outDir = await tsUtils.resolveOutDir(appDir);
-    ? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
-    : null;
 
   if (isTSProject)
     await tsUtils.compile(appDir, {
@@ -27,7 +25,7 @@ module.exports = async function({ file: filePath, strategy = 'replace' }) {
       configOptions: { options: { incremental: true } },
     });
 
-  const distDir = isTSProject ? compiledDirectoryPath : appDir;
+  const distDir = isTSProject ? outDir : appDir;
 
   const app = await strapi({ appDir, distDir }).load();
 

packages/core/strapi/lib/commands/console.js

@@ -12,9 +12,7 @@ module.exports = async () => {
   // Now load up the Strapi framework for real.
   const appDir = process.cwd();
   const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const compiledDirectoryPath = isTSProject
+  const outDir = await tsUtils.resolveOutDir(appDir);
-    ? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
-    : undefined;
 
   if (isTSProject)
     await tsUtils.compile(appDir, {
@@ -22,7 +20,7 @@ module.exports = async () => {
       configOptions: { options: { incremental: true } },
     });
 
-  const distDir = isTSProject ? compiledDirectoryPath : appDir;
+  const distDir = isTSProject ? outDir : appDir;
 
   const app = await strapi({ appDir, distDir }).load();
 

packages/core/strapi/lib/commands/develop.js

@@ -22,10 +22,8 @@ module.exports = async function({ build, watchAdmin, polling, browser }) {
   const appDir = process.cwd();
 
   const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const compiledDirectoryPath = isTSProject
+  const outDir = await tsUtils.resolveOutDir(appDir);
-    ? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
+  const distDir = isTSProject ? outDir : appDir;
-    : null;
-  const distDir = isTSProject ? compiledDirectoryPath : appDir;
 
   try {
     if (cluster.isMaster || cluster.isPrimary) {

packages/core/strapi/lib/commands/routes/list.js

@@ -11,9 +11,7 @@ module.exports = async function() {
   const appDir = process.cwd();
 
   const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const compiledDirectoryPath = isTSProject
+  const outDir = await tsUtils.resolveOutDir(appDir);
-    ? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
-    : null;
 
   if (isTSProject)
     await tsUtils.compile(appDir, {
@@ -21,7 +19,7 @@ module.exports = async function() {
       configOptions: { options: { incremental: true } },
     });
 
-  const distDir = isTSProject ? compiledDirectoryPath : appDir;
+  const distDir = isTSProject ? outDir : appDir;
 
   const app = await strapi({ appDir, distDir }).load();
 

packages/core/strapi/lib/commands/start.js

@@ -8,10 +8,13 @@ const strapi = require('../index');
 module.exports = async specifiedDir => {
   const appDir = process.cwd();
   const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const compiledDirectoryPath = isTSProject
+  const outDir = await tsUtils.resolveOutDir(appDir);
-    ? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
+  if (isTSProject)
-    : null;
+    await tsUtils.compile(appDir, {
-  const distDir = isTSProject && !specifiedDir ? compiledDirectoryPath : specifiedDir;
+      watch: false,
+      configOptions: { options: { incremental: true } },
+    });
+  const distDir = isTSProject && !specifiedDir ? outDir : specifiedDir;
 
   strapi({ distDir }).start();
 };

packages/core/strapi/lib/commands/watchAdmin.js

@@ -12,10 +12,8 @@ module.exports = async function({ browser }) {
   const currentDirectory = process.cwd();
 
   const isTSProject = await tsUtils.isUsingTypeScript(currentDirectory);
-  const compiledDirectoryPath = isTSProject
+  const outDir = await tsUtils.resolveOutDir(currentDirectory);
-    ? tsUtils.resolveConfigOptions(`${currentDirectory}/tsconfig.json`).options.outDir
+  const buildDestDir = isTSProject ? outDir : currentDirectory;
-    : null;
-  const buildDestDir = isTSProject ? compiledDirectoryPath : currentDirectory;
 
   const strapiInstance = strapi({
     distDir: buildDestDir,

packages/utils/typescript/lib/utils/index.js

@@ -6,6 +6,7 @@ const getConfigPath = require('./get-config-path');
 const reportDiagnostics = require('./report-diagnostics');
 const resolveConfigOptions = require('./resolve-config-options');
 const formatHost = require('./format-host');
+const resolveOutDir = require('./resolve-outdir');
 
 module.exports = {
   isUsingTypeScript,
@@ -14,4 +15,5 @@ module.exports = {
   reportDiagnostics,
   resolveConfigOptions,
   formatHost,
+  resolveOutDir,
 };

packages/utils/typescript/lib/utils/resolve-outdir.js

@@ -0,0 +1,16 @@
+'use strict';
+const resolveConfigOptions = require('./resolve-config-options');
+const isUsingTypescript = require('./is-using-typescript');
+
+const DEFAULT_TS_CONFIG_FILENAME = 'tsconfig.json';
+/**
+ * Checks if `dir` is a using TypeScript (whether there is a tsconfig file or not)
+ * @param {string} dir
+ * @param {string | undefined} configFilename
+ * @returns {string | undefined}
+ */
+module.exports = async (dir, configFilename = DEFAULT_TS_CONFIG_FILENAME) => {
+  return (await isUsingTypescript(dir))
+    ? resolveConfigOptions(`${dir}/${configFilename}`).options.outDir
+    : undefined;
+};