yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor resolveOutDir in typescript/utils

Browse Source
This commit is contained in:
Bassel Kanso 2022-05-17 16:40:09 +03:00
parent 3b5fd4ad79
commit 12c64a2d11
12 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/strapi/lib/commands/admin-create.js
View File

@ -94,9 +94,7 @@ async function createAdmin({ email, password, firstname, lastname }) {
const appDir = process.cwd();
const isTSProject = await tsUtils.isUsingTypeScript(appDir);
const compiledDirectoryPath = isTSProject
? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
: null;
const outDir = await tsUtils.resolveOutDir(appDir);
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();

6
packages/core/strapi/lib/commands/admin-reset.js
View File

@ -46,9 +46,7 @@ async function changePassword({ email, password }) {
const appDir = process.cwd();
const isTSProject = await tsUtils.isUsingTypeScript(appDir);
const compiledDirectoryPath = isTSProject
? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
: null;
const outDir = await tsUtils.resolveOutDir(appDir);
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();

6
packages/core/strapi/lib/commands/build.js
View File

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

6
packages/core/strapi/lib/commands/configurationDump.js
View File

@ -16,16 +16,14 @@ module.exports = async function({ file: filePath, pretty }) {
const appDir = process.cwd();
const isTSProject = await tsUtils.isUsingTypeScript(appDir);
const compiledDirectoryPath = isTSProject
? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
: null;
const outDir = await tsUtils.resolveOutDir(appDir);
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();

6
packages/core/strapi/lib/commands/configurationRestore.js
View File

@ -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
? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
: null;
const outDir = await tsUtils.resolveOutDir(appDir);
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();

6
packages/core/strapi/lib/commands/console.js
View File

@ -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
? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
: undefined;
const outDir = await tsUtils.resolveOutDir(appDir);
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();

6
packages/core/strapi/lib/commands/develop.js
View File

@ -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
? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
: null;
const distDir = isTSProject ? compiledDirectoryPath : appDir;
const outDir = await tsUtils.resolveOutDir(appDir);
const distDir = isTSProject ? outDir : appDir;
try {
if (cluster.isMaster || cluster.isPrimary) {

6
packages/core/strapi/lib/commands/routes/list.js
View File

@ -11,9 +11,7 @@ module.exports = async function() {
const appDir = process.cwd();
const isTSProject = await tsUtils.isUsingTypeScript(appDir);
const compiledDirectoryPath = isTSProject
? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
: null;
const outDir = await tsUtils.resolveOutDir(appDir);
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();

11
packages/core/strapi/lib/commands/start.js
View File

@ -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
? tsUtils.resolveConfigOptions(`${appDir}/tsconfig.json`).options.outDir
: null;
const distDir = isTSProject && !specifiedDir ? compiledDirectoryPath : specifiedDir;
const outDir = await tsUtils.resolveOutDir(appDir);
if (isTSProject)
await tsUtils.compile(appDir, {
watch: false,
configOptions: { options: { incremental: true } },
});
const distDir = isTSProject && !specifiedDir ? outDir : specifiedDir;
strapi({ distDir }).start();
};

6
packages/core/strapi/lib/commands/watchAdmin.js
View File

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

2
packages/utils/typescript/lib/utils/index.js
View File

@ -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,
};

16
packages/utils/typescript/lib/utils/resolve-outdir.js Normal file
View File

@ -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;
};