Skip to content

Commit

Permalink
Merge branch 'refs/heads/develop' into flatprogress
Browse files Browse the repository at this point in the history
  • Loading branch information
lubber-de committed Apr 26, 2024
2 parents 6f5c63e + 25a76d7 commit 32a14cd
Show file tree
Hide file tree
Showing 86 changed files with 2,420 additions and 691 deletions.
21 changes: 20 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -658,10 +658,29 @@
"contributions": [
"security"
]
},
{
"login": "alvarolm",
"name": "Alvaro",
"avatar_url": "https://avatars.githubusercontent.com/u/2561547?v=4",
"profile": "https://twitter.com/alvarofleiva",
"contributions": [
"code"
]
},
{
"login": "Festiis",
"name": "Festim Nuredini",
"avatar_url": "https://avatars.githubusercontent.com/u/44016065?v=4",
"profile": "https://github.com/Festiis",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 4,
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true
"skipCi": true,
"commitType": "docs"
}
17 changes: 17 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module.exports = {
'/test/helpers',
],
rules: {
'brace-style': ['error', '1tbs'],
'class-methods-use-this': 'off',
'comma-dangle': ['error', {
arrays: 'always-multiline',
Expand Down Expand Up @@ -120,4 +121,20 @@ module.exports = {
globals: {
jQuery: true,
},
overrides: [{
files: ['**/*.ts'],
parser: '@typescript-eslint/parser',
extends: [
'plugin:@typescript-eslint/recommended',
],
rules: {
// https://typescript-eslint.io/rules/no-use-before-define#how-to-use
'no-use-before-define': 'off',

// TODO rules with a lot of errors to be fixed manually, fix in a separate PR
'@typescript-eslint/ban-types': 'off', // 16 eslint errors only, help wanted!
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/triple-slash-reference': 'off',
},
}],
};
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# These are supported funding model platforms

github: [y0hami, lubber-de]
github: [lubber-de]
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
- name: Install dependencies
run: yarn && yarn add -D eslint-config-airbnb-base@^15 eslint-plugin-unicorn@^46 eslint-plugin-jest@^26.9.0 @typescript-eslint/eslint-plugin @typescript-eslint/parser typescript
- name: Lint JS and LESS files
Expand All @@ -30,7 +30,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: pre-install
Expand All @@ -48,11 +48,11 @@ jobs:
security-events: write
steps:
- uses: actions/checkout@v4
- uses: github/codeql-action/init@v2
- uses: github/codeql-action/init@v3
with:
languages: 'javascript'
config-file: ./.github/codeql/codeql-config.yml
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
14 changes: 14 additions & 0 deletions .github/workflows/depsreview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: 'Dependency Review'
on: [pull_request]

permissions:
contents: read

jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v4
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
with:
ref: develop
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
registry-url: https://registry.npmjs.org/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4
with:
ref: master
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
registry-url: https://registry.npmjs.org/
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ This is a list of all project contributors powered by [All Contributors](https:/
<tr>
<td align="center" valign="top" width="25%"><a href="http://www.mathieumitchell.com"><img src="https://avatars.githubusercontent.com/u/234168?v=4?s=60" width="60px;" alt="Mathieu Mitchell"/><br /><sub><b>Mathieu Mitchell</b></sub></a><br /><a href="https://github.com/fomantic/Fomantic-UI/commits?author=mat128" title="Code">💻</a></td>
<td align="center" valign="top" width="25%"><a href="https://github.com/brian-codes"><img src="https://avatars.githubusercontent.com/u/37519149?v=4?s=60" width="60px;" alt="Brian McCluskey"/><br /><sub><b>Brian McCluskey</b></sub></a><br /><a href="#security-brian-codes" title="Security">🛡️</a></td>
<td align="center" valign="top" width="25%"><a href="https://twitter.com/alvarofleiva"><img src="https://avatars.githubusercontent.com/u/2561547?v=4?s=60" width="60px;" alt="Alvaro"/><br /><sub><b>Alvaro</b></sub></a><br /><a href="https://github.com/fomantic/Fomantic-UI/commits?author=alvarolm" title="Code">💻</a></td>
<td align="center" valign="top" width="25%"><a href="https://github.com/Festiis"><img src="https://avatars.githubusercontent.com/u/44016065?v=4?s=60" width="60px;" alt="Festim Nuredini"/><br /><sub><b>Festim Nuredini</b></sub></a><br /><a href="https://github.com/fomantic/Fomantic-UI/commits?author=Festiis" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
14 changes: 2 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ Fomantic includes an interactive installer to help setup your project.

| Environment | Install Command | Repository | Third-Party |
|-------------|---------------------------------------|------------------------------------------------------------------|-------------|
| CSS Only | `npm install fomantic-ui-css` | [Fomantic-UI-CSS](https://github.com/fomantic/Fomantic-UI-CSS) | |
| LESS | `npm install fomantic-ui-less` | [Fomantic-UI-LESS](https://github.com/fomantic/Fomantic-UI-LESS) | |
| CSS Only | `npm install fomantic-ui-css` | [Fomantic-UI-CSS](https://github.com/fomantic/Fomantic-UI-CSS) | |
| LESS | `npm install fomantic-ui-less` | [Fomantic-UI-LESS](https://github.com/fomantic/Fomantic-UI-LESS) | |
| SASS | `gem 'fomantic-ui-sass'` | [Fomantic-UI-SASS](https://github.com/fomantic/Fomantic-UI-SASS) ||

---
Expand All @@ -94,20 +94,10 @@ Before creating a pull request be sure to read the [Contributing Guide](CONTRIBU

## Sponsors

### Infrastructure hosted and powered by [DigitalOcean](https://www.digitalocean.com/?utm_medium=opensource&utm_source=fomantic)
[![DigitalOcean](https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PNG/DO_Logo_Horizontal_Blue.png)](https://www.digitalocean.com/?utm_medium=opensource&utm_source=fomantic)

Sign up now and get $100 in credit for 60 days! [Sign up here!](https://m.do.co/c/bece3e1afb7f)


### Cross-browser testing provided by [BrowserStack](https://www.browserstack.com)
[![BrowserStack](https://cdn.rawgit.com/fomantic/Fomantic-UI-Docs/35180e95/server/raw/images/browserstack.png)](https://www.browserstack.com)


### IDE's provided by [JetBrains](https://www.jetbrains.com?from=Fomantic-UI)
[![JetBrains](https://fomantic-ui.com/images/jetbrains.svg)](https://www.jetbrains.com?from=Fomantic-UI)

---

#### Credit
Semantic-UI was beautifully crafted by [@jlukic](https://github.com/jlukic)
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"scripts": {
"build": "gulp build",
"changelog": "auto-changelog -p",
"lint": "eslint --ext .js . && stylelint \"**/*.{css,less,overrides,variables}\"",
"lint-fix": "eslint --ext .js . --fix && stylelint \"**/*.{css,less,overrides,variables}\" --fix"
"lint": "eslint --ext .js,.ts . && stylelint \"**/*.{css,less,overrides,variables}\"",
"lint-fix": "eslint --ext .js,.ts . --fix && stylelint \"**/*.{css,less,overrides,variables}\" --fix"
},
"dependencies": {
"@actions/core": "^1.6.0",
Expand Down
8 changes: 6 additions & 2 deletions src/definitions/behaviors/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,9 @@
module.debug('Adding error state');
module.set.error();
if (module.should.removeError()) {
setTimeout(function () { module.remove.error(); }, settings.errorDuration);
setTimeout(function () {
module.remove.error();
}, settings.errorDuration);
}
}
module.debug('API Request failed', errorMessage, xhr);
Expand Down Expand Up @@ -971,7 +973,9 @@
});
}
clearTimeout(module.performance.timer);
module.performance.timer = setTimeout(function () { module.performance.display(); }, 500);
module.performance.timer = setTimeout(function () {
module.performance.display();
}, 500);
},
display: function () {
var
Expand Down
Loading

0 comments on commit 32a14cd

Please sign in to comment.