yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-24 21:54:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix isTypeScriptProject -> isUsingTypeScript

Browse Source
This commit is contained in:
Convly 2022-04-14 14:55:57 +02:00
parent 51be8899e6
commit 431ccbe55c
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/admin/index.js
View File

@ -4,7 +4,7 @@ const path = require('path');
const fs = require('fs-extra');
const webpack = require('webpack');
const WebpackDevServer = require('webpack-dev-server');
const { isTypeScriptProject } = require('@strapi/typescript-utils');
const { isUsingTypeScript } = require('@strapi/typescript-utils');
const chalk = require('chalk');
const {
@ -17,7 +17,7 @@ const {
async function build({ appDir, buildDestDir, env, forceBuild, optimize, options, plugins }) {
const buildAdmin = await shouldBuildAdmin({ appDir, plugins });
const useTypeScript = await isTypeScriptProject(
const useTypeScript = await isUsingTypeScript(
path.join(appDir, 'src', 'admin'),
'tsconfig.json'
);
@ -99,7 +99,7 @@ async function clean({ appDir, buildDestDir }) {
}
async function watchAdmin({ appDir, browser, buildDestDir, host, options, plugins, port }) {
const useTypeScript = await isTypeScriptProject(
const useTypeScript = await isUsingTypeScript(
path.join(appDir, 'src', 'admin'),
'tsconfig.json'
);

6
packages/core/admin/server/controllers/admin.js
View File

@ -5,7 +5,7 @@ const execa = require('execa');
const _ = require('lodash');
const { exists } = require('fs-extra');
const { ValidationError } = require('@strapi/utils').errors;
const { isTypeScriptProject } = require('@strapi/typescript-utils');
const { isUsingTypeScript } = require('@strapi/typescript-utils');
// eslint-disable-next-line node/no-extraneous-require
const ee = require('@strapi/strapi/lib/utils/ee');
@ -45,8 +45,8 @@ module.exports = {
},
async telemetryProperties() {
const useTypescriptOnServer = await isTypeScriptProject(strapi.dirs.app.root);
const useTypescriptOnAdmin = await isTypeScriptProject(
const useTypescriptOnServer = await isUsingTypeScript(strapi.dirs.app.root);
const useTypescriptOnAdmin = await isUsingTypeScript(
path.join(strapi.dirs.app.root, 'src', 'admin')
);

12
packages/core/admin/utils/__tests__/get-custom-app-config-file.test.js
View File

@ -1,12 +1,12 @@
'use strict';
const fse = require('fs-extra');
const { isTypeScriptProject } = require('@strapi/typescript-utils');
const { isUsingTypeScript } = require('@strapi/typescript-utils');
const getCustomAppConfigFile = require('../get-custom-app-config-file');
jest.mock('@strapi/typescript-utils', () => ({
...jest.requireActual('@strapi/typescript-utils'),
isTypeScriptProject: jest.fn(),
isUsingTypeScript: jest.fn(),
}));
describe('getCustomAppConfigFile', () => {
@ -15,7 +15,7 @@ describe('getCustomAppConfigFile', () => {
return ['app.example.js', 'webpack.config.js', 'app.ts', 'app.tsx'];
});
isTypeScriptProject.mockImplementation(() => false);
isUsingTypeScript.mockImplementation(() => false);
const result = await getCustomAppConfigFile('/');
@ -27,7 +27,7 @@ describe('getCustomAppConfigFile', () => {
return ['app.js', 'webpack.config.js', 'app.example.ts', 'app.example.tsx'];
});
isTypeScriptProject.mockImplementation(() => true);
isUsingTypeScript.mockImplementation(() => true);
const result = await getCustomAppConfigFile('/');
@ -39,7 +39,7 @@ describe('getCustomAppConfigFile', () => {
return ['app.js', 'webpack.config.js', 'app.ts', 'app.tsx'];
});
isTypeScriptProject.mockImplementation(() => false);
isUsingTypeScript.mockImplementation(() => false);
const result = await getCustomAppConfigFile('/');
@ -51,7 +51,7 @@ describe('getCustomAppConfigFile', () => {
return ['app.js', 'webpack.config.js', 'app.ts', 'app.example.tsx'];
});
isTypeScriptProject.mockImplementation(() => true);
isUsingTypeScript.mockImplementation(() => true);
const result = await getCustomAppConfigFile('/');

4
packages/core/admin/utils/create-cache-dir.js
View File

@ -3,7 +3,7 @@
const path = require('path');
const _ = require('lodash');
const fs = require('fs-extra');
const { isTypeScriptProject } = require('@strapi/typescript-utils');
const { isUsingTypeScript } = require('@strapi/typescript-utils');
const getCustomAppConfigFile = require('./get-custom-app-config-file');
const getPkgPath = name => path.dirname(require.resolve(`${name}/package.json`));
@ -71,7 +71,7 @@ async function copyAdmin(dest) {
async function createCacheDir({ appDir, plugins }) {
const cacheDir = path.resolve(appDir, '.cache');
const useTypeScript = await isTypeScriptProject(
const useTypeScript = await isUsingTypeScript(
path.join(appDir, 'src', 'admin'),
'tsconfig.json'
);

4
packages/core/admin/utils/get-custom-app-config-file.js
View File

@ -2,7 +2,7 @@
const { join } = require('path');
const fse = require('fs-extra');
const { isTypeScriptProject } = require('@strapi/typescript-utils');
const { isUsingTypeScript } = require('@strapi/typescript-utils');
/**
* Retrieve the custom admin entry file name
@ -11,7 +11,7 @@ const { isTypeScriptProject } = require('@strapi/typescript-utils');
*/
const getCustomAppConfigFile = async dir => {
const adminSrcPath = join(dir, 'src', 'admin');
const useTypeScript = await isTypeScriptProject(adminSrcPath, 'tsconfig.json');
const useTypeScript = await isUsingTypeScript(adminSrcPath, 'tsconfig.json');
const files = await fse.readdir(adminSrcPath);

4
packages/core/admin/utils/watch-admin-files.js
View File

@ -3,7 +3,7 @@
const path = require('path');
const fs = require('fs-extra');
const chokidar = require('chokidar');
const { isTypeScriptProject } = require('@strapi/typescript-utils');
const { isUsingTypeScript } = require('@strapi/typescript-utils');
/**
* Listen to files change and copy the changed files in the .cache/admin folder
@ -11,7 +11,7 @@ const { isTypeScriptProject } = require('@strapi/typescript-utils');
* @param {string} dir
*/
async function watchAdminFiles(dir) {
const useTypeScript = await isTypeScriptProject(path.join(dir, 'src', 'admin'), 'tsconfig.json');
const useTypeScript = await isUsingTypeScript(path.join(dir, 'src', 'admin'), 'tsconfig.json');
const cacheDir = path.join(dir, '.cache');
const targetExtensionFile = useTypeScript ? 'app.tsx' : 'app.js';

6
packages/core/strapi/lib/services/metrics/sender.js
View File

@ -6,7 +6,7 @@ const _ = require('lodash');
const isDocker = require('is-docker');
const fetch = require('node-fetch');
const ciEnv = require('ci-info');
const { isTypeScriptProjectSync } = require('@strapi/typescript-utils');
const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
const ee = require('../../utils/ee');
const machineID = require('../../utils/machine-id');
const stringifyDeep = require('./stringify-deep');
@ -52,8 +52,8 @@ module.exports = strapi => {
version: strapi.config.get('info.strapi'),
strapiVersion: strapi.config.get('info.strapi'),
projectType: isEE ? 'Enterprise' : 'Community',
useTypescriptOnServer: isTypeScriptProjectSync(serverRootPath),
useTypescriptOnAdmin: isTypeScriptProjectSync(adminRootPath),
useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath),
useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),
};
addPackageJsonStrapiMetadata(anonymous_metadata, strapi);