mirror of
https://github.com/strapi/strapi.git
synced 2025-12-14 08:44:16 +00:00
Make sure dot env is loaded by core app config and as first require when used
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
This commit is contained in:
parent
cd710d34e0
commit
9f9808dfd0
@ -1,9 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// Dependencies.
|
// required first because it loads env files.
|
||||||
const dotenv = require('dotenv');
|
const loadConfiguration = require('./core/app-configuration');
|
||||||
|
|
||||||
dotenv.config({ path: process.env.ENV_PATH });
|
|
||||||
|
|
||||||
const http = require('http');
|
const http = require('http');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
@ -18,7 +16,6 @@ const { createDatabaseManager } = require('strapi-database');
|
|||||||
|
|
||||||
const utils = require('./utils');
|
const utils = require('./utils');
|
||||||
const loadModules = require('./core/load-modules');
|
const loadModules = require('./core/load-modules');
|
||||||
const loadConfiguration = require('./core/app-configuration');
|
|
||||||
const bootstrap = require('./core/bootstrap');
|
const bootstrap = require('./core/bootstrap');
|
||||||
const initializeMiddlewares = require('./middlewares');
|
const initializeMiddlewares = require('./middlewares');
|
||||||
const initializeHooks = require('./hooks');
|
const initializeHooks = require('./hooks');
|
||||||
@ -36,7 +33,6 @@ const createTelemetry = require('./services/metrics');
|
|||||||
*
|
*
|
||||||
* @constructor
|
* @constructor
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class Strapi {
|
class Strapi {
|
||||||
constructor(opts = {}) {
|
constructor(opts = {}) {
|
||||||
this.reload = this.reload();
|
this.reload = this.reload();
|
||||||
|
|||||||
@ -1,11 +1,14 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
// required first because it loads env files.
|
||||||
|
const loadConfiguration = require('../core/app-configuration');
|
||||||
|
|
||||||
const { green } = require('chalk');
|
const { green } = require('chalk');
|
||||||
|
|
||||||
// eslint-disable-next-line node/no-extraneous-require
|
// eslint-disable-next-line node/no-extraneous-require
|
||||||
const strapiAdmin = require('strapi-admin');
|
const strapiAdmin = require('strapi-admin');
|
||||||
const { getConfigUrls } = require('strapi-utils');
|
const { getConfigUrls } = require('strapi-utils');
|
||||||
|
|
||||||
const loadConfiguration = require('../core/app-configuration');
|
|
||||||
const addSlash = require('../utils/addSlash');
|
const addSlash = require('../utils/addSlash');
|
||||||
/**
|
/**
|
||||||
* `$ strapi build`
|
* `$ strapi build`
|
||||||
|
|||||||
@ -1,5 +1,8 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
// required first because it loads env files.
|
||||||
|
const loadConfiguration = require('../core/app-configuration');
|
||||||
|
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const cluster = require('cluster');
|
const cluster = require('cluster');
|
||||||
const fs = require('fs-extra');
|
const fs = require('fs-extra');
|
||||||
@ -7,7 +10,6 @@ const chokidar = require('chokidar');
|
|||||||
const execa = require('execa');
|
const execa = require('execa');
|
||||||
|
|
||||||
const { logger } = require('strapi-utils');
|
const { logger } = require('strapi-utils');
|
||||||
const loadConfiguration = require('../core/app-configuration');
|
|
||||||
const strapi = require('../index');
|
const strapi = require('../index');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -1,8 +1,12 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
// required first because it loads env files.
|
||||||
|
const loadConfiguration = require('../core/app-configuration');
|
||||||
|
|
||||||
// eslint-disable-next-line node/no-extraneous-require
|
// eslint-disable-next-line node/no-extraneous-require
|
||||||
const strapiAdmin = require('strapi-admin');
|
const strapiAdmin = require('strapi-admin');
|
||||||
const { getConfigUrls, getAbsoluteServerUrl } = require('strapi-utils');
|
const { getConfigUrls, getAbsoluteServerUrl } = require('strapi-utils');
|
||||||
|
|
||||||
const loadConfiguration = require('../core/app-configuration');
|
|
||||||
const addSlash = require('../utils/addSlash');
|
const addSlash = require('../utils/addSlash');
|
||||||
|
|
||||||
module.exports = async function() {
|
module.exports = async function() {
|
||||||
|
|||||||
@ -1,5 +1,8 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
const dotenv = require('dotenv');
|
||||||
|
dotenv.config({ path: process.env.ENV_PATH });
|
||||||
|
|
||||||
process.env.NODE_ENV = process.env.NODE_ENV || 'development';
|
process.env.NODE_ENV = process.env.NODE_ENV || 'development';
|
||||||
|
|
||||||
const os = require('os');
|
const os = require('os');
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user