Skip to content

Commit 23a8b30

Browse files
authored
Merge branch 'development' into moo/MOO-1393-remove-code-push
2 parents 2b82e14 + 7bed0ac commit 23a8b30

8,147 files changed

Lines changed: 140340 additions & 150430 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/lint-action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
steps:
2121
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2222
- name: Checkout repo
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
# Installs NodeJS v20 in runner environment (upgraded from v16 in Feb 2024)
2525
- name: Install NodeJS
26-
uses: actions/setup-node@v3
26+
uses: actions/setup-node@v4
2727
with:
2828
node-version: '20'
2929
# Installs linting tool via npm
@@ -53,6 +53,7 @@ jobs:
5353
body: |
5454
${{ env.VER }}
5555
branch: lint-docs
56+
committer: MarkvanMents <Mark.van.Ments@mendix.com>
5657
assignees: MarkvanMents
5758
reviewers: MarkvanMents
5859
labels: Internal WIP

.github/workflows/remunusedattachments.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,26 @@ jobs:
1717
runs-on: ubuntu-latest
1818
# Steps represent a sequence of tasks that will be executed as part of the job
1919
steps:
20-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
20+
21+
# Checks out your repository under $GITHUB_WORKSPACE, so your job can access it
2122
- name: Checkout repo
22-
uses: actions/checkout@v3
23-
- uses: actions/setup-python@v4
23+
uses: actions/checkout@v4
24+
- uses: actions/setup-python@v5
2425
with:
2526
python-version: '3.10'
2627
- run: python _scripts/removeUnusedAttachments.py
28+
29+
# Creates pull request
2730
- name: Create Pull Request
28-
uses: peter-evans/create-pull-request@v4
31+
uses: peter-evans/create-pull-request@v6
2932
with:
3033
commit-message: Run removeUnusedAttachments.py on docs
3134
title: '[Auto] Remove unused attachments'
3235
body: |
33-
Pull Request to delete attachments shich are no longer used.
36+
Pull Request to delete attachments that are no longer used.
3437
Check the htmltest output from the CI/CD pipeline to ensure that nothing has been removed accidentally.
3538
branch: rem-unused-attachments
39+
committer: MarkvanMents <Mark.van.Ments@mendix.com>
3640
assignees: MarkvanMents
3741
reviewers: MarkvanMents
3842
labels: Internal WIP

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ hugo.exe
1313
# Legacy for users who still have leftovers from previous Docs Stack
1414
/_site/
1515
/.vscode/
16+
/.idea/
1617
bin
1718
data/asset*.json
1819
data/history.yml
@@ -24,4 +25,3 @@ data/history.yml
2425
mx-1-get-hugo-and-node.ps1
2526
mx-2-install-dependencies.bat
2627
mx-3-run-server.bat
27-

.travis.yml

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@ os: linux # optional, this is default
77
dist: jammy # or bionic | xenial | trusty | precise with xenial as default - Recommended here: https://docs.travis-ci.com/user/reference/overview/#deprecated-virtualization-environments
88

99
git:
10-
depth: 20000 # We're cloning a max of xxx commits, so the author date is correct
10+
depth: 20000 # We're cloning this many commits as it is roughly covering the last 4 years of commits, thus letting us show the last changed date on the documentation pages.
1111
quiet: true # prevent commit numbers appearing in the log and being flagged as potential security leaks.
1212
submodules: false # turn off submodules
1313

1414
env:
1515
global:
1616
# Global variables can go here, for example HUGO_VERSION if we were using Netlify to publish.
1717

