Skip to content

Commit

Permalink
Merge pull request #153 from kommitters/v2.2
Browse files Browse the repository at this point in the history
Release V2.2.1
  • Loading branch information
JoseZapata3 authored Sep 10, 2024
2 parents 6a6d6ab + d727d0e commit feea4b7
Show file tree
Hide file tree
Showing 8 changed files with 285 additions and 270 deletions.
7 changes: 6 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ module.exports = {
rules: {
'class-methods-use-this': ['off'],
'no-underscore-dangle': ['error', { allowAfterThis: true }],
'no-restricted-globals': ['off']
'no-restricted-globals': ['off'],
'import/no-named-as-default': ['off'],
'import/no-named-as-default-member': ['off'],
'import/no-mutable-exports': ['off'],
'import/no-amd': ['off'],
'import/newline-after-import': ['off']
},
globals: {
fetch: false,
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
with:
disable-sudo: true
egress-policy: block
Expand All @@ -24,14 +24,14 @@ jobs:
registry.yarnpkg.com:443
objects.githubusercontent.com:443
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: Install modules
run: yarn
- name: Run linter
run: yarn lint
- name: Run tests
run: yarn test --coverage
- name: Coveralls
uses: coverallsapp/github-action@c203f016dd0ff7855ebef0ed852000c20c117148
uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
10 changes: 5 additions & 5 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
with:
disable-sudo: true
egress-policy: block
Expand All @@ -51,11 +51,11 @@ jobs:
objects.githubusercontent.com:443
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -68,7 +68,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -81,6 +81,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
with:
category: "/language:${{matrix.language}}"
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
with:
disable-sudo: true
egress-policy: block
Expand All @@ -20,9 +20,9 @@ jobs:
registry.yarnpkg.com:443
objects.githubusercontent.com:443
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
- uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
with:
node-version: "16.x"
registry-url: "https://registry.npmjs.org"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1
with:
disable-sudo: true
egress-policy: block
Expand All @@ -37,12 +37,12 @@ jobs:
*.storage.googleapis.com:443
- name: "Checkout code"
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -61,14 +61,14 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
with:
sarif_file: results.sarif
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 2.2.1 (10.09.2024)
* Update dependencies for compatibility and disable rules that are incompatible with ESLint v9. See [PR #150](https://github.com/kommitters/editorjs-inline-image/pull/150)

## 2.2.0 (06.09.2024)
* Add the ability to modify the quality and dimensions of selected images by adding parameters to the image URL in the Unsplash element configuration, in accordance with the Unsplash API. See [PR #147](https://github.com/kommitters/editorjs-inline-image/pull/147)

Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "editorjs-inline-image",
"version": "2.2.0",
"version": "2.2.1",
"keywords": [
"tool",
"image",
Expand All @@ -16,8 +16,8 @@
"build": "webpack --mode production",
"build:dev": "webpack --mode development --watch",
"test": "jest",
"lint": "eslint src/ test/ --ext .js",
"lint:fix": "eslint src/ test/ --ext .js --fix"
"lint": "ESLINT_USE_FLAT_CONFIG=false eslint src/ test/ --ext .js",
"lint:fix": "ESLINT_USE_FLAT_CONFIG=false eslint src/ test/ --ext .js --fix"
},
"author": {
"name": "kommitters Open Source",
Expand All @@ -29,21 +29,21 @@
"@testing-library/jest-dom": "^6.0.0",
"babel-jest": "^29.0.0",
"babel-loader": "^9.0.0",
"css-loader": "^6.5.1",
"eslint": "8.57.0",
"css-loader": "^7.0.0",
"eslint": "9.10.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-jest": "^27.0.0",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-jest": "^28.8.3",
"jest": "^29.0.0",
"jest-environment-jsdom": "^29.3.1",
"nock": "^13.0.0",
"style-loader": "^3.3.0",
"style-loader": "^4.0.0",
"svg-inline-loader": "^0.8.2",
"webpack": "^5.76.0",
"webpack-cli": "^5.0.0"
},
"dependencies": {
"axios": "1.6.8"
"axios": "1.7.7"
},
"jest": {
"testEnvironment": "jsdom",
Expand Down
Loading

0 comments on commit feea4b7

Please sign in to comment.