summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.devcontainer/devcontainer.json47
-rw-r--r--.dockerignore1
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md7
-rw-r--r--.github/workflows/ferdi-builds.yml2
-rw-r--r--CONTRIBUTING.md5
-rw-r--r--packages/misty.yml11
6 files changed, 32 insertions, 41 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d7bd89bea..b015c114b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,29 +1,26 @@
1// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: 1// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2// https://github.com/microsoft/vscode-dev-containers/tree/v0.174.0/containers/javascript-node 2// https://github.com/microsoft/vscode-dev-containers/tree/v0.174.0/containers/javascript-node
3{ 3{
4 "name": "Node.js", 4 "name": "Node.js",
5 "build": { 5 "build": {
6 "dockerfile": "Dockerfile", 6 "dockerfile": "Dockerfile",
7 // Update 'VARIANT' to pick a Node version: 10, 12, 14 7 // Update 'VARIANT' to pick a Node version: 10, 12, 14
8 "args": { "VARIANT": "14" } 8 "args": {
9 }, 9 "VARIANT": "14"
10 10 }
11 // Set *default* container specific settings.json values on container create. 11 },
12 "settings": { 12 // Set *default* container specific settings.json values on container create.
13 "terminal.integrated.defaultProfile.linux": "/bin/bash" 13 "settings": {
14 }, 14 "terminal.integrated.defaultProfile.linux": "/bin/bash"
15 15 },
16 // Add the IDs of extensions you want installed when the container is created. 16 // Add the IDs of extensions you want installed when the container is created.
17 "extensions": [ 17 "extensions": [
18 "dbaeumer.vscode-eslint" 18 "dbaeumer.vscode-eslint"
19 ], 19 ],
20 20 // Use 'forwardPorts' to make a list of ports inside the container available locally.
21 // Use 'forwardPorts' to make a list of ports inside the container available locally. 21 // "forwardPorts": [],
22 // "forwardPorts": [], 22 // Use 'postCreateCommand' to run commands after the container is created.
23 23 // "postCreateCommand": "npm install",
24 // Use 'postCreateCommand' to run commands after the container is created. 24 // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
25 // "postCreateCommand": "npm install", 25 "remoteUser": "node"
26
27 // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
28 "remoteUser": "node"
29} 26}
diff --git a/.dockerignore b/.dockerignore
index d1ed260c9..8690fc9e9 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -16,6 +16,7 @@
16**/lerna-debug.log 16**/lerna-debug.log
17**/node_modules 17**/node_modules
18**/npm-debug.log* 18**/npm-debug.log*
19**/.pnpm-debug.log
19**/server*.log 20**/server*.log
20**/yarn-error.log 21**/yarn-error.log
21Dockerfile 22Dockerfile
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b2cd3a1eb..a777079a8 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,13 +5,14 @@
5 5
6#### Pre-flight Checklist 6#### Pre-flight Checklist
7 7
81. Please remember that if you are logging a bug for some service that has *stopped working* or is *working incorrectly*, please log the bug [here](https://github.com/getferdi/recipes/issues) 81. Please remember that if you are logging a bug for some service that has _stopped working_ or is _working incorrectly_, please log the bug [here](https://github.com/getferdi/recipes/issues)
92. If you are requesting support for a **new service** in Ferdi, please log it [here](https://github.com/getferdi/recipes/pulls) 92. If you are requesting support for a **new service** in Ferdi, please log it [here](https://github.com/getferdi/recipes/pulls)
103. Please remember to read the [self-help documentation](https://github.com/getferdi/ferdi#troubleshooting-recipes-self-help) - in case it helps you unblock yourself for issues related to older versions of recipes that were installed on your machine. (These will get automatically upgraded when you upgrade to the newer versions of Ferdi, but to get new recipes between Ferdi releases, this documentation is quite useful.) 103. Please remember to read the [self-help documentation](https://github.com/getferdi/ferdi#troubleshooting-recipes-self-help) - in case it helps you unblock yourself for issues related to older versions of recipes that were installed on your machine. (These will get automatically upgraded when you upgrade to the newer versions of Ferdi, but to get new recipes between Ferdi releases, this documentation is quite useful.)
114. Please consider supporting Ferdi! 114. Please consider supporting Ferdi!
12 👉 https://github.com/sponsors/getferdi 12 👉 https://github.com/sponsors/getferdi
13 👉 https://opencollective.com/getferdi/donate 13 👉 https://opencollective.com/getferdi/donate
145. Please ensure you've completed all of the following. 145. Please ensure you've completed all of the following.
15
15- [ ] I have read the [Contributing Guidelines](https://github.com/getferdi/ferdi/blob/develop/CONTRIBUTING.md) for this project. 16- [ ] I have read the [Contributing Guidelines](https://github.com/getferdi/ferdi/blob/develop/CONTRIBUTING.md) for this project.
16- [ ] I agree to follow the [Code of Conduct](https://github.com/getferdi/ferdi/blob/develop/CODE_OF_CONDUCT.md) that this project adheres to. 17- [ ] I agree to follow the [Code of Conduct](https://github.com/getferdi/ferdi/blob/develop/CODE_OF_CONDUCT.md) that this project adheres to.
17- [ ] I have searched the [issue tracker](https://github.com/getferdi/ferdi/issues) for a feature request that matches the one I want to file, without success. 18- [ ] I have searched the [issue tracker](https://github.com/getferdi/ferdi/issues) for a feature request that matches the one I want to file, without success.
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index c17011d69..c1312fb92 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -45,7 +45,7 @@ jobs:
45 with: 45 with:
46 ref: nightly 46 ref: nightly
47 submodules: recursive 47 submodules: recursive
48 fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging 48 fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
49 - id: should_run 49 - id: should_run
50 name: Check whether there are any commits since this run was last triggered and push them and/or set the output 50 name: Check whether there are any commits since this run was last triggered and push them and/or set the output
51 if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} 51 if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6a7091624..9cdef1f35 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,7 +33,10 @@
33 - [Javascript Coding style-checker](#javascript-coding-style-checker) 33 - [Javascript Coding style-checker](#javascript-coding-style-checker)
34 - [Packaging](#packaging) 34 - [Packaging](#packaging)
35 - [Release](#release) 35 - [Release](#release)
36 36 - [Update](#update)
37 - [Update the code](#update-the-code)
38 - [Update Node.js and npm](#update-nodejs-and-npm)
39 - [Update dependences](#update-dependences)
37<!-- /TOC --> 40<!-- /TOC -->
38 41
39## Code of Conduct 42## Code of Conduct
diff --git a/packages/misty.yml b/packages/misty.yml
deleted file mode 100644
index 2d8cff014..000000000
--- a/packages/misty.yml
+++ /dev/null
@@ -1,11 +0,0 @@
1theme:
2 cwd: ./theme
3 cmd: npm run dev
4
5forms:
6 cwd: ./forms
7 cmd: npm run dev
8
9ui:
10 cwd: ./ui
11 cmd: npm run dev