Skip to content

Commit

Permalink
Merge branch 'main' into 739-modus-contribution-process-update
Browse files Browse the repository at this point in the history
  • Loading branch information
coliff committed Jun 21, 2024
2 parents 958e7db + 53bdd09 commit 35b88d8
Show file tree
Hide file tree
Showing 349 changed files with 7,947 additions and 10,841 deletions.
7 changes: 7 additions & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
"chemlogix",
"chipset",
"choco",
"choropleth",
"Christison",
"chromeless",
"cidbl",
Expand Down Expand Up @@ -869,6 +870,7 @@
"rect",
"rects",
"recurse",
"Reda",
"redownload",
"reggionick",
"relref",
Expand Down Expand Up @@ -940,6 +942,7 @@
"setlayoutproperty",
"sharded",
"Shchegoleva",
"Shneiderman",
"shoreditch",
"shortcode",
"shortcodes",
Expand All @@ -954,6 +957,7 @@
"silverlight",
"sirv",
"Sivaraman",
"sketchup",
"skybitz",
"skyblue",
"SLAs",
Expand Down Expand Up @@ -1101,6 +1105,7 @@
"unclickable",
"unclustered",
"uncombine",
"Undock",
"unece",
"Unencrypted",
"unflatten",
Expand Down Expand Up @@ -1141,6 +1146,7 @@
"valign",
"Vasudevan",
"vbscript",
"vbtn",
"vehiclegroupid",
"vehiclerestrictedcleanupgeometry",
"Vellanki",
Expand Down Expand Up @@ -1184,6 +1190,7 @@
"wiki",
"windir",
"windowsphone",
"Winsor",
"winterhaven",
"wireframes",
"wireframing",
Expand Down
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ trim_trailing_whitespace = true
[*.svg]
insert_final_newline = false

[*.html]
[*.min.*]
insert_final_newline = false
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*.yml

*.config.js
anatomy.js
example-code-es*.js
theme-toggle.js

Expand Down
11 changes: 6 additions & 5 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# About CODEOWNERS
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

## https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

## Folders

/assets/ @coliff
/content/ @coliff @egunther39 @enowak1031 @msankaran0712 @soniakaukonen
/content/ @coliff @egunther39 @enowak1031
/content/components/in-field/ @mjohnsnz
/layouts/ @coliff
/static/ @coliff @egunther39 @enowak1031 @msankaran0712 @soniakaukonen
/static/ @coliff
/static/img/in-field/ @mjohnsnz

## File Types

*.html @coliff
*.js @coliff @msankaran0712
*.md @coliff @egunther39 @enowak1031 @msankaran0712 @soniakaukonen
*.js @coliff
*.md @coliff @egunther39 @enowak1031
*.scss @coliff
*.xml @coliff
14 changes: 14 additions & 0 deletions .github/workflows/axe-linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Linting for accessibility issues

on: [pull_request]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: dequelabs/axe-linter-action@v1

Check warning on line 11 in .github/workflows/axe-linter.yml

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (dequelabs)
with:
api_key: ${{ secrets.AXE_LINTER_API_KEY }}
github_token: ${{ secrets.GITHUB_TOKEN }}
3 changes: 1 addition & 2 deletions .github/workflows/azure-static-web-apps-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ jobs:
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod

- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
uses: peaceiris/actions-hugo@v3
with:
hugo-version: "latest"
extended: true

- run: npm i
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: "javascript"
queries: +security-and-quality

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
uses: actions/checkout@v4

- name: "Dependency Review"
uses: actions/dependency-review-action@v3
uses: actions/dependency-review-action@v4
4 changes: 2 additions & 2 deletions .github/workflows/deploy-s3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 14
node-version: 20

- name: Install dependencies
run: npm i
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/review-reminder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:
deploy:
name: Review reminders
runs-on: ubuntu-latest
if: github.repository == 'trimble-oss/website-modus.trimble.com'

steps:
- name: Checkout
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/sonar-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
FORCE_COLOR: 2
NODE: 16
NODE: 20

permissions:
contents: read
Expand All @@ -16,6 +16,7 @@ jobs:
scan:
name: Sonar Scan Runner
runs-on: ubuntu-latest
if: github.repository == 'trimble-oss/website-modus.trimble.com'
permissions:
contents: read

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on: # rebuild any PRs and main branch changes

