@strapi/admin 4.2.0-beta.4 → 4.2.2

package/utils/create-cache-dir.js

@@ -1,161 +0,0 @@
-'use strict';
-
-const path = require('path');
-const _ = require('lodash');
-const fs = require('fs-extra');
-const { isUsingTypeScript } = require('@strapi/typescript-utils');
-const getCustomAppConfigFile = require('./get-custom-app-config-file');
-
-const getPkgPath = name => path.dirname(require.resolve(`${name}/package.json`));
-
-async function createPluginsJs(plugins, dest) {
-  const pluginsArray = plugins.map(({ pathToPlugin, name }) => {
-    const shortName = _.camelCase(name);
-
-    /**
-     * path.join, on windows, it uses backslashes to resolve path.
-     * The problem is that Webpack does not windows paths
-     * With this tool, we need to rely on "/" and not "\".
-     * This is the reason why '..\\..\\..\\node_modules\\@strapi\\plugin-content-type-builder/strapi-admin.js' was not working.
-     * The regexp at line 105 aims to replace the windows backslashes by standard slash so that webpack can deal with them.
-     * Backslash looks to work only for absolute paths with webpack => https://webpack.js.org/concepts/module-resolution/#absolute-paths
-     */
-    const realPath = path
-      .join(path.relative(path.resolve(dest, 'admin', 'src'), pathToPlugin), 'strapi-admin.js')
-      .replace(/\\/g, '/');
-
-    return {
-      name,
-      pathToPlugin: realPath,
-      shortName,
-    };
-  });
-
-  const content = `
-${pluginsArray
-  .map(({ pathToPlugin, shortName }) => {
-    const req = `'${pathToPlugin}'`;
-
-    return `import ${shortName} from ${req};`;
-  })
-  .join('\n')}
-
-
-const plugins = {
-${[...pluginsArray]
-  .map(({ name, shortName }) => {
-    return `  '${name}': ${shortName},`;
-  })
-  .join('\n')}
-};
-
-export default plugins;
-`;
-
-  return fs.writeFile(path.resolve(dest, 'admin', 'src', 'plugins.js'), content);
-}
-
-async function copyAdmin(dest) {
-  const adminPath = getPkgPath('@strapi/admin');
-
-  // TODO copy ee folders for plugins
-  await fs.copy(path.resolve(adminPath, 'ee', 'admin'), path.resolve(dest, 'ee', 'admin'));
-
-  await fs.ensureDir(path.resolve(dest, 'config'));
-  await fs.copy(path.resolve(adminPath, 'admin'), path.resolve(dest, 'admin'));
-
-  // Copy package.json
-  await fs.copy(path.resolve(adminPath, 'package.json'), path.resolve(dest, 'package.json'));
-}
-
-async function createCacheDir({ appDir, plugins }) {
-  const cacheDir = path.resolve(appDir, '.cache');
-
-  const useTypeScript = await isUsingTypeScript(path.join(appDir, 'src', 'admin'), 'tsconfig.json');
-
-  const pluginsWithFront = Object.keys(plugins)
-    .filter(pluginName => {
-      const pluginInfo = plugins[pluginName];
-      return fs.existsSync(path.resolve(pluginInfo.pathToPlugin, 'strapi-admin.js'));
-    })
-    .map(name => ({ name, ...plugins[name] }));
-
-  // create .cache dir
-  await fs.emptyDir(cacheDir);
-
-  // copy admin core code
-  await copyAdmin(cacheDir);
-
-  // Retrieve the custom config file extension
-  const customAdminAppConfigFile = await getCustomAppConfigFile(appDir, useTypeScript);
-
-  if (customAdminAppConfigFile) {
-    const defaultAdminConfigFilePath = path.resolve(cacheDir, 'admin', 'src', 'app.js');
-    const customAdminAppConfigFilePath = path.join(
-      appDir,
-      'src',
-      'admin',
-      customAdminAppConfigFile
-    );
-    const dest = path.resolve(cacheDir, 'admin', 'src', customAdminAppConfigFile);
-
-    if (useTypeScript) {
-      // Remove the default config file
-      await fs.remove(defaultAdminConfigFilePath);
-      // Copy the custom one
-      await fs.copy(customAdminAppConfigFilePath, dest);
-    } else {
-      await fs.copy(customAdminAppConfigFilePath, dest);
-    }
-  }
-
-  // Copy admin extensions folder
-  const adminExtensionFolder = path.join(appDir, 'src', 'admin', 'extensions');
-
-  if (fs.existsSync(adminExtensionFolder)) {
-    await fs.copy(adminExtensionFolder, path.resolve(cacheDir, 'admin', 'src', 'extensions'));
-  }
-
-  // create plugins.js with plugins requires
-  await createPluginsJs(pluginsWithFront, cacheDir);
-
-  // create the tsconfig.json file so we can develop plugins in ts while being in a JS project
-  if (!useTypeScript) {
-    await createTSConfigFile(cacheDir);
-  }
-}
-
-async function createTSConfigFile(dest) {
-  const tsConfig = {
-    compilerOptions: {
-      lib: ['es2019', 'es2020.promise', 'es2020.bigint', 'es2020.string', 'DOM'],
-      noImplicitAny: false,
-      module: 'es2020',
-      target: 'es5',
-      jsx: 'react',
-      allowJs: true,
-      strict: true,
-      moduleResolution: 'node',
-      skipLibCheck: true,
-      esModuleInterop: true,
-      allowSyntheticDefaultImports: true,
-      resolveJsonModule: true,
-      noEmit: false,
-      incremental: true,
-    },
-    include: ['../../../src/admin/*', '../../../src/**/**/admin/src/*'],
-    exclude: ['node_modules', '**/*.test.js', '*.js'],
-  };
-
-  const filePath = path.join(dest, 'admin', 'src', 'tsconfig.json');
-
-  try {
-    await fs.ensureFile(filePath);
-
-    await fs.writeJSON(filePath, tsConfig, { spaces: 2 });
-  } catch (err) {
-    console.log(err);
-  }
-}
-
-module.exports = createCacheDir;

