@silexlabs/silex 3.0.0-alpha.26 → 3.0.0-alpha.28

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@silexlabs/silex",
   "description": "Free and easy website builder for everyone.",
-  "version": "3.0.0-alpha.26",
+  "version": "3.0.0-alpha.28",
   "version:backwardcompat": "3.0.0",
   "author": {
     "name": "Alex Hoyau",
@@ -11,12 +11,6 @@
   "bin": {
     "silex": "./dist/server/cli.js"
   },
-  "files": [
-    "src",
-    "dist",
-    "public",
-    ".silex.js"
-  ],
   "license": "GPL-3.0",
   "engines": {
     "node": ">=12"

package/src/ts/server/cli.ts

@@ -5,16 +5,18 @@ import { parse } from 'cli'
 const options = parse({
   config: [ 'c', 'Path for the server side config file to load at startup', 'file'],
   port: [ 'p', 'Port to listen to', 'int'],
+  debug: [false, 'Debug mode, with live reload, source maps etc.', 'boolean'],
   'ssl-port': [ false, 'Port to listen to for SSL/HTTPS', 'int'],
-  'force-https': [ false, 'Force HTTPS', 'true'],
+  'force-https': [ false, 'Force HTTPS', 'boolean'],
   'ssl-private-key': [ false, 'Path to private key for SSL', 'file'],
   'ssl-certificate': [ false, 'Path to SSL certificate', 'file'],
-  'force-https-trust-xfp-header': [ false, 'Sets the trustXFPHeader param of the express module "cookie-session". Use only with --force-https', 'true'],
+  'force-https-trust-xfp-header': [ false, 'Sets the trustXFPHeader param of the express module "cookie-session". Use only with --force-https', 'boolean'],
   'session-secret': ['s', 'Session secret', 'string'],
 }, {})
 
 if(options.config) process.env.CONFIG = options.config
 if(options.port) process.env.PORT = options.port
+if(options.debug) process.env.SILEX_DEBUG = options.debug
 if(options['ssl-port']) process.env.SSL_PORT = options['ssl-port']
 if(options['force-https']) process.env.SILEX_FORCE_HTTPS = options['force-https']
 if(options['ssl-private-key']) process.env.SILEX_SSL_PRIVATE_KEY = options['ssl-private-key']

package/src/ts/server/index.ts

@@ -22,9 +22,10 @@ I'm ready, listening to port ${config.port}
 main()
 
 // livereload
-import { createServer } from 'livereload'
-import { resolve } from 'path'
-function startLiverReload() {
+async function startLiverReload() {
+  // Load modules only when needed (they may not even be installed)
+  const { createServer } = await import('livereload')
+  const { resolve } = await import('path')
   const dist = resolve(__dirname, '../client')
   const server = createServer({
     delay: 0,

package/tsconfig-server-debug.json

@@ -0,0 +1,20 @@
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "outDir": "dist/server/",
+    "target": "esnext",
+    "watch": false,
+    "inlineSourceMap": true,
+    "module": "commonjs",
+    "removeComments": false,
+    "esModuleInterop": true, /* for import 'Events' in silex-plugins */
+    "typeRoots": [
+      "src/ts/types",
+      "node_modules/@types"
+    ]
+  },
+  "include": [
+    "src/ts/server/index.ts",
+    "src/ts/server/cli.ts"
+  ]
+}

package/tsconfig-server-release.json

@@ -0,0 +1,20 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "outDir": "dist/server/",
+    "target": "esnext",
+    "watch": false,
+    "sourceMap": false,
+    "module": "commonjs",
+    "removeComments": true,
+    "esModuleInterop": true, /* for import 'Events' in silex-plugins */
+    "typeRoots": [
+      "src/ts/types",
+      "node_modules/@types"
+    ]
+  },
+  "include": [
+    "src/ts/server/index.ts",
+    "src/ts/server/cli.ts"
+  ]
+}

package/tsconfig.jest.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "outDir": "dist/client/",
+    "target": "ES2019",
+    "sourceMap": true,
+    "module": "esnext",
+    "esModuleInterop": true,
+  }
+}

package/tsconfig.json

@@ -0,0 +1,27 @@
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "outDir": "dist/client/",
+    "target": "ES2022",
+    "watch": true,
+    "sourceMap": true,
+    "module": "esnext",
+    "removeComments": false,
+    "allowJs": true,
+    "typeRoots": [
+      "src/ts/types",
+      "node_modules/@types"
+    ],
+    "moduleResolution": "node",
+    "esModuleInterop": true
+  },
+  "include": [
+    "src/ts/client/index.ts"
+  ],
+  "plugins": [
+    {
+      "name": "ts-lit-plugin",
+      "strict": true
+    }
+  ]
+}

package/webpack.config.js

@@ -0,0 +1,29 @@
+const path = require('path');
+const webpack = require("webpack")
+
+module.exports = {
+  entry: './src/ts/client/expose.ts',
+  mode: 'production',
+  module: {
+    rules: [
+      {
+        test: /\.tsx?$/,
+        use: 'ts-loader',
+      },
+    ]
+  },
+  resolve: {
+    extensions: [ '.tsx', '.ts', '.js' ],
+  },
+  output: {
+    filename: '[name].js',
+    path: path.resolve(__dirname, 'dist/client/js'),
+    library: 'silex',
+  },
+  plugins: [
+    new webpack.DefinePlugin({
+      VERSION: JSON.stringify(require("./package.json").version),
+      CONFIG_URL: process.env.CONFIG_URL && JSON.stringify(process.env.CONFIG_URL),
+    }),
+  ]
+};

package/webpack.debug.config.js

@@ -0,0 +1,8 @@
+const prodConfig = require('./webpack.config')
+
+module.exports = {
+  ...prodConfig,
+  //devtool: 'inline-source-map',
+  devtool: 'source-map',
+  mode: 'development',
+};