env:
FORCE_COLOR: 2
NODE: 16
NODE: 20

permissions:
contents: read
Expand All @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v4
with:
persist-credentials: false
- uses: streetsidesoftware/cspell-action@v4
- uses: streetsidesoftware/cspell-action@v6
with:
check_dot_files: false
incremental_files_only: true
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/super-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@ on:
pull_request:
branches: [main]

permissions:
contents: read

jobs:
build:
permissions:
contents: read
packages: read
statuses: write
name: Lint Code Base
runs-on: ubuntu-latest
Expand All @@ -21,21 +19,25 @@ jobs:
steps:
- name: Checkout Code
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Lint Code Base
uses: github/super-linter/slim@v5
uses: super-linter/super-linter/slim@v6
env:
DEFAULT_BRANCH: main
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
IGNORE_GITIGNORED_FILES: true
JAVASCRIPT_DEFAULT_STYLE: prettier
LINTER_RULES_PATH: /
LOG_LEVEL: NOTICE
MARKDOWN_CONFIG_FILE: .markdownlint.json
SUPPRESS_POSSUM: true
VALIDATE_ALL_CODEBASE: false
VALIDATE_CHECKOV: false
VALIDATE_EDITORCONFIG: false
VALIDATE_HTML: false
VALIDATE_JAVASCRIPT_ES: false
VALIDATE_JAVASCRIPT_STANDARD: false
VALIDATE_JSCPD: false
VALIDATE_MARKDOWN: false
VALIDATE_NATURAL_LANGUAGE: false
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/whitesource-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
scan:
name: WhiteSource Scan Runner
runs-on: ubuntu-latest
if: github.repository == 'trimble-oss/website-modus.trimble.com'
permissions:
contents: read

Expand Down
24 changes: 24 additions & 0 deletions .hintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"extends": [
"development"
],
"hints": {
"axe/aria": [
"default",
{
"aria-valid-attr-value": "off"
}
],
"axe/structure": "off",
"no-inline-styles": "off",
"disown-opener": "off",
"compat-api/html": "off",
"axe/text-alternatives": [
"default",
{
"frame-title": "off"
}
],
"compat-api/css": "off"
}
}
4 changes: 4 additions & 0 deletions .imgbotconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"ignoredFiles": ["*.svg"],
"minKBReduced": 1
}
3 changes: 3 additions & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@
"MD024": false,
"MD026": false,
"MD029": false,
"MD031": false,
"MD032": false,
"MD033": false,
"MD034": false,
"MD036": false,
"MD055": false,
"MD056": false,
"whitespace": false
}
3 changes: 3 additions & 0 deletions .markdownlintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/node_modules/*

LICENSE
2 changes: 1 addition & 1 deletion .ncurc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"upgrade": true,
"reject": ["bootstrap"]
"reject": "textlint-rule-terminology"
}
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
lockfile-version = 2
lockfile-version = 3
registry = 'https://registry.npmjs.org/'
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
20.14.0
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"recommendations": ["EditorConfig.EditorConfig", "esbenp.prettier-vscode", "HTMLHint.vscode-htmlhint", "streetsidesoftware.code-spell-checker", "stylelint.vscode-stylelint", "anderseandersen.html-class-suggestions"]
"recommendations": ["EditorConfig.EditorConfig", "esbenp.prettier-vscode", "HTMLHint.vscode-htmlhint", "streetsidesoftware.code-spell-checker", "stylelint.vscode-stylelint"]
}
9 changes: 6 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"scss.lint.validProperties": [
"content-visibility",
"contain-intrinsic-size"
],
"markdown.styles": [
"https://cdn.jsdelivr.net/npm/@trimble-oss/modus-icons@1/dist/modus-solid/fonts/modus-icons.css",
"https://cdn.jsdelivr.net/npm/@trimbleinc/modus-bootstrap@1/dist/modus.min.css",
"https://cdn.jsdelivr.net/npm/@trimble-oss/modus-bootstrap/dist/css/modus-bootstrap.min.css",
"https://modus.trimble.com/styles/styles.min.css"
]
],
"[markdown]": {
"editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
}
}
Loading

0 comments on commit 35b88d8

Please sign in to comment.