Skip to content

Commit

Permalink
Merge branch 'master' into nav
Browse files Browse the repository at this point in the history
  • Loading branch information
oakesjosh committed Feb 27, 2024
2 parents c792ff4 + 4feda61 commit 5cdf624
Show file tree
Hide file tree
Showing 204 changed files with 1,766 additions and 1,952 deletions.
12 changes: 8 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
**/*.build.js
**/node_modules/**
**/vendor/**
dist
build
coverage
cypress
node_modules
vendor
gulp
bin
includes/assets/js/
src/packages/
src/assets/js/scroll-magic.js
src/assets/js/progressBar.js
src/assets/js/countUp.js
src/assets/js/kt-table-of-contents.js
26 changes: 11 additions & 15 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,24 @@ const eslintConfig = {
},
},
},
globals: {
kt_blocks_params: 'readonly',
kadence_blocks_params: 'writeable',
kt_deregister_params: 'readonly',
kadence_blocks_user_params: 'readonly',
},
rules: {
'import/no-extraneous-dependencies': 'off',
'import/no-unresolved': 'off',
'import/named': 'off',
// '@wordpress/i18n-text-domain': [ --- From here down we should start enabling rules and fixing errors
// 'error',
// {
// allowedTextDomain: ['kadence-blocks'],
// },
// ],
'import/no-extraneous-dependencies': 'off',
'import/no-unresolved': 'off',
'import/named': 'off',
'no-unused-vars': 'off',
'react-hooks/exhaustive-deps': 'off',
'dot-notation': 'off',
'object-shorthand': 'off',
'prefer-const': 'off',
'no-shadow': 'off',
'@wordpress/i18n-ellipsis': 'off',
'jsdoc/require-param': 'off',
Expand All @@ -37,30 +40,24 @@ const eslintConfig = {
'react-hooks/rules-of-hooks': 'off',
'no-console': 'off',
'react/jsx-no-target-blank': 'off',
'no-var': 'off',
'array-callback-return': 'off',
'jsdoc/check-types': 'off',
'jsdoc/check-tag-names': 'off',
'jsdoc/newline-after-description': 'off',
'no-duplicate-imports': 'off',
'jsx-a11y/label-has-associated-control': 'off',
eqeqeq: 'off',
'no-unused-expressions': 'off',
'jsx-a11y/no-autofocus': 'off',
'no-var': 'off',
'no-unreachable': 'off',
'@wordpress/i18n-translator-comments': 'off',
'jsdoc/check-line-alignment': 'off',
'no-useless-computed-key': 'off',
'@wordpress/no-unused-vars-before-return': 'off',
'react/no-unknown-property': 'off',
'no-dupe-keys': 'off',
'react/jsx-key': 'off',
'jsdoc/check-param-names': 'off',
'jsdoc/no-undefined-types': 'off',
'react/jsx-no-undef': 'off',
'jsx-a11y/click-events-have-key-events': 'off',
'no-lonely-if': 'off',
'no-else-return': 'off',
'jsdoc/valid-types': 'off',
'jsx-a11y/interactive-supports-focus': 'off',
'jsdoc/require-returns-description': 'off',
Expand All @@ -78,12 +75,11 @@ const eslintConfig = {
'jsx-a11y/iframe-has-title': 'off',
'jsdoc/empty-tags': 'off',
'no-bitwise': 'off',
'no-cond-assign': 'off',
'jsdoc/require-returns-check': 'off',
'@wordpress/no-global-active-element': 'off',
'jsx-a11y/anchor-has-content': 'off',
},
ignorePatterns: ['node_modules/', 'dist/', 'build/', 'vendor/', 'gulp/', 'src/packages/'],
ignorePatterns: [],
};

module.exports = eslintConfig;
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@

# Apply Prettier formatting
5484ce8508d62006269fc6a50d89790104ec6371
ed41efaa02bb759f1be83a19ec87e76e8acc2b88
16 changes: 16 additions & 0 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: ESLint
run-name: '[ESLint] ${{ github.event.head_commit.message }}'

on: push
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
- run: npm ci --ignore-scripts --legacy-peer-deps
- run: npm rebuild && npm run prepare --if-present
- name: Run ESLint
run: npm run lint-js
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dist/
zip/
bin/strauss.phar
.idea
.vscode
/vendor/
/vendor-prefixed/
bin/pup.phar
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
**/*.min.js
/src/packages/**
**/node_modules/**
**/vendor/**
1 change: 1 addition & 0 deletions gulp/tasks/js.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ function copyVendorFiles() {
};
})
)
.pipe(minify(config.minify))
.pipe(dest(config.dirs.dist + '/js'));
}

Expand Down
2 changes: 1 addition & 1 deletion includes/assets/js/admin-scripts.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion includes/assets/js/countUp.min.js

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

2 changes: 1 addition & 1 deletion includes/assets/js/glightbox.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion includes/assets/js/gumshoe.min.js

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

Loading

0 comments on commit 5cdf624

Please sign in to comment.