@strapi/strapi 4.2.0-alpha.9 → 4.2.0-beta.1

package/README.md

@@ -114,8 +114,7 @@ For general help using Strapi, please refer to [the official Strapi documentatio
 - [Discord](https://discord.strapi.io) (For live discussion with the Community and Strapi team)
 - [GitHub](https://github.com/strapi/strapi) (Bug reports, Contributions)
 - [Community Forum](https://forum.strapi.io) (Questions and Discussions)
-- [Academy](https://academy.strapi.io) (Learn the fundamentals of Strapi)
-- [ProductBoard](https://portal.productboard.com/strapi/tabs/2-under-consideration) (Roadmap, Feature requests)
+- [Roadmap & Feature Requests](https://feedback.strapi.io/)
 - [Twitter](https://twitter.com/strapijs) (Get the news fast)
 - [Facebook](https://www.facebook.com/Strapi-616063331867161)
 - [YouTube Channel](https://www.youtube.com/strapi) (Learn from Video Tutorials)
@@ -126,7 +125,7 @@ Follow our [migration guides](https://docs.strapi.io/developer-docs/latest/updat
 
 ## Roadmap
 
-Check out our [roadmap](https://portal.productboard.com/strapi) to get informed of the latest features released and the upcoming ones. You may also give us insights and vote for a specific feature.
+Check out our [roadmap](https://feedback.strapi.io/) to get informed of the latest features released and the upcoming ones. You may also give us insights and vote for a specific feature.
 
 ## Documentation
 

package/bin/strapi.js

@@ -227,4 +227,10 @@ program
   .description('List all the application controllers')
   .action(getLocalScript('controllers/list'));
 
+//    `$ strapi opt-out-telemetry`
+program
+  .command('telemetry:disable')
+  .description('Stop Strapi from sending anonymous telemetry and metadata')
+  .action(getLocalScript('opt-out-telemetry'));
+
 program.parseAsync(process.argv);

package/lib/Strapi.js

@@ -65,18 +65,17 @@ const resolveWorkingDirectories = opts => {
   const appDir = opts.appDir ? path.resolve(cwd, opts.appDir) : cwd;
   const distDir = opts.distDir ? path.resolve(cwd, opts.distDir) : appDir;
 
-  return { appDir, distDir };
+  return { app: appDir, dist: distDir };
 };
 
 class Strapi {
   constructor(opts = {}) {
     destroyOnSignal(this);
 
-    // Create a mapping of every useful directory (both for the app and dist directories)
-    this.dirs = utils.getDirs(resolveWorkingDirectories(opts));
+    const rootDirs = resolveWorkingDirectories(opts);
 
     // Load the app configuration from the dist directory
-    const appConfig = loadConfiguration(this.dirs.dist.root, opts);
+    const appConfig = loadConfiguration({ appDir: rootDirs.app, distDir: rootDirs.dist }, opts);
 
     // Instanciate the Strapi container
     this.container = createContainer(this);
@@ -94,6 +93,9 @@ class Strapi {
     this.container.register('apis', apisRegistry(this));
     this.container.register('auth', createAuth(this));
 
+    // Create a mapping of every useful directory (for the app, dist and static directories)
+    this.dirs = utils.getDirs(rootDirs, { strapi: this });
+
     // Strapi state management variables
     this.isLoaded = false;
     this.reload = this.reload();

package/lib/commands/build.js

@@ -11,10 +11,10 @@ module.exports = async ({ optimization, forceBuild = true }) => {
   let buildDestDir = process.cwd();
   const srcDir = process.cwd();
 
-  const isTSProject = await tsUtils.isTypeScriptProject(srcDir);
+  const useTypeScriptServer = await tsUtils.isUsingTypeScript(srcDir);
 
   // Typescript
-  if (isTSProject) {
+  if (useTypeScriptServer) {
     await buildTypeScript({ srcDir, watch: false });
 
     // Update the dir path for the next steps
@@ -24,7 +24,6 @@ module.exports = async ({ optimization, forceBuild = true }) => {
   await buildAdmin({
     buildDestDir,
     forceBuild,
-    isTSProject,
     optimization,
     srcDir,
   });

package/lib/commands/builders/admin.js

@@ -10,10 +10,12 @@ const addSlash = require('../../utils/addSlash');
 const strapi = require('../../index');
 const getEnabledPlugins = require('../../core/loaders/plugins/get-enabled-plugins');
 
-module.exports = async ({ buildDestDir, forceBuild = true, isTSProject, optimization, srcDir }) => {
+module.exports = async ({ buildDestDir, forceBuild = true, optimization, srcDir }) => {
   const strapiInstance = strapi({
-    // TODO check if this is working @convly
+    // Directories
+    appDir: srcDir,
     distDir: buildDestDir,
+    // Options
     autoReload: true,
     serveAdminPanel: false,
   });
@@ -46,7 +48,6 @@ module.exports = async ({ buildDestDir, forceBuild = true, isTSProject, optimiza
         backend: serverUrl,
         adminPath: addSlash(adminPath),
       },
-      useTypeScript: isTSProject,
     })
     .then(() => {
       console.log('Admin UI built successfully');

package/lib/commands/builders/typescript.js

@@ -5,8 +5,8 @@ const fs = require('fs-extra');
 const tsUtils = require('@strapi/typescript-utils');
 
 const cleanupDistDirectory = async distDir => {
-  if (!await fs.pathExists(distDir)){
-    return 
+  if (!(await fs.pathExists(distDir))) {
+    return;
   }
 
   const dirContent = await fs.readdir(distDir);
@@ -14,21 +14,18 @@ const cleanupDistDirectory = async distDir => {
     // Ignore the admin build folder
     .filter(filename => filename !== 'build');
 
-
   for (const filename of validFilenames) {
     await fs.remove(path.resolve(distDir, filename));
   }
 };
 
 module.exports = async ({ srcDir, distDir, watch = false }) => {
-  const isTSProject = await tsUtils.isTypeScriptProject(srcDir);
+  const isTSProject = await tsUtils.isUsingTypeScript(srcDir);
 
   if (!isTSProject) {
     throw new Error(`tsconfig file not found in ${srcDir}`);
   }
 
-  
-
   await cleanupDistDirectory(distDir);
 
   return tsUtils.compile(srcDir, { watch });

package/lib/commands/develop.js

@@ -6,6 +6,7 @@ const fs = require('fs-extra');
 const chokidar = require('chokidar');
 const execa = require('execa');
 const { getOr } = require('lodash/fp');
+const { joinBy } = require('@strapi/utils');
 const tsUtils = require('@strapi/typescript-utils');
 
 const loadConfiguration = require('../core/app-configuration');
@@ -20,7 +21,7 @@ const { buildTypeScript, buildAdmin } = require('./builders');
 module.exports = async function({ build, watchAdmin, polling, browser }) {
   const appDir = process.cwd();
 
-  const isTSProject = await tsUtils.isTypeScriptProject(appDir);
+  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
   const distDir = isTSProject ? path.join(appDir, 'dist') : appDir;
 
   try {
@@ -49,7 +50,7 @@ const primaryProcess = async ({ distDir, appDir, build, isTSProject, watchAdmin,
     await buildTypeScript({ srcDir: appDir, distDir, watch: false });
   }
 
-  const config = loadConfiguration(distDir);
+  const config = loadConfiguration({ appDir, distDir });
   const serveAdminPanel = getOr(true, 'admin.serveAdminPanel')(config);
 
   const buildExists = fs.existsSync(path.join(distDir, 'build'));
@@ -60,7 +61,6 @@ const primaryProcess = async ({ distDir, appDir, build, isTSProject, watchAdmin,
       await buildAdmin({
         buildDestDir: distDir,
         forceBuild: false,
-        isTSProject,
         optimization: false,
         srcDir: appDir,
       });
@@ -157,6 +157,9 @@ function watchFileChanges({ appDir, strapiInstance, watchIgnoreFiles, polling })
       /tmp/,
       '**/src/admin/**',
       '**/src/plugins/**/admin/**',
+      // FIXME pass the plugin path to the strapiAdmin.build and strapiAdmin.watch in order to stop copying
+      // the FE files when using TS
+      '**/dist/src/plugins/test/admin/**',
       '**/documentation',
       '**/documentation/**',
       '**/node_modules',
@@ -167,6 +170,8 @@ function watchFileChanges({ appDir, strapiInstance, watchIgnoreFiles, polling })
       '**/index.html',
       '**/public',
       '**/public/**',
+      strapiInstance.dirs.static.public,
+      joinBy('/', strapiInstance.dirs.static.public, '**'),
       '**/*.db*',
       '**/exports/**',
       '**/dist/**',

package/lib/commands/opt-out-telemetry.js

@@ -0,0 +1,83 @@
+'use strict';
+
+const { resolve } = require('path');
+const fse = require('fs-extra');
+const chalk = require('chalk');
+const fetch = require('node-fetch');
+const machineID = require('../utils/machine-id');
+
+const readPackageJSON = async path => {
+  try {
+    const packageObj = await fse.readJson(path);
+    const uuid = packageObj.strapi ? packageObj.strapi.uuid : null;
+
+    return { uuid, packageObj };
+  } catch (err) {
+    console.error(`${chalk.red('Error')}: ${err.message}`);
+  }
+};
+
+const writePackageJSON = async (path, file, spacing) => {
+  try {
+    await fse.writeJson(path, file, { spaces: spacing });
+    return true;
+  } catch (err) {
+    console.error(`${chalk.red('Error')}: ${err.message}`);
+  }
+};
+
+const sendEvent = async uuid => {
+  try {
+    await fetch('https://analytics.strapi.io/track', {
+      method: 'POST',
+      body: JSON.stringify({
+        event: 'didOptOutTelemetry',
+        uuid,
+        deviceId: machineID(),
+      }),
+      headers: { 'Content-Type': 'application/json' },
+    });
+  } catch (e) {
+    //...
+  }
+};
+
+module.exports = async function optOutTelemetry() {
+  const packageJSONPath = resolve(process.cwd(), 'package.json');
+  const exists = await fse.pathExists(packageJSONPath);
+
+  if (!exists) {
+    console.log(`${chalk.yellow('Warning')}: could not find package.json`);
+    process.exit(0);
+  }
+
+  const { uuid, packageObj } = await readPackageJSON(packageJSONPath);
+
+  if ((packageObj.strapi && packageObj.strapi.telemetryDisabled) || !uuid) {
+    console.log(`${chalk.yellow('Warning:')} telemetry is already disabled`);
+    process.exit(0);
+  }
+
+  const updatedPackageJSON = {
+    ...packageObj,
+    strapi: {
+      ...packageObj.strapi,
+      telemetryDisabled: true,
+    },
+  };
+
+  const write = await writePackageJSON(packageJSONPath, updatedPackageJSON, 2);
+
+  if (!write) {
+    console.log(
+      `${chalk.yellow(
+        'Warning'
+      )}: There has been an error, please set "telemetryDisabled": true in the "strapi" object of your package.json manually.`
+    );
+    process.exit(0);
+  }
+
+  await sendEvent(uuid);
+  console.log(`${chalk.green('Successfully opted out of Strapi telemetry')}`);
+  process.exit(0);
+};

package/lib/commands/watchAdmin.js

@@ -12,7 +12,7 @@ const strapi = require('../index');
 module.exports = async function({ browser }) {
   const currentDirectory = process.cwd();
 
-  const isTSProject = await tsUtils.isTypeScriptProject(currentDirectory);
+  const isTSProject = await tsUtils.isUsingTypeScript(currentDirectory);
   const buildDestDir = isTSProject ? path.join(currentDirectory, 'dist') : currentDirectory;
 
   const strapiInstance = strapi({
@@ -41,6 +41,5 @@ module.exports = async function({ browser }) {
       backend: backendURL,
       adminPath: addSlash(adminPath),
     },
-    useTypeScript: isTSProject,
   });
 };

package/lib/core/app-configuration/index.js

@@ -21,6 +21,7 @@ const defaultConfig = {
     proxy: false,
     cron: { enabled: false },
     admin: { autoOpen: false },
+    dirs: { public: './public' },
   },
   admin: {},
   api: {
@@ -30,12 +31,13 @@ const defaultConfig = {
   },
 };
 
-module.exports = (dir, initialConfig = {}) => {
+module.exports = (dirs, initialConfig = {}) => {
+  const { appDir, distDir } = dirs;
   const { autoReload = false, serveAdminPanel = true } = initialConfig;
 
-  const pkgJSON = require(path.resolve(dir, 'package.json'));
+  const pkgJSON = require(path.resolve(appDir, 'package.json'));
 
-  const configDir = path.resolve(dir || process.cwd(), 'config');
+  const configDir = path.resolve(distDir || process.cwd(), 'config');
 
   const rootConfig = {
     launchedAt: Date.now(),

package/lib/core/bootstrap.js

@@ -1,8 +1,9 @@
 'use strict';
 
 const { getConfigUrls } = require('@strapi/utils');
+const fse = require('fs-extra');
 
-module.exports = function({ strapi }) {
+module.exports = async function({ strapi }) {
   strapi.config.port = strapi.config.get('server.port') || strapi.config.port;
   strapi.config.host = strapi.config.get('server.host') || strapi.config.host;
 
@@ -22,4 +23,11 @@ module.exports = function({ strapi }) {
   if (!shouldServeAdmin) {
     strapi.config.serveAdminPanel = false;
   }
+
+  // ensure public repository exists
+  if (!(await fse.pathExists(strapi.dirs.static.public))) {
+    throw new Error(
+      `The public folder (${strapi.dirs.static.public}) doesn't exist or is not accessible. Please make sure it exists.`
+    );
+  }
 };

package/lib/core/loaders/plugins/get-enabled-plugins.js

@@ -29,15 +29,11 @@ const toDetailedDeclaration = declaration => {
   let detailedDeclaration = pick(['enabled'], declaration);
   if (has('resolve', declaration)) {
     let pathToPlugin = '';
-    let appPathToPlugin = '';
 
     try {
       pathToPlugin = dirname(require.resolve(declaration.resolve));
-      appPathToPlugin = pathToPlugin;
     } catch (e) {
-      // FIXME: It'll break for resolve paths that are located outside the project files
-      pathToPlugin = resolve(strapi.dirs.dist.root, declaration.resolve);
-      appPathToPlugin = resolve(strapi.dirs.app.root, declaration.resolve);
+      pathToPlugin = resolve(strapi.dirs.app.root, declaration.resolve);
 
       if (!existsSync(pathToPlugin) || !statSync(pathToPlugin).isDirectory()) {
         throw new Error(`${declaration.resolve} couldn't be resolved`);
@@ -45,7 +41,6 @@ const toDetailedDeclaration = declaration => {
     }
 
     detailedDeclaration.pathToPlugin = pathToPlugin;
-    detailedDeclaration.appPathToPlugin = appPathToPlugin;
   }
   return detailedDeclaration;
 };

package/lib/index.d.ts

@@ -3,7 +3,7 @@ import { EntityService } from './services/entity-service';
 import { Strapi as StrapiClass } from './Strapi';
 
 export * as factories from './factories';
-interface StrapiInterface extends StrapiClass {
+export interface StrapiInterface extends StrapiClass {
   query: Database['query'];
   entityService: EntityService;
 }

package/lib/middlewares/public/index.js

@@ -81,7 +81,7 @@ module.exports = (config, { strapi }) => {
       {
         method: 'GET',
         path: '/(.*)',
-        handler: koaStatic(strapi.dirs.app.public, {
+        handler: koaStatic(strapi.dirs.static.public, {
           maxage: maxAge,
           defer: true,
         }),

package/lib/middlewares/session.js

@@ -19,7 +19,9 @@ const defaultConfig = {
 module.exports = (userConfig, { strapi }) => {
   const keys = strapi.server.app.keys;
   if (!isArray(keys) || isEmpty(keys) || keys.some(isEmpty)) {
-    throw new Error(`App keys are required. Please set app.keys in config/server.js (ex: keys: ['myKeyA', 'myKeyB'])`);
+    throw new Error(
+      `App keys are required. Please set app.keys in config/server.js (ex: keys: ['myKeyA', 'myKeyB'])`
+    );
   }
 
   const config = defaultsDeep(defaultConfig, userConfig);

package/lib/services/metrics/index.js

@@ -24,13 +24,19 @@ const LIMITED_EVENTS = [
 
 const createTelemetryInstance = strapi => {
   const uuid = strapi.config.get('uuid');
-  const isDisabled = !uuid || isTruthy(process.env.STRAPI_TELEMETRY_DISABLED);
+  const telemetryDisabled = strapi.config.get('packageJsonStrapi.telemetryDisabled');
+  const isDisabled =
+    !uuid || isTruthy(process.env.STRAPI_TELEMETRY_DISABLED) || isTruthy(telemetryDisabled);
 
   const crons = [];
   const sender = createSender(strapi);
   const sendEvent = wrapWithRateLimit(sender, { limitedEvents: LIMITED_EVENTS });
 
   return {
+    get isDisabled() {
+      return isDisabled;
+    },
+
     register() {
       if (!isDisabled) {
         const pingCron = scheduleJob('0 0 12 * * *', () => sendEvent('ping'));

package/lib/services/metrics/sender.js

@@ -1,10 +1,12 @@
 'use strict';
 
 const os = require('os');
+const path = require('path');
 const _ = require('lodash');
 const isDocker = require('is-docker');
 const fetch = require('node-fetch');
 const ciEnv = require('ci-info');
+const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
 const ee = require('../../utils/ee');
 const machineID = require('../../utils/machine-id');
 const stringifyDeep = require('./stringify-deep');
@@ -36,6 +38,9 @@ module.exports = strapi => {
   const deviceId = machineID();
   const isEE = strapi.EE === true && ee.isEE === true;
 
+  const serverRootPath = strapi.dirs.app.root;
+  const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');
+
   const anonymous_metadata = {
     environment: strapi.config.environment,
     os: os.type(),
@@ -47,6 +52,8 @@ module.exports = strapi => {
     version: strapi.config.get('info.strapi'),
     strapiVersion: strapi.config.get('info.strapi'),
     projectType: isEE ? 'Enterprise' : 'Community',
+    useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath),
+    useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),
   };
 
   addPackageJsonStrapiMetadata(anonymous_metadata, strapi);

package/lib/services/server/index.js

@@ -30,7 +30,7 @@ const healthCheck = async ctx => {
 const createServer = strapi => {
   const app = createKoaApp({
     proxy: strapi.config.get('server.proxy'),
-    keys:  strapi.config.get('server.app.keys'),
+    keys: strapi.config.get('server.app.keys'),
   });
 
   const router = new Router();

package/lib/utils/get-dirs.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { join } = require('path');
+const { join, resolve } = require('path');
 
-const getDirs = ({ appDir, distDir }) => ({
+const getDirs = ({ app: appDir, dist: distDir }, { strapi }) => ({
   dist: {
     root: distDir,
     src: join(distDir, 'src'),
@@ -12,7 +12,6 @@ const getDirs = ({ appDir, distDir }) => ({
     policies: join(distDir, 'src', 'policies'),
     middlewares: join(distDir, 'src', 'middlewares'),
     config: join(distDir, 'config'),
-    public: join(distDir, 'public'),
   },
   app: {
     root: appDir,
@@ -23,7 +22,9 @@ const getDirs = ({ appDir, distDir }) => ({
     policies: join(appDir, 'src', 'policies'),
     middlewares: join(appDir, 'src', 'middlewares'),
     config: join(appDir, 'config'),
-    public: join(appDir, 'public'),
+  },
+  static: {
+    public: resolve(appDir, strapi.config.get('server.dirs.public')),
   },
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.2.0-alpha.9",
+  "version": "4.2.0-beta.1",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -80,17 +80,17 @@
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.2.0-alpha.9",
-    "@strapi/database": "4.2.0-alpha.9",
-    "@strapi/generate-new": "4.2.0-alpha.9",
-    "@strapi/generators": "4.2.0-alpha.9",
-    "@strapi/logger": "4.2.0-alpha.9",
-    "@strapi/plugin-content-manager": "4.2.0-alpha.9",
-    "@strapi/plugin-content-type-builder": "4.2.0-alpha.9",
-    "@strapi/plugin-email": "4.2.0-alpha.9",
-    "@strapi/plugin-upload": "4.2.0-alpha.9",
-    "@strapi/typescript-utils": "4.2.0-alpha.9",
-    "@strapi/utils": "4.2.0-alpha.9",
+    "@strapi/admin": "4.2.0-beta.1",
+    "@strapi/database": "4.2.0-beta.1",
+    "@strapi/generate-new": "4.2.0-beta.1",
+    "@strapi/generators": "4.2.0-beta.1",
+    "@strapi/logger": "4.2.0-beta.1",
+    "@strapi/plugin-content-manager": "4.2.0-beta.1",
+    "@strapi/plugin-content-type-builder": "4.2.0-beta.1",
+    "@strapi/plugin-email": "4.2.0-beta.1",
+    "@strapi/plugin-upload": "4.2.0-beta.1",
+    "@strapi/typescript-utils": "4.2.0-beta.1",
+    "@strapi/utils": "4.2.0-beta.1",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -138,5 +138,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "db70f0de7cc73fb469c8a076b89530729cf14142"
+  "gitHead": "4fa2804f35e15ed72dfd309fb5bb1c4dba18932f"
 }