Merge branch 'develop' into stable

HashBrownCMS · Jan 23, 2020 · f181fa3 · f181fa3
2 parents 8e6231a + 7515138
commit f181fa3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hashbrown-cms",
   "repository": "https://github.com/HashBrownCMS/hashbrown-cms.git",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "A free and open-source headless CMS",
   "main": "hashbrown.js",
   "scripts": {

diff --git a/webpack.config.js b/webpack.config.js
@@ -10,6 +10,9 @@ const FileSystem = require('fs');
 const IS_WATCHING = Array.isArray(process.argv) && process.argv.indexOf('--watch') > -1;
 const TMP_PATH = Path.join(__dirname, 'tmp');
 const PLUGINS_PATH = Path.join(__dirname, 'plugins');
+const PUBLIC_PATH = Path.join(__dirname, 'public');
+const PUBLIC_JS_PATH = Path.join(PUBLIC_PATH, 'js');
+const PUBLIC_CSS_PATH = Path.join(PUBLIC_PATH, 'css');
 
 /**
  * Gets all .js entries
@@ -28,6 +31,8 @@ function getJsEntries() {
     }
 
     // Include plugins
+    FileSystem.writeFileSync(Path.join(PUBLIC_JS_PATH, 'plugins.js'), '/* No plugins installed */');
+
     let pluginScripts = [];
 
     if(FileSystem.existsSync(PLUGINS_PATH)) {