18+
#add group: previous to see if this fixes the stalled npm build - 2025-04-14
19+
group: previous
20+
1821
branches:
1922
# build only development and production
2023
only:
@@ -60,25 +63,34 @@ install:
6063
- mkdir public # This because <Maybe> the process of syncing to public is probably deadlocked behind waiting for the public folder to be made, and is never signalled that the folder is created, which ends up stalling the build on Travis CI.
6164
# ------------------------
6265
- ./node_modules/.bin/hugo config --environment $TRAVIS_BRANCH # report the config we are using
63-
- echo "HUGO was run for environment $TRAVIS_BRANCH" > $TRAVIS_BUILD_DIR/hugo.log
66+
# Output header in bold white on green
67+
- printf '\033[37;42;1m' > $TRAVIS_BUILD_DIR/hugo.log
68+
- echo "HUGO was run for environment $TRAVIS_BRANCH" >> $TRAVIS_BUILD_DIR/hugo.log
69+
- printf '\033[0;22m' >> $TRAVIS_BUILD_DIR/hugo.log
6470
# Set pipefail so that if Hugo fails the whole job fails
6571
- set -o pipefail
6672
# put the flags in different config files controlled by environment matching $TRAVIS_BRANCH
6773
# Append output to hugo.log file to print at the end of the travis job
6874
# (see https://stackoverflow.com/questions/418896/how-to-redirect-output-to-a-file-and-stdout)
75+
6976
- ./node_modules/.bin/hugo --environment $TRAVIS_BRANCH 2>&1 | tee -a $TRAVIS_BUILD_DIR/hugo.log
70-
#
77+
7178
# normal htmltest takes too much memory - using a modified version which strips <aside> tag content
7279
# NB - Set pipefail so that Travis CI sees the return code from `tee` and not from `htmltest` so it will always build.
7380
- set +o pipefail
81+
# Additional info in bold white on green
82+
- printf '\033[37;42;1m' >> $TRAVIS_BUILD_DIR/hugo.log
7483
- echo "Any errors from HTMLTEST will be treated as warnings - the build will continue." >> $TRAVIS_BUILD_DIR/hugo.log
84+
- printf '\033[0;22m' >> $TRAVIS_BUILD_DIR/hugo.log
7585
- chmod +x ./htmltest/htmltest
76-
- ./htmltest/htmltest 2>&1 | tee -a $TRAVIS_BUILD_DIR/hugo.log
86+
# Run htmltest - convert red (91) and green (92) aixterm colors with 8-bit versions (31 and 32).
87+
88+
- ./htmltest/htmltest 2>&1 | sed "s/\o033\[91/\o033\[31/g; s/\o033\[92/\o033\[32/g" |tee -a $TRAVIS_BUILD_DIR/hugo.log
7789

7890
before_script:
7991
##############
8092
- pyenv versions # list python versions supported by pyenv in case version in next command is removed
81-
- pyenv global 3.7.13 # this version needs to be already installed in the travis build
93+
- pyenv global 3.8 # this version needs to be already installed in the travis build
8294
- python -V
8395

8496
script:
@@ -109,7 +121,7 @@ script:
109121
# - pwd
110122
# NB: Have to have something here, otherwise Travis tries to run "npm test"
111123
# Display the output from hugo and htmltest so it is not folded and hidden, and is at the end of the log.
112-
- echo "$(<$TRAVIS_BUILD_DIR/hugo.log)"
124+
- printf '\n\n%s\n\n' "$(<$TRAVIS_BUILD_DIR/hugo.log)"
113125

114126
# before_cache
115127
############## Skipped
@@ -136,14 +148,14 @@ deploy:
136148
#
137149
# Need to decide where to deploy to, so need to do the actual deployment in a script https://docs.travis-ci.com/user/job-lifecycle#complex-build-commands
138150
# - aws s3 sync . s3://$TARGETAWSBUCKET --delete --only-show-errors
139-
- provider: script
140-
script:
141-
- $TRAVIS_BUILD_DIR/_scripts/deploy.sh
142-
skip_cleanup: true
143-
on:
144-
branch:
145-
- production
146-
- development
151+
provider: script
152+
#
153+
edge: true
154+
script: $TRAVIS_BUILD_DIR/_scripts/deploy.sh
155+
on:
156+
branch:
157+
- production
158+
- development
147159

148160
after_deploy:
149161
############# Skipped

.vscode/spellright.dict

Lines changed: 0 additions & 1 deletion
This file was deleted.

EU-DIGITAL-SERVICES-ACT-FOR-COMMUNITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ The Digital Services Act (DSA, Regulation (EU) 2022/2065) is an EU Regulation wh
44

55
Under Article 24 (2) of the DSA, online platforms are required to publish "information on the average monthly active recipients of the service" in the EU by February 17, 2023 and at least once every six months thereafter. This is for the purposes of determining whether an online platform is a "very large online platform" (VLOP) as per the DSA, meaning, a platform which reaches an average of at least 45 million users per month in the EU (representing 10% of the EU population). VLOPs are subject to additional requirements due to the role they play in the dissemination of content throughout the EU.
66

7-
Based on the six-month period from August 2022 to January 2023, the average number of monthly active recipients of our Mendix Community in the EU was well below the threshold of 45 million.
7+
Based on the six-month period from October 2023 to March 2024, the average number of monthly active recipients of our Mendix Community in the EU was well below the threshold of 45 million.
88

99
Since, at the time of publication of this information, the European Commission has not enacted delegated acts (as mentioned under Article 24 (2) of the DSA) on the methodology of the calculation of the number of monthly active recipients, we have performed our calculation to the best of our knowledge based on the current information the DSA provides as well as the European Commission’s guidance on the requirement to publish user numbers of February 1, 2023. We will continue to monitor the number of average monthly active recipients of our Mendix Community in the EU and will publish updated information in accordance with Article 24 (2) of the DSA.

