@degreesign/webapp 1.6.8 → 1.7.0

package/dist/src/main.js

@@ -15,7 +15,7 @@ const web_1 = require("./web");
 const obfuscate_1 = require("./obfuscate");
 dotenv_1.default.config();
 const build = (params) => {
-    const isWebApp = params.type != `server`, { mode = `production`, obfuscateON = false, minimiseON = true, srcDir = `src`, productionDir = `public_html`, port = 3210, maxFileSizeMB = 2, resolveOptions = {}, licenseText = ``, } = params, { filesList = [], } = isWebApp ? {} : params, { entryPoints = {}, customWebRules = [], configWebPlugins = [], cssMinimise = [] } = isWebApp ? (0, web_1.webConfig)(params) : {}, fileSize = maxFileSizeMB * 1024 ** 2, envKeys = {};
+    const { mode = `production`, obfuscateON = false, minimiseON = true, srcDir = `src`, productionDir = `public_html`, port = 3210, maxFileSizeMB = 2, resolveOptions = {}, licenseText = ``, includeServerModules, type: setupType } = params, isWebApp = setupType != `server`, { filesList = [], } = isWebApp ? {} : params, { entryPoints = {}, customWebRules = [], configWebPlugins = [], cssMinimise = [] } = isWebApp ? (0, web_1.webConfig)(params) : {}, fileSize = maxFileSizeMB * 1024 ** 2, envKeys = {};
     // Environment keys
     for (const key in process.env)
         envKeys[`process.env.${key}`] = JSON.stringify(process.env[key]);
@@ -50,7 +50,9 @@ const build = (params) => {
                 __dirname: false, // Prevent Webpack from mocking __dirname
                 __filename: false, // Prevent Webpack from mocking __filename
             },
-            externals: [(0, webpack_node_externals_1.default)()], // Externalize all node_modules
+            ...includeServerModules ? {} : {
+                externals: [(0, webpack_node_externals_1.default)()], // Externalize all node_modules
+            },
         },
         resolve: {
             extensions: [`.tsx`, `.ts`, `.js`, `.json`], // Resolve files

package/dist/src/types.d.ts

@@ -68,6 +68,8 @@ export interface ConfigBase {
     licenseText?: string;
     /** Show Packages Analyser Window */
     openAnalyzer?: boolean;
+    /** Node module included for server */
+    includeServerModules?: boolean;
 }
 export interface ConfigWebApp extends ConfigBase {
     /** Name of the website */

package/dist/src/web.js

@@ -143,20 +143,17 @@ Sitemap: https://${websiteDomain}/sitemap.xml`, getServiceWorkerContent = () =>
   Header set Strict-Transport-Security "max-age=31536000; includeSubDomains"
 </IfModule>
 
-# disable indexing
+# Disable Indexing
 Options -Indexes
 
+# Always use HTTPS
 <IfModule mod_rewrite.c>
   RewriteEngine On
   RewriteCond %{HTTPS} off
   RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
 </IfModule>
 
-# Errors
-ErrorDocument 404 /404
-ErrorDocument 403 /404
-
-# Add content type
+# Files and Directories
 `;
     for (let i = 0; i < pagesList.length; i++) {
         const pageData = pagesList[i], pageURI = pageData.uri, isHome = pageHome == pageURI;
@@ -202,6 +199,7 @@ ErrorDocument 403 /404
     }
     ;
     htaccessFile += htaccessCustom;
+    htaccessFile += `\n\n# Errors\nErrorDocument 404 /404\nErrorDocument 403 /404`;
     (0, utils_1.writeData)(`./${productionDir}/robots.txt`, robots);
     (0, utils_1.writeData)(`./${productionDir}/.htaccess`, htaccessFile);
     (0, utils_1.writeData)(`./${productionDir}/app.json`, JSON.stringify(appManifest));

package/package.json

@@ -1,7 +1,7 @@
 {
   "license": "MIT",
   "name": "@degreesign/webapp",
-  "version": "1.6.8",
+  "version": "1.7.0",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",