WIP: V3

.dockerignore

@@ -3,3 +3,5 @@
 docs
 node_modules
 Dockerfile
+!.
+!.env.default

.env.default

@@ -0,0 +1,20 @@
+SILEX_URL=http://localhost:6805
+SILEX_EXPRESS_JSON_LIMIT=1mb
+SILEX_EXPRESS_TEXT_LIMIT=10mb
+SILEX_EXPRESS_URLENCODED_LIMIT=1mb
+SILEX_SESSION_NAME=silex-session
+SILEX_SESSION_SECRET=replace this session secret in env vars
+SILEX_PORT=6805 # 6805 is the date of sexual revolution started in paris france 8-)
+SILEX_HOST=localhost
+SILEX_PROTOCOL=http
+SILEX_DEBUG=FALSE
+SILEX_SERVER_CONFIG=
+SILEX_SSL_PORT=
+SILEX_FORCE_HTTPS=
+SILEX_SSL_PRIVATE_KEY=
+SILEX_SSL_CERTIFICATE=
+SILEX_FORCE_HTTPS_TRUST_XFP_HEADER=
+SILEX_CORS_URL=
+SILEX_CLIENT_CONFIG=
+SILEX_FS_ROOT=
+SILEX_FS_HOSTING_ROOT=

.eslintrc.json

@@ -0,0 +1,45 @@
+{
+  "ignorePatterns": [ "dist/" ],
+  "env": {
+    "browser": true,
+    "es2021": true,
+    "node": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended"
+  ],
+  "overrides": [
+  ],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": [
+    "@typescript-eslint"
+    ],
+    "rules": {
+      "indent": [
+        "error",
+            2
+      ],
+      "linebreak-style": [
+        "error",
+        "unix"
+      ],
+      "quotes": [
+        "error",
+        "single"
+      ],
+      "semi": [
+        "error",
+        "never"
+      ],
+      "no-case-declarations": [0],
+      "@typescript-eslint/no-unused-vars": [0],
+      "@typescript-eslint/no-explicit-any": [0],
+      "@typescript-eslint/ban-ts-comment": [0],
+      "@typescript-eslint/no-empty-function": [0]
+    }
+}

.github/workflows/docker-hub-publish.yml

@@ -0,0 +1,36 @@
+name: Publish DockerHub image
+# from https://itsmetommy.com/2021/07/05/push-to-docker-hub-using-github-actions/
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build-container:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: silexlabs/silex
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+

.github/workflows/npm-publish.yml

@@ -11,9 +11,9 @@ jobs:
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v1
         with:
-          node-version: '12.x'
+          node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'
       - run: npm install
-      - run: npm publish
+      - run: npm publish --access=public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/test.yml

@@ -1,6 +1,6 @@
 name: Run tests
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -9,8 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 11.x, 12.x]
-        # os: [macos-latest, windows-latest, ubuntu-latest]
+        node-version: [16.x, 18.x]
         os: [ubuntu-latest]
 
     steps:

.gitignore

@@ -7,7 +7,8 @@
 node_modules
 *.log
 .vscode
-dist/client
-dist/server
-dist/prodotype
-dist/html
+.git
+old
+dist/
+silex/
+.env

.nvmrc

@@ -1 +1 @@
-12.22.10
+18.13.0

.silex.js

@@ -0,0 +1,71 @@
+/*
+ * Silex website builder, free/libre no-code tool for makers.
+ * Copyright (c) 2023 lexoyo and Silex Labs foundation
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @fileoverview This file is loaded by Silex at startup, after the user config if you specify one
+ */
+
+const SslPlugin = require('./dist/plugins/server/plugins/server/SslPlugin').default
+const StaticPlugin = require('./dist/plugins/server/plugins/server/StaticPlugin').default
+const { join } = require('path')
+const nodeModules = require('node_modules-path')
+
+module.exports = async function(config, options) {
+  try {
+    await config.addPlugin([
+      SslPlugin,
+      StaticPlugin,
+    ], {
+      [StaticPlugin]: {
+        routes: [
+          {
+            route: '/',
+            path: join(__dirname, 'public'),
+          }, {
+            route: '/css/',
+            path: nodeModules('@fortawesome/fontawesome-free') + '/@fortawesome/fontawesome-free/css/',
+          }, {
+            route: '/webfonts/',
+            path: nodeModules('@fortawesome/fontawesome-free') + '/@fortawesome/fontawesome-free/webfonts/',
+          }, {
+            route: '/css/files/',
+            path: nodeModules('@fontsource/ubuntu') + '/@fontsource/ubuntu/files/',
+          }, {
+            route: '/',
+            path: join(__dirname, 'dist', 'client'),
+          }, {
+            route: '/',
+            path: join(__dirname, 'dist', 'plugins', 'client'),
+          },
+        ]
+          // add project route for source maps
+          .concat(config.debug ? [{
+            route: '/',
+            path: './',
+          }, {
+            route: '/js/',
+            path: nodeModules('@silexlabs/silex-cms') + '/@silexlabs/silex-cms/',
+          }] : []),
+      },
+    })
+  } catch(e) {
+    console.error(e)
+  }
+
+  // Return an object to be merged with Silex config
+  return {}
+}

CODE_OF_CONDUCT.md

@@ -1,128 +1 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-contact [at] silex.me.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.
+## This page [has moved to Silex documentation website](https://docs.silex.me/en/collaborate)