Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect HTML <input> tag #865

Merged
merged 2 commits into from
Feb 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions .github/workflows/prettier-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Prettier hook for PRs

on:
pull_request:
types: [opened, synchronize, reopened, closed]
branches: [develop, master]
push:
branches: [develop, master]

jobs:
ci-pr:
# Run on any change from PR or direct push, but don't run on a cancel PR
if: github.event_name != 'pull_request' || (
github.event.action == 'opened' ||
github.event.action == 'synchronize' ||
github.event.action == 'reopened' && github.event.before != github.event.after ||
github.event.action == 'closed' && github.event.pull_request.merged == true
)

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: "latest"
cache: "npm"

- name: Install dependencies
run: npm ci

- name: Confirm code format
run: npm prettier

- name: Commit changes
run: |
git config --global user.name "maria[bot]"
git config --global user.email "maria[bot]@users.noreply.github.com"
git add .
git commit -m "Auto-format code with prettier" || echo "No changes to commit"
git push

ci-close-pr:
# Run on a cancel PR
if: github.event_name == 'pull_request' && github.event.pull_request.merged == false

runs-on: ubuntu-latest

steps:
- name: Just report closed, nothing to do
run: |
echo PR #${{ github.event.number }} has been closed, not merged
48 changes: 24 additions & 24 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"esversion": 11,
"node": true,
"esversion": 11,
"node": true,
"browser": true,
"bitwise": true,
"camelcase": true,
Expand All @@ -21,27 +21,27 @@
"-W069": true,
"-W083": true,
"-W084": true,
"globals": {
"iceStudio":false,
"Icestudio":false,
"iceStudioReady":false,
"domCache":false,
"iprof":false,
"IceProfiler":false,
"IceBlock":false,
"subModuleActive":false,
"ICEpm":false,
"IcePlugManager":false,
"iceConsole":false,
"IceLogger":false,
"IceEventBus":false,
"IceTemplateSystem":false,
"IceParametricHelper":false,
"Mustache":false,
"jexcel":false,
"nw":false,
"Snap":false,
"mina":false,
"globals": {
"iceStudio": false,
"Icestudio": false,
"iceStudioReady": false,
"domCache": false,
"iprof": false,
"IceProfiler": false,
"IceBlock": false,
"subModuleActive": false,
"ICEpm": false,
"IcePlugManager": false,
"iceConsole": false,
"IceLogger": false,
"IceEventBus": false,
"IceTemplateSystem": false,
"IceParametricHelper": false,
"Mustache": false,
"jexcel": false,
"nw": false,
"Snap": false,
"mina": false,
"$": false,
"angular": false,
"console": false,
Expand All @@ -55,7 +55,7 @@
"ace": false,
"g": false,
"V": false,
"IceCollection":false,
"IceCollection": false,
"IceHD": false,
"WafleModal": false
}
Expand Down
6 changes: 6 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
resources/libs/vendor/
resources/fonts/
*.md
icerok/vendor/sweetalert2.min.js
icerok/css/*.min.css
Gruntfile.js
4 changes: 4 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"quoteProps": "consistent",
"trailingComma": "es5"
}
5 changes: 2 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ module.exports = function (grunt) {
},

//-- Download NWjs for ARM arquitecture, as it is not part of the
//-- oficial NWjs project
//-- official NWjs project
//-- It is downloaded during the ARM build process
//-- Only ARM
nwjsAarch64: {
Expand Down Expand Up @@ -1234,8 +1234,7 @@ module.exports = function (grunt) {
path: MAC_EXEC_FILE,
},
],
/* -- For code oficial packages of Icestudio, for developers maintain commented

/* -- For code official packages of Icestudio, for developers maintain commented
"code-sign": {
"signing-identity": "XXXX",
}
Expand Down
Loading
Loading