EU-DIGITAL-SERVICES-ACT-FOR-MARKETPLACE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ The Digital Services Act (DSA, Regulation (EU) 2022/2065) is an EU Regulation wh
44

55
Under Article 24 (2) of the DSA, online platforms are required to publish "information on the average monthly active recipients of the service" in the EU by February 17, 2023 and at least once every six months thereafter. This is for the purposes of determining whether an online platform is a "very large online platform" (VLOP) as per the DSA, meaning, a platform which reaches an average of at least 45 million users per month in the EU (representing 10% of the EU population). VLOPs are subject to additional requirements due to the role they play in the dissemination of content throughout the EU.
66

7-
Based on the six-month period from August 2022 to January 2023, the average number of monthly active recipients of our Mendix Marketplace in the EU was well below the threshold of 45 million.
7+
Based on the six-month period from October 2023 to March 2024, the average number of monthly active recipients of our Mendix Marketplace in the EU was well below the threshold of 45 million.
88

99
Since, at the time of publication of this information, the European Commission has not enacted delegated acts (as mentioned under Article 24 (2) of the DSA) on the methodology of the calculation of the number of monthly active recipients, we have performed our calculation to the best of our knowledge based on the current information the DSA provides as well as the European Commission’s guidance on the requirement to publish user numbers of February 1, 2023. We will continue to monitor the number of average monthly active recipients of our Mendix Marketplace in the EU and will publish updated information in accordance with Article 24 (2) of the DSA.

EU-DIGITAL-SERVICES-ACT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ The Digital Services Act (DSA, Regulation (EU) 2022/2065) is an EU Regulation wh
44

55
Under Article 24 (2) of the DSA, online platforms are required to publish "information on the average monthly active recipients of the service" in the EU by February 17, 2023 and at least once every six months thereafter. This is for the purposes of determining whether an online platform is a "very large online platform" (VLOP) as per the DSA, meaning, a platform which reaches an average of at least 45 million users per month in the EU (representing 10% of the EU population). VLOPs are subject to additional requirements due to the role they play in the dissemination of content throughout the EU.
66

7-
Based on the six-month period from August 2022 to January 2023, the average number of monthly active recipients of our Mendix Documentation in the EU was well below the threshold of 45 million.
7+
Based on the six-month period from October 2023 to March 2024, the average number of monthly active recipients of our Mendix Documentation in the EU was well below the threshold of 45 million.
88

99
Since, at the time of publication of this information, the European Commission has not enacted delegated acts (as mentioned under Article 24 (2) of the DSA) on the methodology of the calculation of the number of monthly active recipients, we have performed our calculation to the best of our knowledge based on the current information the DSA provides as well as the European Commission’s guidance on the requirement to publish user numbers of February 1, 2023. We will continue to monitor the number of average monthly active recipients of our Mendix Documentation in the EU and will publish updated information in accordance with Article 24 (2) of the DSA.

