Skip to content

Commit

Permalink
Merge branch 'main' into tooltip-escape-to-dismiss
Browse files Browse the repository at this point in the history
  • Loading branch information
austinoneil committed May 5, 2024
2 parents f43ebe2 + 491b85e commit a470a2b
Show file tree
Hide file tree
Showing 206 changed files with 3,659 additions and 9,798 deletions.
14 changes: 0 additions & 14 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,16 @@
version: 2
updates:
- package-ecosystem: npm
directory: '/angular-workspace/'
schedule:
interval: monthly
open-pull-requests-limit: 2

- package-ecosystem: npm
directory: '/react-workspace/'
schedule:
interval: monthly
open-pull-requests-limit: 2

- package-ecosystem: npm
directory: '/stencil-workspace/'
schedule:
interval: monthly
versioning-strategy: increase
open-pull-requests-limit: 2

- package-ecosystem: npm
directory: '/stencil-workspace/storybook/'
schedule:
interval: monthly
versioning-strategy: increase
open-pull-requests-limit: 2

- package-ecosystem: github-actions
directory: '/'
Expand Down
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
with:
api_key: ${{ secrets.AXE_LINTER_API_KEY }}
github_token: ${{ secrets.GITHUB_TOKEN }}
8 changes: 8 additions & 0 deletions .github/workflows/publish-angular.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ jobs:
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'

- name: Install Modus Web Components
run: npm ci
working-directory: ./stencil-workspace

- name: Build Modus Web Components
run: npm run build
working-directory: ./stencil-workspace

- name: npm install
run: npm i
working-directory: ./angular-workspace/ng${{ github.event.inputs.angularVersion }}/projects/trimble-oss/modus-angular-components
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/publish-react.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ jobs:
node-version: '16.x'
registry-url: 'https://registry.npmjs.org'

- name: Install Modus Web Components
run: npm ci
working-directory: ./stencil-workspace

- name: Build Modus Web Components
run: npm run build
working-directory: ./stencil-workspace

- name: Install React ${{ github.event.inputs.reactVersion }}
run: npm ci

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/super-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches-ignore:
- 'dependabot/**'

permissions: # added using https://github.com/step-security/secure-workflows
permissions:
contents: read

jobs:
Expand All @@ -25,7 +25,7 @@ jobs:
fetch-depth: 0

- name: Lint Code Base
uses: github/super-linter/slim@v5
uses: github/super-linter/slim@v6
env:
DEFAULT_BRANCH: main
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -36,6 +36,7 @@ jobs:
MARKDOWN_CONFIG_FILE: .markdownlint.json
SUPPRESS_POSSUM: true
VALIDATE_ALL_CODEBASE: false
VALIDATE_CHECKOV: false
VALIDATE_CSS: false
VALIDATE_EDITORCONFIG: false
VALIDATE_GITLEAKS: false
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ Thumbs.db
UserInterfaceState.xcuserstate
.env

**/stencil-generated/**

stencil-workspace/generate-icons/generate-icons.js
stencil-workspace/src/icons/generated-icons/*.tsx
stencil-workspace/src/icons/ModusIconMap.tsx
Expand Down
63 changes: 12 additions & 51 deletions angular-workspace/ng14/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion angular-workspace/ng14/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@angular/platform-browser": "^14.1.1",
"@angular/platform-browser-dynamic": "^14.1.1",
"@angular/router": "^14.1.1",
"@trimble-oss/modus-web-components": "0.22.0",
"@trimble-oss/modus-web-components": "0.27.0",
"rxjs": "~7.8.1",
"tslib": "^2.5.3",
"zone.js": "~0.12.0"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trimble-oss/modus-angular-components",
"version": "0.22.0-ng14",
"version": "0.27.0-ng14",
"license": "MIT",
"description": "Trimble Modus Angular Components Library",
"homepage": "https://modus-web-components.trimble.com/",
Expand All @@ -14,7 +14,7 @@
"peerDependencies": {
"@angular/common": "^14.1.1",
"@angular/core": "^14.1.1",
"@trimble-oss/modus-web-components": "0.22.0"
"@trimble-oss/modus-web-components": "0.27.0"
},
"dependencies": {
"tslib": "^2.5.3"
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit a470a2b

Please sign in to comment.