@strapi/strapi 4.2.0-beta.4 → 4.2.0

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

@@ -31,13 +31,12 @@ const defaultConfig = {
   },
 };
 
-module.exports = (dirs, initialConfig = {}) => {
-  const { appDir, distDir } = dirs;
+module.exports = (dir, initialConfig = {}) => {
   const { autoReload = false, serveAdminPanel = true } = initialConfig;
 
-  const pkgJSON = require(path.resolve(appDir, 'package.json'));
+  const pkgJSON = require(path.resolve(dir, 'package.json'));
 
-  const configDir = path.resolve(distDir || process.cwd(), 'config');
+  const configDir = path.resolve(dir || process.cwd(), 'config');
 
   const rootConfig = {
     launchedAt: Date.now(),

package/lib/core/app-configuration/load-config-file.js

@@ -4,11 +4,9 @@ const path = require('path');
 const fs = require('fs');
 const { templateConfiguration, env } = require('@strapi/utils');
 
-const __importDefault = require('../../utils/import-default');
-
 const loadJsFile = file => {
   try {
-    const jsModule = __importDefault(require(file)).default;
+    const jsModule = require(file);
 
     // call if function
     if (typeof jsModule === 'function') {

package/lib/core/bootstrap.js

@@ -25,9 +25,9 @@ module.exports = async function({ strapi }) {
   }
 
   // ensure public repository exists
-  if (!(await fse.pathExists(strapi.dirs.static.public))) {
+  if (!(await fse.pathExists(strapi.dirs.public))) {
     throw new Error(
-      `The public folder (${strapi.dirs.static.public}) doesn't exist or is not accessible. Please make sure it exists.`
+      `The public folder (${strapi.dirs.public}) doesn't exist or is not accessible. Please make sure it exists.`
     );
   }
 };

package/lib/core/loaders/apis.js

@@ -5,7 +5,6 @@ const { existsSync } = require('fs-extra');
 const _ = require('lodash');
 const fse = require('fs-extra');
 const { isKebabCase } = require('@strapi/utils');
-const { importDefault } = require('../../utils');
 
 const DEFAULT_CONTENT_TYPE = {
   schema: {},
@@ -20,11 +19,11 @@ const isDirectory = fd => fd.isDirectory();
 const isDotFile = fd => fd.name.startsWith('.');
 
 module.exports = async strapi => {
-  if (!existsSync(strapi.dirs.dist.api)) {
-    return;
+  if (!existsSync(strapi.dirs.api)) {
+    throw new Error('Missing api folder. Please create one at `./src/api`');
   }
 
-  const apisFDs = await (await fse.readdir(strapi.dirs.dist.api, { withFileTypes: true }))
+  const apisFDs = await (await fse.readdir(strapi.dirs.api, { withFileTypes: true }))
     .filter(isDirectory)
     .filter(_.negate(isDotFile));
 
@@ -33,7 +32,7 @@ module.exports = async strapi => {
   // only load folders
   for (const apiFD of apisFDs) {
     const apiName = normalizeName(apiFD.name);
-    const api = await loadAPI(join(strapi.dirs.dist.api, apiFD.name));
+    const api = await loadAPI(join(strapi.dirs.api, apiFD.name));
 
     apis[apiName] = api;
   }
@@ -155,7 +154,7 @@ const loadFile = file => {
 
   switch (ext) {
     case '.js':
-      return importDefault(require(file)).default;
+      return require(file);
     case '.json':
       return fse.readJSON(file);
     default:

package/lib/core/loaders/components.js

@@ -6,20 +6,19 @@ const { pathExists } = require('fs-extra');
 const loadFiles = require('../../load/load-files');
 
 module.exports = async strapi => {
-  if (!(await pathExists(strapi.dirs.dist.components))) {
+  if (!(await pathExists(strapi.dirs.components))) {
     return {};
   }
 
-  const map = await loadFiles(strapi.dirs.dist.components, '*/*.*(js|json)');
+  const map = await loadFiles(strapi.dirs.components, '*/*.*(js|json)');
 
   return Object.keys(map).reduce((acc, category) => {
     Object.keys(map[category]).forEach(key => {
       const schema = map[category][key];
 
-      if (!schema.collectionName) {
-        // NOTE: We're using the filepath from the app directory instead of the dist for information purpose
-        const filePath = join(strapi.dirs.app.components, category, schema.__filename__);
+      const filePath = join(strapi.dirs.components, category, schema.__filename__);
 
+      if (!schema.collectionName) {
         return strapi.stopWithError(
           `Component ${key} is missing a "collectionName" property.\nVerify file ${filePath}.`
         );

package/lib/core/loaders/middlewares.js

@@ -3,19 +3,17 @@
 const { join, extname, basename } = require('path');
 const fse = require('fs-extra');
 
-const { importDefault } = require('../../utils');
-
 // TODO:: allow folders with index.js inside for bigger policies
 module.exports = async function loadMiddlewares(strapi) {
   const localMiddlewares = await loadLocalMiddlewares(strapi);
-  const internalMiddlewares = importDefault(require('../../middlewares')).default;
+  const internalMiddlewares = require('../../middlewares');
 
   strapi.container.get('middlewares').add(`global::`, localMiddlewares);
   strapi.container.get('middlewares').add(`strapi::`, internalMiddlewares);
 };
 
 const loadLocalMiddlewares = async strapi => {
-  const dir = strapi.dirs.dist.middlewares;
+  const dir = strapi.dirs.middlewares;
 
   if (!(await fse.pathExists(dir))) {
     return {};
@@ -30,7 +28,7 @@ const loadLocalMiddlewares = async strapi => {
 
     if (fd.isFile() && extname(name) === '.js') {
       const key = basename(name, '.js');
-      middlewares[key] = importDefault(require(fullPath)).default;
+      middlewares[key] = require(fullPath);
     }
   }
 

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

@@ -29,11 +29,10 @@ const toDetailedDeclaration = declaration => {
   let detailedDeclaration = pick(['enabled'], declaration);
   if (has('resolve', declaration)) {
     let pathToPlugin = '';
-
     try {
       pathToPlugin = dirname(require.resolve(declaration.resolve));
     } catch (e) {
-      pathToPlugin = resolve(strapi.dirs.app.root, declaration.resolve);
+      pathToPlugin = resolve(strapi.dirs.root, declaration.resolve);
 
       if (!existsSync(pathToPlugin) || !statSync(pathToPlugin).isDirectory()) {
         throw new Error(`${declaration.resolve} couldn't be resolved`);

package/lib/core/loaders/plugins/get-user-plugins-config.js

@@ -12,9 +12,9 @@ const loadConfigFile = require('../../app-configuration/load-config-file');
  * @return {Promise<{}>}
  */
 const getUserPluginsConfig = async () => {
-  const globalUserConfigPath = join(strapi.dirs.dist.config, 'plugins.js');
+  const globalUserConfigPath = join(strapi.dirs.config, 'plugins.js');
   const currentEnvUserConfigPath = join(
-    strapi.dirs.dist.config,
+    strapi.dirs.config,
     'env',
     process.env.NODE_ENV,
     'plugins.js'

package/lib/core/loaders/plugins/index.js

@@ -26,7 +26,7 @@ const defaultPlugin = {
 };
 
 const applyUserExtension = async plugins => {
-  const extensionsDir = strapi.dirs.dist.extensions;
+  const extensionsDir = strapi.dirs.extensions;
   if (!(await fse.pathExists(extensionsDir))) {
     return;
   }

package/lib/core/loaders/policies.js

@@ -3,11 +3,9 @@
 const { join, extname, basename } = require('path');
 const fse = require('fs-extra');
 
-const { importDefault } = require('../../utils');
-
 // TODO:: allow folders with index.js inside for bigger policies
 module.exports = async function loadPolicies(strapi) {
-  const dir = strapi.dirs.dist.policies;
+  const dir = strapi.dirs.policies;
 
   if (!(await fse.pathExists(dir))) {
     return;
@@ -22,7 +20,7 @@ module.exports = async function loadPolicies(strapi) {
 
     if (fd.isFile() && extname(name) === '.js') {
       const key = basename(name, '.js');
-      policies[key] = importDefault(require(fullPath)).default;
+      policies[key] = require(fullPath);
     }
   }
 

package/lib/core/loaders/src-index.js

@@ -4,8 +4,6 @@ const { resolve } = require('path');
 const { statSync, existsSync } = require('fs');
 const { yup } = require('@strapi/utils');
 
-const { importDefault } = require('../../utils');
-
 const srcSchema = yup
   .object()
   .shape({
@@ -20,16 +18,16 @@ const validateSrcIndex = srcIndex => {
 };
 
 module.exports = strapi => {
-  if (!existsSync(strapi.dirs.dist.src)) {
-    return;
+  if (!existsSync(strapi.dirs.src)) {
+    throw new Error('Missing src folder. Please create one at `./src`');
   }
 
-  const pathToSrcIndex = resolve(strapi.dirs.dist.src, 'index.js');
+  const pathToSrcIndex = resolve(strapi.dirs.src, 'index.js');
   if (!existsSync(pathToSrcIndex) || statSync(pathToSrcIndex).isDirectory()) {
     return {};
   }
 
-  const srcIndex = importDefault(require(pathToSrcIndex)).default;
+  const srcIndex = require(pathToSrcIndex);
 
   try {
     validateSrcIndex(srcIndex);

package/lib/core/registries/policies.d.ts

@@ -6,4 +6,4 @@ interface PolicyContext extends BaseContext {
   is(name): boolean;
 }
 
-export type Policy<T=unknown> = (ctx: PolicyContext,cfg:T, { strapi: Strapi }) => boolean | undefined;
+export type Policy = (ctx: PolicyContext, { strapi: Strapi }) => boolean | undefined;

package/lib/core-api/controller/index.d.ts

@@ -1,6 +1,6 @@
 import { Context } from 'koa';
 
-type ControllerResponse <T=unknown> = T | Promise<T>;
+type Response = object;
 
 interface BaseController {
   transformResponse(data: object, meta: object): object;
@@ -9,22 +9,17 @@ interface BaseController {
 }
 
 export interface SingleTypeController extends BaseController {
-  find(ctx: Context): ControllerResponse;
-  update(ctx: Context): ControllerResponse;
-  delete(ctx: Context): ControllerResponse;
+  find(ctx: Context): Promise<Response>;
+  update(ctx: Context): Promise<Response>;
+  delete(ctx: Context): Promise<Response>;
 }
 
 export interface CollectionTypeController extends BaseController {
-  find(ctx: Context): ControllerResponse;
-  findOne(ctx: Context): ControllerResponse
-  create(ctx: Context): ControllerResponse;
-  update(ctx: Context): ControllerResponse;
-  delete(ctx: Context): ControllerResponse;
+  find(ctx: Context): Promise<Response>;
+  findOne(ctx: Context): Promise<Response>;
+  create(ctx: Context): Promise<Response>;
+  update(ctx: Context): Promise<Response>;
+  delete(ctx: Context): Promise<Response>;
 }
 
 export type Controller = SingleTypeController | CollectionTypeController;
-
-export type GenericController = Partial<Controller> & {
-  [method: string | number | symbol]: (ctx: Context) => unknown
-}
-​

package/lib/core-api/service/index.d.ts

@@ -1,22 +1,21 @@
 type Entity = object;
 
 interface BaseService {
-  getFetchParams?(params: object): object;
+  getFetchParams(params: object): object;
 }
 
 export interface SingleTypeService extends BaseService {
-  find?(params: object): Promise<Entity> | Entity;
-  createOrUpdate?(params: object): Promise<Entity> | Entity;
-  delete?(params: object): Promise<Entity> | Entity;
+  find(params: object): Promise<Entity>;
+  createOrUpdate(params: object): Promise<Entity>;
+  delete(params: object): Promise<Entity>;
 }
 
 export interface CollectionTypeService extends BaseService {
-  find?(params: object): Promise<Entity[]> | Entity;
-  findOne?(entityId: string,params: object): Promise<Entity> | Entity;
-  create?(params: object): Promise<Entity> | Entity;
-  update?(entityId: string,params: object): Promise<Entity> | Entity;
-  delete?(entityId: string,params: object): Promise<Entity> | Entity;
+  find(params: object): Promise<Entity[]>;
+  findOne(params: object): Promise<Entity>;
+  create(params: object): Promise<Entity>;
+  update(params: object): Promise<Entity>;
+  delete(params: object): Promise<Entity>;
 }
 
 export type Service = SingleTypeService | CollectionTypeService;
-

package/lib/factories.d.ts

@@ -1,37 +1,36 @@
 import { Service } from './core-api/service';
-import { Controller, GenericController } from './core-api/controller';
+import { Controller } from './core-api/controller';
 import { Middleware } from './middlewares';
 import { Policy } from './core/registries/policies';
-import { Strapi } from '@strapi/strapi'
 
-type ControllerConfig<T extends Controller = Controller> = T;
+type ControllerConfig = Controller;
 
 type ServiceConfig = Service;
 
 type HandlerConfig = {
-  auth?: false | { scope: string[] };
-  policies?: Array<string | Policy>;
-  middlewares?: Array<string | Middleware>;
+  auth: false | { scope: string[] };
+  policies: Array<string | Policy>;
+  middlewares: Array<string | Middleware>;
 };
 
 type SingleTypeRouterConfig = {
-  find?: HandlerConfig;
-  update?: HandlerConfig;
-  delete?: HandlerConfig;
+  find: HandlerConfig;
+  update: HandlerConfig;
+  delete: HandlerConfig;
 };
 
 type CollectionTypeRouterConfig = {
-  find?: HandlerConfig;
-  findOne?: HandlerConfig;
-  create?: HandlerConfig;
-  update?: HandlerConfig;
-  delete?: HandlerConfig;
+  find: HandlerConfig;
+  findOne: HandlerConfig;
+  create: HandlerConfig;
+  update: HandlerConfig;
+  delete: HandlerConfig;
 };
 
 type RouterConfig = {
-  prefix?: string;
+  prefix: string;
   only: string[];
-  except?: string[];
+  except: string[];
   config: SingleTypeRouterConfig | CollectionTypeRouterConfig;
 };
 
@@ -44,9 +43,6 @@ interface Router {
   routes: Route[];
 }
 
-type ControllerCallback <T extends GenericController = GenericController> = (params:{strapi:Strapi}) => T;
-type ServiceCallback <T extends Service = Sevice> = (params:{strapi:Strapi}) => T
-
-export function createCoreRouter(uid: string, cfg?: RouterConfig = {}): () => Router;
-export function createCoreController<T extends GenericController = GenericController>(uid: string, cfg?: ControllerCallback<T> | T = {}): () => T & Controller;
-export function createCoreService<T extends Service = Service>(uid: string, cfg?: ServiceCallback<T> | T = {}): () => T ;
+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

@@ -1,15 +1,14 @@
 import { Database } from '@strapi/database';
 import { EntityService } from './services/entity-service';
+import { Strapi as StrapiClass } from './Strapi';
 
-import * as Core from './types/strapi';
 export * as factories from './factories';
+interface StrapiInterface extends StrapiClass {
+  query: Database['query'];
+  entityService: EntityService;
+}
 
-export type { Core };
-
-// Alias to resolve the Strapi global type easily
-export type Strapi = Core.Strapi;
-
-export interface StrapiInterface extends Core.Strapi {};
+export type Strapi = StrapiInterface;
 
 declare global {
   interface AllTypes {}

package/lib/load/load-files.js

@@ -3,8 +3,6 @@
 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');
 
@@ -36,7 +34,7 @@ const loadFiles = async (
     if (path.extname(absolutePath) === '.json') {
       mod = await fse.readJson(absolutePath);
     } else {
-      mod = importDefault(requireFn(absolutePath)).default;
+      mod = requireFn(absolutePath);
     }
 
     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.app.root, faviconPath), { maxAge });
+  return favicon(resolve(strapi.dirs.root, faviconPath), { maxAge });
 };

package/lib/middlewares/public/index.js

@@ -71,7 +71,6 @@ 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,
@@ -81,7 +80,7 @@ module.exports = (config, { strapi }) => {
       {
         method: 'GET',
         path: '/(.*)',
-        handler: koaStatic(strapi.dirs.static.public, {
+        handler: koaStatic(strapi.dirs.public, {
           maxage: maxAge,
           defer: true,
         }),

package/lib/services/fs.js

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

package/lib/services/metrics/index.js

@@ -33,10 +33,6 @@ const createTelemetryInstance = strapi => {
   const sendEvent = wrapWithRateLimit(sender, { limitedEvents: LIMITED_EVENTS });
 
   return {
-    get isDisabled() {
-      return isDisabled;
-    },
-
     register() {
       if (!isDisabled) {
         const pingCron = scheduleJob('0 0 12 * * *', () => sendEvent('ping'));
@@ -96,7 +92,7 @@ const hashProject = strapi =>
 
 const hashDep = strapi => {
   const depStr = JSON.stringify(strapi.config.info.dependencies);
-  const readmePath = path.join(strapi.dirs.app.root, 'README.md');
+  const readmePath = path.join(strapi.dirs.root, 'README.md');
 
   try {
     if (fs.existsSync(readmePath)) {

package/lib/services/metrics/sender.js

@@ -1,12 +1,10 @@
 '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');
@@ -38,9 +36,6 @@ 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(),
@@ -52,8 +47,6 @@ 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/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.dist.root, resolve);
+      modulePath = path.resolve(strapi.dirs.root, resolve);
     } else {
       throw error;
     }

package/lib/utils/get-dirs.js

@@ -2,30 +2,16 @@
 
 const { join, resolve } = require('path');
 
-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')),
-  },
+const getDirs = (root, { strapi }) => ({
+  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: resolve(root, strapi.config.get('server.dirs.public')),
 });
 
 module.exports = getDirs;

package/lib/utils/index.js

@@ -3,11 +3,9 @@
 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.app.root, '.strapi-updater.json') }
+      { configPath: path.join(strapi.dirs.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-beta.4",
+  "version": "4.2.0",
   "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,16 @@
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.2.0-beta.4",
-    "@strapi/database": "4.2.0-beta.4",
-    "@strapi/generate-new": "4.2.0-beta.4",
-    "@strapi/generators": "4.2.0-beta.4",
-    "@strapi/logger": "4.2.0-beta.4",
-    "@strapi/plugin-content-manager": "4.2.0-beta.4",
-    "@strapi/plugin-content-type-builder": "4.2.0-beta.4",
-    "@strapi/plugin-email": "4.2.0-beta.4",
-    "@strapi/plugin-upload": "4.2.0-beta.4",
-    "@strapi/typescript-utils": "4.2.0-beta.4",
-    "@strapi/utils": "4.2.0-beta.4",
+    "@strapi/admin": "4.2.0",
+    "@strapi/database": "4.2.0",
+    "@strapi/generate-new": "4.2.0",
+    "@strapi/generators": "4.2.0",
+    "@strapi/logger": "4.2.0",
+    "@strapi/plugin-content-manager": "4.2.0",
+    "@strapi/plugin-content-type-builder": "4.2.0",
+    "@strapi/plugin-email": "4.2.0",
+    "@strapi/plugin-upload": "4.2.0",
+    "@strapi/utils": "4.2.0",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -132,12 +131,11 @@
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "supertest": "^6.1.6",
-    "typescript": "4.6.2"
+    "supertest": "^6.1.6"
   },
   "engines": {
     "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "5caff35a30e33b7a660eb946299f9e3d2d35b2b8"
+  "gitHead": "12c8ee3b2d95fe417de4d939db0311a0513bd8da"
 }