README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Mendix Documentation [![hugo_badge](https://img.shields.io/badge/hugo-0.121.2-green.svg)](https://gohugo.io/) [![node_badge](https://img.shields.io/badge/node-20.10.0-green.svg)](https://nodejs.org/en/) [![docsy_badge](https://img.shields.io/badge/docsy-0.9.0-green.svg)](https://www.docsy.dev/)
1+
# Mendix Documentation [![hugo_badge](https://img.shields.io/badge/hugo-0.126.1-green.svg)](https://gohugo.io/) [![node_badge](https://img.shields.io/badge/node-20.9.0-green.svg)](https://nodejs.org/en/) [![docsy_badge](https://img.shields.io/badge/docsy-0.10.0-green.svg)](https://www.docsy.dev/)
22

33
This repository contains the Mendix documentation, which is served on [https://docs.mendix.com](https://docs.mendix.com).
44

@@ -9,24 +9,24 @@ Build status:
99

1010
## Contribute
1111

12-
Want to contribute? Take a look at [How to Contribute to Mendix Docs](https://docs.mendix.com/community-tools/contribute-to-mendix-docs/). It will guide you through the process of submitting updates to the docs directly from Github or from a local branch.
12+
Want to contribute? Take a look at [How to Contribute to Mendix Docs](https://docs.mendix.com/community-tools/contribute-to-mendix-docs/). It will guide you through the process of submitting updates to the docs directly from GitHub or from a local branch.
1313

1414
## Local Build
1515

16-
You can clone a local copy of the repository and build local previews. The Mendix documentation is built on top of Hugo and Node.JS. The theme of the page is based on Docsy. To develop the documentation locally, follow the steps in the next section.
16+
You can clone a local copy of the repository and build local previews. The Mendix documentation is built on top of Hugo and Node.js. The theme of the page is based on Docsy. To develop the documentation locally, follow the steps in the next section.
1717

1818
### Setting Up
1919

2020
#### Cloning the Repo
2121

22-
To clone the repo please keep in mind:
22+
When you clone the repo, keep the following in mind:
2323

24-
* If you are running on Windows, the directory path for the local directory should not be too long, otherwise some files will reach the limits of git’s file length. A base path of up to 50 characters works - 64 characters is currently too long.
24+
* If you are using Windows, the directory path for the local directory should not be too long; otherwise, some files will reach the limits of Git’s file length. A base path of up to 50 characters works64 characters is currently too long.
2525

2626
#### Installing Dependencies
2727

28-
1. Download and install the LTS version of [NodeJS](https://nodejs.org/en/download/).
29-
1. In a terminal at the root of the repository run: `npm install`.
28+
1. Download and install the LTS version of [Node.js](https://nodejs.org/en/download/prebuilt-installer).
29+
1. In a terminal at the root of the repository, run `npm install`.
3030

3131
### Running the Server
3232

@@ -37,16 +37,16 @@ To run a local version of the site:
3737
* `npm run build`
3838
* `./node_modules/.bin/hugo server --environment development` – in this case, you can use [different parameters](https://gohugo.io/commands/hugo_server/) to build the site in different ways—for example, build a copy of the production site and save it locally.
3939

40-
The path syntax prefacing `hugo` may be different based on your operating system and terminal you use.
40+
The path syntax prefacing `hugo` may be different based on the operating system and terminal you use.
4141

42-
Once the site is built you will see a table indicating how many pages have been created. You will need to wait until the server is set up before you can see the site.
42+
Once the site is built, you will see a table indicating how many pages have been created. You will need to wait until the server is set up before you can see the site.
4343

44-
2. Go to http://localhost:1313/ and see the site live.
44+
2. Go to http://localhost:1313/ and see the site live.
4545

46-
See the [Hugo Server](https://gohugo.io/commands/hugo_server/) documentation for more options (for example, if you want to change the port on which the site is published)
46+
See the [Hugo Server](https://gohugo.io/commands/hugo_server/) documentation for more options (for example, if you want to change the port on which the site is published).
4747

4848
#### Potential Issues
4949

5050
If you are using a Mac, you might get an error `too many open files` or `fatal error: pipe failed`. By default, your Mac is probably set to restrict the number of open files. You will need to override this, see [Docsy known issues](https://www.docsy.dev/docs/getting-started/#known-issues) for more information.
5151

52-
If your system has a low memory limit, add the `--renderToDisk` parameter to the Hugo command, for example `hugo server --environment development --renderToDisk`. With this option, Hugo will only load pages on demand; without the `--renderToDisk` option, Hugo will load all documentation into memory for faster access.
52+
If your system has a low memory limit, add the `--renderToDisk` parameter to the Hugo command (for example, `hugo server --environment development --renderToDisk`). With this option, Hugo only loads pages on demand; without the `--renderToDisk` option, Hugo loads all documentation into memory for faster access.

assets/scss/_badge.scss

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// Styling for badges (enabled in the frontmatter)
2+
// Badge styling mimics the PDS guidelines: https://designsystem.mendix.com/doc/p/Components/Badge/5b0de933-d909-4269-b957-276f16f71341
3+
// For guidance on how to use these, see https://mendix.atlassian.net/wiki/spaces/RNDHB/pages/2757787839/Front+Matter+Metadata#For-Badges
4+
5+
.badge-pill {
6+
border-radius: 4px;
7+
padding: 4px 4px 3px 4px;
8+
margin-left: 2px;
9+
}
10+
11+
.badge-draft {
12+
background-color: $warning-9;
13+
}
14+
15+
.badge-beta {
16+
color: $gray-900;
17+
background-color: $gray-500;
18+
}
19+
20+
.badge-lts {
21+
background-color: $success-9;
22+
}
23+
24+
.badge-mts {
25+
background-color: $info-8;
26+
}
27+
28+
.badge-deprecated {
29+
background-color: $gray-100;
30+
border: solid 1px $gray-500;
31+
color: $gray-900;
32+
}
33+
34+
.badge-recommended {
35+
border: solid 1px $success-9;
36+
color: $success-9;
37+
}
38+
39+
.badge-react {
40+
background-color: $info-1;
41+
color: $info-7;
42+
}

0 commit comments

Comments
 (0)