package/utils/get-custom-app-config-file.js

@@ -1,23 +0,0 @@
-'use strict';
-
-const { join } = require('path');
-const fse = require('fs-extra');
-const { isUsingTypeScript } = require('@strapi/typescript-utils');
-
-/**
- * Retrieve the custom admin entry file name
- * @param {String} dir - Directory of the admin panel
- * @returns String
- */
-const getCustomAppConfigFile = async dir => {
-  const adminSrcPath = join(dir, 'src', 'admin');
-  const useTypeScript = await isUsingTypeScript(adminSrcPath, 'tsconfig.json');
-
-  const files = await fse.readdir(adminSrcPath);
-
-  const appRegex = new RegExp(`app.${useTypeScript ? 't' : 'j'}sx?$`);
-
-  return files.find(file => file.match(appRegex));
-};
-
-module.exports = getCustomAppConfigFile;

package/utils/get-custom-webpack-config.js

@@ -1,38 +0,0 @@
-'use strict';
-
-const path = require('path');
-const chalk = require('chalk');
-const _ = require('lodash');
-const webpack = require('webpack');
-const fs = require('fs-extra');
-const getWebpackConfig = require('../webpack.config');
-
-const getCustomWebpackConfig = (dir, config) => {
-  const adminConfigPath = path.join(dir, 'src', 'admin', 'webpack.config.js');
-
-  let webpackConfig = getWebpackConfig(config);
-
-  if (fs.existsSync(adminConfigPath)) {
-    const webpackAdminConfig = require(path.resolve(adminConfigPath));
-
-    if (_.isFunction(webpackAdminConfig)) {
-      // Expose the devServer configuration
-      if (config.devServer) {
-        webpackConfig.devServer = config.devServer;
-      }
-
-      webpackConfig = webpackAdminConfig(webpackConfig, webpack);
-
-      if (!webpackConfig) {
-        console.error(
-          `${chalk.red('Error:')} Nothing was returned from your custom webpack configuration`
-        );
-        process.exit(1);
-      }
-    }
-  }
-
-  return webpackConfig;
-};
-
-module.exports = getCustomWebpackConfig;

package/utils/get-plugins-path.js

@@ -1,26 +0,0 @@
-'use strict';
-
-const { join, resolve } = require('path');
-const fs = require('fs-extra');
-// eslint-disable-next-line node/no-extraneous-require
-const glob = require('glob');
-
-const getPluginsPath = () => {
-  const rootPath = resolve(__dirname, '..', join('..', '..', '..', 'packages'));
-  const corePath = join(rootPath, 'core', '*');
-  const pluginsPath = join(rootPath, 'plugins', '*');
-  const corePackageDirs = glob.sync(corePath);
-  const pluginsPackageDirs = glob.sync(pluginsPath);
-
-  const packageDirs = [...corePackageDirs, ...pluginsPackageDirs].filter(dir => {
-    const isCoreAdmin = dir.includes('packages/core/admin');
-    const pathToEntryPoint = join(dir, 'admin', 'src', 'index.js');
-    const doesAdminFolderExist = fs.pathExistsSync(pathToEntryPoint);
-
-    return !isCoreAdmin && doesAdminFolderExist;
-  });
-
-  return packageDirs.map(dir => resolve(__dirname, '..', join(dir, 'admin', 'src')));
-};
-
-module.exports = getPluginsPath;

