@strapi/strapi 4.2.0-beta.1 → 4.2.0-beta.2

package/bin/strapi.js

@@ -95,6 +95,7 @@ program
   .option('--dbssl <dbssl>', 'Database SSL')
   .option('--dbfile <dbfile>', 'Database file path for sqlite')
   .option('--dbforce', 'Allow overwriting existing database content')
+  .option('-ts, --typescript', 'Create a typescript project')
   .description('Create a new application')
   .action(require('../lib/commands/new'));
 

package/lib/commands/admin-create.js

@@ -1,8 +1,10 @@
 'use strict';
 
+const path = require('path');
 const { yup } = require('@strapi/utils');
 const _ = require('lodash');
 const inquirer = require('inquirer');
+const tsUtils = require('@strapi/typescript-utils');
 const strapi = require('../index');
 
 const emailValidator = yup
@@ -90,7 +92,12 @@ module.exports = async function(cmdOptions = {}) {
 };
 
 async function createAdmin({ email, password, firstname, lastname }) {
-  const app = await strapi().load();
+  const appDir = process.cwd();
+
+  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
+  const distDir = isTSProject ? path.join(appDir, 'dist') : appDir;
+
+  const app = await strapi({ appDir, distDir }).load();
 
   const user = await app.admin.services.user.exists({ email });
 

package/lib/commands/admin-reset.js

@@ -1,7 +1,9 @@
 'use strict';
 
+const path = require('path');
 const _ = require('lodash');
 const inquirer = require('inquirer');
+const tsUtils = require('@strapi/typescript-utils');
 const strapi = require('../index');
 
 const promptQuestions = [
@@ -42,7 +44,12 @@ module.exports = async function(cmdOptions = {}) {
 };
 
 async function changePassword({ email, password }) {
-  const app = await strapi().load();
+  const appDir = process.cwd();
+
+  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
+  const distDir = isTSProject ? path.join(appDir, 'dist') : appDir;
+
+  const app = await strapi({ appDir, distDir }).load();
 
   await app.admin.services.user.resetPasswordByEmail(email, password);
 

package/lib/commands/configurationDump.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const fs = require('fs');
+const path = require('path');
+const tsUtils = require('@strapi/typescript-utils');
 const strapi = require('../index');
 
 const CHUNK_SIZE = 100;
@@ -12,7 +14,12 @@ const CHUNK_SIZE = 100;
 module.exports = async function({ file: filePath, pretty }) {
   const output = filePath ? fs.createWriteStream(filePath) : process.stdout;
 
-  const app = await strapi().load();
+  const appDir = process.cwd();
+
+  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
+  const distDir = isTSProject ? path.join(appDir, 'dist') : appDir;
+
+  const app = await strapi({ appDir, distDir }).load();
 
   const count = await app.query('strapi::core-store').count();
 

package/lib/commands/configurationRestore.js

@@ -1,7 +1,10 @@
 'use strict';
 
 const fs = require('fs');
+const path = require('path');
 const _ = require('lodash');
+const tsUtils = require('@strapi/typescript-utils');
+
 const strapi = require('../index');
 
 /**
@@ -12,7 +15,12 @@ const strapi = require('../index');
 module.exports = async function({ file: filePath, strategy = 'replace' }) {
   const input = filePath ? fs.readFileSync(filePath) : await readStdin(process.stdin);
 
-  const app = await strapi().load();
+  const appDir = process.cwd();
+
+  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
+  const distDir = isTSProject ? path.join(appDir, 'dist') : appDir;
+
+  const app = await strapi({ appDir, distDir }).load();
 
   let dataToImport;
   try {

package/lib/commands/console.js

@@ -1,14 +1,22 @@
 'use strict';
 
 const REPL = require('repl');
+const path = require('path');
+const tsUtils = require('@strapi/typescript-utils');
+
 const strapi = require('../index');
 
 /**
  * `$ strapi console`
  */
-module.exports = () => {
+module.exports = async () => {
   // Now load up the Strapi framework for real.
-  const app = strapi();
+  const appDir = process.cwd();
+
+  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
+  const distDir = isTSProject ? path.join(appDir, 'dist') : appDir;
+
+  const app = await strapi({ appDir, distDir }).load();
 
   app.start().then(() => {
     const repl = REPL.start(app.config.info.name + ' > ' || 'strapi > '); // eslint-disable-line prefer-template

package/lib/commands/routes/list.js

@@ -1,13 +1,20 @@
 'use strict';
 
+const path = require('path');
 const CLITable = require('cli-table3');
 const chalk = require('chalk');
 const { toUpper } = require('lodash/fp');
+const tsUtils = require('@strapi/typescript-utils');
 
 const strapi = require('../../index');
 
 module.exports = async function() {
-  const app = await strapi().load();
+  const appDir = process.cwd();
+
+  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
+  const distDir = isTSProject ? path.join(appDir, 'dist') : appDir;
+
+  const app = await strapi({ appDir, distDir }).load();
 
   const list = app.server.listRoutes();
 

package/lib/commands/start.js

@@ -1,8 +1,14 @@
 'use strict';
-
+const tsUtils = require('@strapi/typescript-utils')
 const strapi = require('../index');
 
 /**
  * `$ strapi start`
  */
-module.exports = distDir => strapi({ distDir }).start();
+module.exports = async specifiedDir => {
+    const appDir = process.cwd();
+    const isTSProject = await tsUtils.isUsingTypeScript(appDir)
+    const distDir = isTSProject && !specifiedDir ? 'dist' : specifiedDir;
+
+    strapi({ distDir }).start()
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.2.0-beta.1",
+  "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,17 +80,17 @@
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@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",
+    "@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",
@@ -138,5 +138,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "4fa2804f35e15ed72dfd309fb5bb1c4dba18932f"
+  "gitHead": "bff73257e7695d6f361c91dda8cc810a2bb70b6e"
 }