Skip to content

Commit cd2ed45

Browse files
Merge pull request #377 from KristjanESPERANTO/main
Release v1.4.7
2 parents d1dd52f + 5129abb commit cd2ed45

9 files changed

Lines changed: 377 additions & 1771 deletions

File tree

.github/workflows/automated-tests.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ on:
44
branches: [main, develop]
55
pull_request:
66
branches: [main, develop]
7-
permissions: read-all
7+
8+
permissions:
9+
contents: read
10+
811
jobs:
912
run-lint:
1013
runs-on: ubuntu-latest
@@ -20,10 +23,12 @@ jobs:
2023
- name: Use Node.js
2124
uses: actions/setup-node@v4
2225
with:
23-
node-version: 20
24-
cache: "npm"
25-
- name: Install dependencies and run tests
26-
run: |
27-
npm install
28-
npm run lint
26+
node-version: lts/*
27+
cache: npm
28+
- name: Install dependencies
29+
run: npm ci
30+
- name: Check formatting
31+
run: npm run prettier
32+
- name: Check linting
33+
run: npm run lint
2934
- run: echo "🍏 This job's status is ${{ job.status }}."

.github/workflows/codeql-analysis.yaml

Lines changed: 58 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,62 +9,91 @@
99
# the `language` matrix defined below to confirm you have the correct set of
1010
# supported CodeQL languages.
1111
#
12-
name: "CodeQL"
12+
name: "CodeQL Advanced"
1313

1414
on:
1515
push:
16-
branches: [main]
16+
branches: ["main"]
1717
pull_request:
18-
# The branches below must be a subset of the branches above
19-
branches: [main]
18+
branches: ["main"]
2019
schedule:
21-
- cron: "43 19 * * 6"
22-
permissions: read-all
20+
- cron: "40 21 * * 1"
21+
permissions:
22+
contents: read
2323
jobs:
2424
analyze:
25-
name: Analyze
26-
runs-on: ubuntu-latest
25+
name: Analyze (${{ matrix.language }})
26+
# Runner size impacts CodeQL analysis time. To learn more, please see:
27+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
28+
# - https://gh.io/supported-runners-and-hardware-resources
29+
# - https://gh.io/using-larger-runners (GitHub.com only)
30+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
31+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
2732
permissions:
33+
# required for all workflows
34+
security-events: write
35+
36+
# required to fetch internal or private CodeQL packs
37+
packages: read
38+
39+
# only required for workflows in private repositories
2840
actions: read
2941
contents: read
30-
security-events: write
3142

3243
strategy:
3344
fail-fast: false
3445
matrix:
35-
language: ["javascript"]
36-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37-
# Learn more about CodeQL language support at https://git.io/codeql-language-support
38-
46+
include:
47+
- language: javascript-typescript
48+
build-mode: none
49+
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
50+
# Use `c-cpp` to analyze code written in C, C++ or both
51+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
52+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
53+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
54+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
55+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
56+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
3957
steps:
4058
- name: Checkout repository
4159
uses: actions/checkout@v4
4260

61+
# Add any setup steps before running the `github/codeql-action/init` action.
62+
# This includes steps like installing compilers or runtimes (`actions/setup-node`
63+
# or others). This is typically only required for manual builds.
64+
# - name: Setup runtime (example)
65+
# uses: actions/setup-example@v1
66+
4367
# Initializes the CodeQL tools for scanning.
4468
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v2
69+
uses: github/codeql-action/init@v3
4670
with:
4771
languages: ${{ matrix.language }}
72+
build-mode: ${{ matrix.build-mode }}
4873
# If you wish to specify custom queries, you can do so here or in a config file.
4974
# By default, queries listed here will override any specified in a config file.
5075
# Prefix the list here with "+" to use these queries and those in the config file.
51-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5276

53-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
54-
# If this step fails, then you should remove it and run the build manually (see below)
55-
- name: Autobuild
56-
uses: github/codeql-action/autobuild@v2
77+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
78+
# queries: security-extended,security-and-quality
5779

80+
# If the analyze step fails for one of the languages you are analyzing with
81+
# "We were unable to automatically build your code", modify the matrix above
82+
# to set the build mode to "manual" for that language. Then modify this step
83+
# to build your code.
5884
# ℹ️ Command-line programs to run using the OS shell.
59-
# 📚 https://git.io/JvXDl
60-
61-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
62-
# and modify them (or add more) to build your code if your project
63-
# uses a compiled language
64-
65-
#- run: |
66-
# make bootstrap
67-
# make release
85+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
86+
- if: matrix.build-mode == 'manual'
87+
shell: bash
88+
run: |
89+
echo 'If you are using a "manual" build mode for one or more of the' \
90+
'languages you are analyzing, replace this with the commands to build' \
91+
'your code, for example:'
92+
echo ' make bootstrap'
93+
echo ' make release'
94+
exit 1
6895
6996
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v2
97+
uses: github/codeql-action/analyze@v3
98+
with:
99+
category: "/language:${{matrix.language}}"

.github/workflows/superlinter.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
3838
# Runs the Super-Linter action
3939
- name: Run Super-Linter
40-
uses: super-linter/super-linter/slim@v6
40+
uses: super-linter/super-linter/slim@v7
4141
env:
4242
DEFAULT_BRANCH: main
4343
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](https://semver.org/).
55

6+
## [1.4.7] 2025-03-04 - Maintenance update
7+
8+
- Update CodeQL workflow
9+
- Switch to superlinter 7
10+
- Add formatting check step to CI
11+
- Replace eslint-plugin-import by eslint-plugin-import
12+
- Update devDependencies
13+
- Simplify ESLint calls
14+
- Remove unused release script
15+
- Sort pakckage.json the npm standard way
16+
617
## [1.4.6] 2025-02-02 - Maintenance update
718

819
- Remove unused dependency `valid-url`
@@ -116,3 +127,12 @@ title: (mObj) => { // moment object for first slot of view.
116127
## [1.0.1]
117128

118129
- `view:transform()` is added, now you can modify event value as your wish.
130+
131+
[1.4.7]: https://github.com/MMM-CalendarExt2/MMM-CalendarExt2/compare/v1.4.6...v1.4.7
132+
[1.4.6]: https://github.com/MMM-CalendarExt2/MMM-CalendarExt2/compare/v1.4.5...v1.4.6
133+
[1.4.5]: https://github.com/MMM-CalendarExt2/MMM-CalendarExt2/compare/v1.4.4...v1.4.5
134+
[1.4.4]: https://github.com/MMM-CalendarExt2/MMM-CalendarExt2/compare/v1.4.3...v1.4.4
135+
[1.4.3]: https://github.com/MMM-CalendarExt2/MMM-CalendarExt2/compare/v1.4.2...v1.4.3
136+
[1.4.2]: https://github.com/MMM-CalendarExt2/MMM-CalendarExt2/compare/v1.4.1...v1.4.2
137+
[1.4.1]: https://github.com/MMM-CalendarExt2/MMM-CalendarExt2/compare/v1.4.0...v1.4.1
138+
[1.4.0]: https://github.com/MMM-CalendarExt2/MMM-CalendarExt2/compare/v1.3.0...v1.4.0

MMM-CalendarExt2.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,8 @@
307307
left: 0;
308308
right: 0;
309309
bottom: 0;
310-
background: repeating-linear-gradient(
310+
background:
311+
repeating-linear-gradient(
311312
45deg,
312313
transparent,
313314
transparent 10px,

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ Pull requests are of course also very welcome 🙂
9393
- `npm run prettier` - Run formatter checks.
9494
- `npm run prettier:fix` - Fix formatter issues.
9595
- `npm run test` - Run linting and formatter checks.
96-
- `npm run release` - Bump version for release.
9796

9897
## MEMO
9998

eslint.config.mjs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import eslintPluginImport from "eslint-plugin-import";
1+
import eslintPluginImport from "eslint-plugin-import-x";
22
import eslintPluginJs from "@eslint/js";
33
import eslintPluginJsonc from "eslint-plugin-jsonc";
44
import eslintPluginStylistic from "@stylistic/eslint-plugin";
@@ -7,6 +7,7 @@ import globals from "globals";
77
const config = [
88
eslintPluginImport.flatConfigs.recommended,
99
eslintPluginJs.configs.all,
10+
eslintPluginStylistic.configs.all,
1011
...eslintPluginJsonc.configs["flat/recommended-with-jsonc"],
1112
{
1213
"ignores": ["package-lock.json"]
@@ -21,11 +22,7 @@ const config = [
2122
},
2223
"sourceType": "commonjs"
2324
},
24-
"plugins": {
25-
...eslintPluginStylistic.configs["all-flat"].plugins
26-
},
2725
"rules": {
28-
...eslintPluginStylistic.configs["all-flat"].rules,
2926
"@stylistic/dot-location": ["error", "property"],
3027
"@stylistic/function-call-argument-newline": "off",
3128
"@stylistic/function-paren-newline": "off",
@@ -82,11 +79,7 @@ const config = [
8279
},
8380
"sourceType": "module"
8481
},
85-
"plugins": {
86-
...eslintPluginStylistic.configs["all-flat"].plugins
87-
},
8882
"rules": {
89-
...eslintPluginStylistic.configs["all-flat"].rules,
9083
"@stylistic/array-element-newline": "off",
9184
"@stylistic/indent": ["error", 2],
9285
"no-magic-numbers": "off"

0 commit comments

Comments
 (0)