yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-09 14:03:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure dot env is loaded by core app config and as first require when used

Browse Source 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
This commit is contained in:
Alexandre Bodin 2020-07-18 09:47:37 +02:00
parent cd710d34e0
commit 9f9808dfd0
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/strapi/lib/Strapi.js
View File

@ -1,9 +1,7 @@
'use strict';
// Dependencies.
const dotenv = require('dotenv');
dotenv.config({ path: process.env.ENV_PATH });
// required first because it loads env files.
const loadConfiguration = require('./core/app-configuration');
const http = require('http');
const path = require('path');
@ -18,7 +16,6 @@ const { createDatabaseManager } = require('strapi-database');
const utils = require('./utils');
const loadModules = require('./core/load-modules');
const loadConfiguration = require('./core/app-configuration');
const bootstrap = require('./core/bootstrap');
const initializeMiddlewares = require('./middlewares');
const initializeHooks = require('./hooks');
@ -36,7 +33,6 @@ const createTelemetry = require('./services/metrics');
*
* @constructor
*/
class Strapi {
constructor(opts = {}) {
this.reload = this.reload();

5
packages/strapi/lib/commands/build.js
View File

@ -1,11 +1,14 @@
'use strict';
// required first because it loads env files.
const loadConfiguration = require('../core/app-configuration');
const { green } = require('chalk');
// eslint-disable-next-line node/no-extraneous-require
const strapiAdmin = require('strapi-admin');
const { getConfigUrls } = require('strapi-utils');
const loadConfiguration = require('../core/app-configuration');
const addSlash = require('../utils/addSlash');
/**
* `$ strapi build`

4
packages/strapi/lib/commands/develop.js
View File

@ -1,5 +1,8 @@
'use strict';
// required first because it loads env files.
const loadConfiguration = require('../core/app-configuration');
const path = require('path');
const cluster = require('cluster');
const fs = require('fs-extra');
@ -7,7 +10,6 @@ const chokidar = require('chokidar');
const execa = require('execa');
const { logger } = require('strapi-utils');
const loadConfiguration = require('../core/app-configuration');
const strapi = require('../index');
/**

6
packages/strapi/lib/commands/watchAdmin.js
View File

@ -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
const strapiAdmin = require('strapi-admin');
const { getConfigUrls, getAbsoluteServerUrl } = require('strapi-utils');
const loadConfiguration = require('../core/app-configuration');
const addSlash = require('../utils/addSlash');
module.exports = async function() {

3
packages/strapi/lib/core/app-configuration/index.js
View File

@ -1,5 +1,8 @@
'use strict';
const dotenv = require('dotenv');
dotenv.config({ path: process.env.ENV_PATH });
process.env.NODE_ENV = process.env.NODE_ENV || 'development';
const os = require('os');