mirror of
https://github.com/strapi/strapi.git
synced 2025-11-18 19:22:05 +00:00
Merge pull request #2279 from strapi/enhancement/auto-open
Auto open admin first start
This commit is contained in:
commit
391f5b31ae
3
packages/strapi-generate-new/files/config/.init.json
Normal file
3
packages/strapi-generate-new/files/config/.init.json
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"init": true
|
||||
}
|
||||
@ -11,6 +11,6 @@
|
||||
"enabled": false
|
||||
},
|
||||
"admin": {
|
||||
"autoOpen": true
|
||||
"autoOpen": false
|
||||
}
|
||||
}
|
||||
|
||||
@ -110,6 +110,8 @@ class Strapi extends EventEmitter {
|
||||
await this.freeze();
|
||||
// Update source admin.
|
||||
await admin.call(this);
|
||||
// Init first start
|
||||
utils.init.call(this);
|
||||
// Launch server.
|
||||
this.server.listen(this.config.port, async (err) => {
|
||||
if (err) {
|
||||
@ -136,7 +138,7 @@ class Strapi extends EventEmitter {
|
||||
cb();
|
||||
}
|
||||
|
||||
if (this.config.environment === 'development' && get(this.config.currentEnvironment, 'server.admin.autoOpen', true) !== false) {
|
||||
if (this.config.environment === 'development' && get(this.config.currentEnvironment, 'server.admin.autoOpen', true) !== false || this.config.init) {
|
||||
await utils.openBrowser.call(this);
|
||||
}
|
||||
});
|
||||
|
||||
@ -13,7 +13,8 @@ module.exports.nested = function() {
|
||||
// Load root configurations.
|
||||
new Promise((resolve, reject) => {
|
||||
glob('./config/**/*.*(js|json)', {
|
||||
cwd: this.config.appPath
|
||||
cwd: this.config.appPath,
|
||||
dot: true
|
||||
}, (err, files) => {
|
||||
if (err) {
|
||||
return reject(err);
|
||||
|
||||
@ -17,6 +17,12 @@ const exposer = require('./exposer');
|
||||
const openBrowser = require('./openBrowser');
|
||||
|
||||
module.exports = {
|
||||
init: function() {
|
||||
if (this.config.init) {
|
||||
fs.unlinkSync(path.resolve(this.config.appPath, 'config', '.init.json'));
|
||||
}
|
||||
},
|
||||
|
||||
loadFile: function(url) {
|
||||
// Clear cache.
|
||||
delete require.cache[require.resolve(path.resolve(this.config.appPath, url))];
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user