@strapi/strapi 4.2.0-alpha.O → 4.2.0-beta.2

package/lib/factories.d.ts

@@ -43,6 +43,6 @@ interface Router {
   routes: Route[];
 }
 
-export function createCoreRouter(uid: string, cfg: RouterConfig): () => Router;
-export function createCoreController(uid: string, cfg: ControllerConfig): () => Controller;
-export function createCoreService(uid: string, cfg: ServiceConfig): () => Service;
+export function createCoreRouter(uid: string, cfg?: RouterConfig = {}): () => Router;
+export function createCoreController(uid: string, cfg?: ControllerConfig = {}): () => Controller;
+export function createCoreService(uid: string, cfg?: ServiceConfig = {}): () => Service;

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/load/load-files.js

@@ -3,6 +3,8 @@
 const path = require('path');
 const _ = require('lodash');
 const fse = require('fs-extra');
+
+const { importDefault } = require('../utils');
 const glob = require('./glob');
 const filePathToPath = require('./filepath-to-prop-path');
 
@@ -34,7 +36,7 @@ const loadFiles = async (
     if (path.extname(absolutePath) === '.json') {
       mod = await fse.readJson(absolutePath);
     } else {
-      mod = requireFn(absolutePath);
+      mod = importDefault(requireFn(absolutePath)).default;
     }
 
     Object.defineProperty(mod, '__filename__', {

package/lib/middlewares/favicon.js

@@ -15,5 +15,5 @@ const defaults = {
 module.exports = (config, { strapi }) => {
   const { maxAge, path: faviconPath } = defaultsDeep(defaults, config);
 
-  return favicon(resolve(strapi.dirs.root, faviconPath), { maxAge });
+  return favicon(resolve(strapi.dirs.app.root, faviconPath), { maxAge });
 };

package/lib/middlewares/public/index.js

@@ -71,6 +71,7 @@ module.exports = (config, { strapi }) => {
       {
         method: 'GET',
         path: '/assets/images/(.*)',
+        // Why do we use the __dirname and not strapi.dirs here? @alexandrebodin
         handler: serveStatic(path.resolve(__dirname, 'assets/images'), {
           maxage: maxAge,
           defer: true,
@@ -80,7 +81,7 @@ module.exports = (config, { strapi }) => {
       {
         method: 'GET',
         path: '/(.*)',
-        handler: koaStatic(strapi.dirs.public, {
+        handler: koaStatic(strapi.dirs.static.public, {
           maxage: maxAge,
           defer: true,
         }),

package/lib/middlewares/security.js

@@ -12,7 +12,7 @@ const defaults = {
     useDefaults: true,
     directives: {
       'connect-src': ["'self'", 'https:'],
-      'img-src': ["'self'", 'data:', 'blob:'],
+      'img-src': ["'self'", 'data:', 'blob:', 'https://dl.airtable.com'],
       'media-src': ["'self'", 'data:', 'blob:'],
       upgradeInsecureRequests: null,
     },

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/fs.js

@@ -12,7 +12,7 @@ module.exports = strapi => {
 
     const normalizedPath = path.normalize(filePath).replace(/^\/?(\.\/|\.\.\/)+/, '');
 
-    return path.resolve(strapi.dirs.root, normalizedPath);
+    return path.resolve(strapi.dirs.app.root, normalizedPath);
   }
 
   const strapiFS = {

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'));
@@ -90,7 +96,7 @@ const hashProject = strapi =>
 
 const hashDep = strapi => {
   const depStr = JSON.stringify(strapi.config.info.dependencies);
-  const readmePath = path.join(strapi.dirs.root, 'README.md');
+  const readmePath = path.join(strapi.dirs.app.root, 'README.md');
 
   try {
     if (fs.existsSync(readmePath)) {

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/services/server/middleware.js

@@ -112,7 +112,7 @@ const resolveCustomMiddleware = (resolve, strapi) => {
     modulePath = require.resolve(resolve);
   } catch (error) {
     if (error.code === 'MODULE_NOT_FOUND') {
-      modulePath = path.resolve(strapi.dirs.root, resolve);
+      modulePath = path.resolve(strapi.dirs.dist.root, resolve);
     } else {
       throw error;
     }

package/lib/utils/get-dirs.js

@@ -1,17 +1,31 @@
 'use strict';
 
-const { join } = require('path');
+const { join, resolve } = require('path');
 
-const getDirs = root => ({
-  root,
-  src: join(root, 'src'),
-  api: join(root, 'src', 'api'),
-  components: join(root, 'src', 'components'),
-  extensions: join(root, 'src', 'extensions'),
-  policies: join(root, 'src', 'policies'),
-  middlewares: join(root, 'src', 'middlewares'),
-  config: join(root, 'config'),
-  public: join(root, 'public'),
+const getDirs = ({ app: appDir, dist: distDir }, { strapi }) => ({
+  dist: {
+    root: distDir,
+    src: join(distDir, 'src'),
+    api: join(distDir, 'src', 'api'),
+    components: join(distDir, 'src', 'components'),
+    extensions: join(distDir, 'src', 'extensions'),
+    policies: join(distDir, 'src', 'policies'),
+    middlewares: join(distDir, 'src', 'middlewares'),
+    config: join(distDir, 'config'),
+  },
+  app: {
+    root: appDir,
+    src: join(appDir, 'src'),
+    api: join(appDir, 'src', 'api'),
+    components: join(appDir, 'src', 'components'),
+    extensions: join(appDir, 'src', 'extensions'),
+    policies: join(appDir, 'src', 'policies'),
+    middlewares: join(appDir, 'src', 'middlewares'),
+    config: join(appDir, 'config'),
+  },
+  static: {
+    public: resolve(appDir, strapi.config.get('server.dirs.public')),
+  },
 });
 
 module.exports = getDirs;

package/lib/utils/import-default.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const __importDefault =
+  (this && this.__importDefault) ||
+  function(mod) {
+    return mod && mod.__esModule ? mod : { default: mod };
+  };
+
+module.exports = __importDefault;

package/lib/utils/index.js

@@ -3,9 +3,11 @@
 const openBrowser = require('./open-browser');
 const isInitialized = require('./is-initialized');
 const getDirs = require('./get-dirs');
+const importDefault = require('./import-default');
 
 module.exports = {
   isInitialized,
   openBrowser,
   getDirs,
+  importDefault,
 };

package/lib/utils/update-notifier/index.js

@@ -38,7 +38,7 @@ const createUpdateNotifier = strapi => {
     config = new Configstore(
       pkg.name,
       {},
-      { configPath: path.join(strapi.dirs.root, '.strapi-updater.json') }
+      { configPath: path.join(strapi.dirs.app.root, '.strapi-updater.json') }
     );
   } catch {
     // we don't have write access to the file system

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.2.0-alpha.O",
+  "version": "4.2.0-beta.2",
   "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,16 +80,17 @@
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.2.0-alpha.O",
-    "@strapi/database": "4.2.0-alpha.O",
-    "@strapi/generate-new": "4.2.0-alpha.O",
-    "@strapi/generators": "4.2.0-alpha.O",
-    "@strapi/logger": "4.2.0-alpha.O",
-    "@strapi/plugin-content-manager": "4.2.0-alpha.O",
-    "@strapi/plugin-content-type-builder": "4.2.0-alpha.O",
-    "@strapi/plugin-email": "4.2.0-alpha.O",
-    "@strapi/plugin-upload": "4.2.0-alpha.O",
-    "@strapi/utils": "4.2.0-alpha.O",
+    "@strapi/admin": "4.2.0-beta.2",
+    "@strapi/database": "4.2.0-beta.2",
+    "@strapi/generate-new": "4.2.0-beta.2",
+    "@strapi/generators": "4.2.0-beta.2",
+    "@strapi/logger": "4.2.0-beta.2",
+    "@strapi/plugin-content-manager": "4.2.0-beta.2",
+    "@strapi/plugin-content-type-builder": "4.2.0-beta.2",
+    "@strapi/plugin-email": "4.2.0-beta.2",
+    "@strapi/plugin-upload": "4.2.0-beta.2",
+    "@strapi/typescript-utils": "4.2.0-beta.2",
+    "@strapi/utils": "4.2.0-beta.2",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -130,11 +131,12 @@
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "supertest": "^6.1.6"
+    "supertest": "^6.1.6",
+    "typescript": "4.6.2"
   },
   "engines": {
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "0e1f1ae08565a5f2427753582f37645a43c00cb2"
+  "gitHead": "bff73257e7695d6f361c91dda8cc810a2bb70b6e"
 }