package/utils/index.js

@@ -1,13 +0,0 @@
-'use strict';
-
-const createCacheDir = require('./create-cache-dir');
-const getCustomWebpackConfig = require('./get-custom-webpack-config');
-const shouldBuildAdmin = require('./should-build-admin');
-const watchAdminFiles = require('./watch-admin-files');
-
-module.exports = {
-  createCacheDir,
-  getCustomWebpackConfig,
-  shouldBuildAdmin,
-  watchAdminFiles,
-};

package/utils/should-build-admin.js

@@ -1,52 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs-extra');
-const getCustomAppConfigFile = require('./get-custom-app-config-file');
-
-const DEFAULT_PLUGINS = [
-  'content-type-builder',
-  'content-manager',
-  'upload',
-  'email',
-  'i18n',
-  'users-permissions',
-];
-
-/**
- * Checks if the project's installed plugins are not the same as a default one.
- * @param {Object} plugins
- * @returns {boolean}
- */
-const hasNonDefaultPlugins = plugins => {
-  // List of plugins that are not the ones installed in a generated app
-  const installedPlugins = Object.keys(plugins).filter(x => !DEFAULT_PLUGINS.includes(x));
-
-  // List of default plugins uninstalled from a generated app
-  const missingPlugins = DEFAULT_PLUGINS.filter(x => !Object.keys(plugins).includes(x));
-
-  const diff = [...installedPlugins, ...missingPlugins];
-
-  return diff.length > 0;
-};
-
-const hasCustomAdminCode = async dir => {
-  const customAdminPath = path.join(dir, 'src', 'admin');
-
-  const customAdminAppConfigFile = await getCustomAppConfigFile(dir);
-  const customAdminWebpackFile = path.join(customAdminPath, 'webpack.config.js');
-
-  const hasCustomConfigFile = !!customAdminAppConfigFile;
-  const hasCustomWebpackFile = await fs.pathExists(customAdminWebpackFile);
-
-  return hasCustomConfigFile || hasCustomWebpackFile;
-};
-
-const shouldBuildAdmin = async ({ appDir, plugins }) => {
-  const appHasCustomAdminCode = await hasCustomAdminCode(appDir);
-  const appHasNonDefaultPlugins = hasNonDefaultPlugins(plugins);
-
-  return appHasCustomAdminCode || appHasNonDefaultPlugins;
-};
-
-module.exports = shouldBuildAdmin;

package/utils/watch-admin-files.js

@@ -1,59 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs-extra');
-const chokidar = require('chokidar');
-const { isUsingTypeScript } = require('@strapi/typescript-utils');
-
-/**
- * Listen to files change and copy the changed files in the .cache/admin folder
- * when using the dev mode
- * @param {string} dir
- */
-async function watchAdminFiles(dir) {
-  const useTypeScript = await isUsingTypeScript(path.join(dir, 'src', 'admin'), 'tsconfig.json');
-
-  const cacheDir = path.join(dir, '.cache');
-  const targetExtensionFile = useTypeScript ? 'app.tsx' : 'app.js';
-  const appExtensionFile = path.join(dir, 'src', 'admin', targetExtensionFile);
-  const extensionsPath = path.join(dir, 'src', 'admin', 'extensions');
-
-  // Only watch the admin/app.js file and the files that are in the ./admin/extensions/folder
-  const filesToWatch = [appExtensionFile, extensionsPath];
-
-  const watcher = chokidar.watch(filesToWatch, {
-    ignoreInitial: true,
-    ignorePermissionErrors: true,
-  });
-
-  watcher.on('all', async (event, filePath) => {
-    const isAppFile = filePath.includes(appExtensionFile);
-
-    // The app.js file needs to be copied in the .cache/admin/src/app.js and the other ones needs to
-    // be copied in the .cache/admin/src/extensions folder
-    const targetPath = isAppFile
-      ? path.join(path.normalize(filePath.split(appExtensionFile)[1]), targetExtensionFile)
-      : path.join('extensions', path.normalize(filePath.split(extensionsPath)[1]));
-
-    const destFolder = path.join(cacheDir, 'admin', 'src');
-
-    if (event === 'unlink' || event === 'unlinkDir') {
-      // Remove the file or folder
-      // We need to copy the original files when deleting an override one
-      try {
-        fs.removeSync(path.join(destFolder, targetPath));
-      } catch (err) {
-        console.log('An error occured while deleting the file', err);
-      }
-    } else {
-      // In any other case just copy the file into the .cache/admin/src folder
-      try {
-        await fs.copy(filePath, path.join(destFolder, targetPath));
-      } catch (err) {
-        console.log(err);
-      }
-    }
-  });
-}
-
-module.exports = watchAdminFiles;