Skip to content

Commit 39229c5

Browse files
authored
Merge pull request #636 from add2cal/dev
Dev
2 parents d0c4bd4 + 7d43ef4 commit 39229c5

33 files changed

+569
-702
lines changed

.eslintrc.json

Lines changed: 0 additions & 36 deletions
This file was deleted.

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: 'CodeQL Analysis'
22

33
on:
4-
push:
5-
branches: [main, dev]
64
pull_request:
75
branches: [main, dev]
86

prettier.config.js renamed to .prettierrc.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
/* eslint-disable no-undef */
2-
// prettier.config.js or .prettierrc.js
3-
module.exports = {
1+
/** @type {import("prettier").Config} */
2+
export default {
43
proseWrap: 'preserve',
54
embeddedLanguageFormatting: 'off',
65
useTabs: false,
76
singleQuote: true,
7+
trailingComma: 'all',
88
arrowParens: 'always',
99
printWidth: 300,
1010
endOfLine: 'lf',

Gruntfile.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ module.exports = function (grunt) {
198198
dest: 'dist/commonjs/index.js',
199199
options: {
200200
stripBanners: true,
201-
banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
201+
banner: "const tzlibActions = require('timezones-ical-library');\r\n",
202202
footer: 'module.exports = { atcb_action, i18nStrings, cssStyles: atcbCssTemplate, atcb_generate_ty, atcb_generate_timestring };',
203203
process: (content) => prepareFinalFile(content, true, true, true),
204204
},
@@ -208,7 +208,7 @@ module.exports = function (grunt) {
208208
dest: 'dist/commonjs/no-pro/index.js',
209209
options: {
210210
stripBanners: true,
211-
banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
211+
banner: "const tzlibActions = require('timezones-ical-library');\r\n",
212212
footer: 'module.exports = { atcb_action, i18nStrings, cssStyles: atcbCssTemplate };',
213213
process: (content) => prepareFinalFile(content, true, true, true),
214214
},
@@ -218,7 +218,7 @@ module.exports = function (grunt) {
218218
dest: 'dist/commonjs/unstyle/index.js',
219219
options: {
220220
stripBanners: true,
221-
banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
221+
banner: "const tzlibActions = require('timezones-ical-library');\r\n",
222222
footer: 'module.exports = { atcb_action, i18nStrings, atcb_generate_ty, atcb_generate_timestring };',
223223
process: (content) => prepareFinalFile(content, true, true, true, true),
224224
},
@@ -228,7 +228,7 @@ module.exports = function (grunt) {
228228
dest: 'dist/commonjs/no-pro-unstyle/index.js',
229229
options: {
230230
stripBanners: true,
231-
banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
231+
banner: "const tzlibActions = require('timezones-ical-library');\r\n",
232232
footer: 'module.exports = { atcb_action, i18nStrings };',
233233
process: (content) => prepareFinalFile(content, true, true, true, true),
234234
},
@@ -255,12 +255,6 @@ module.exports = function (grunt) {
255255
done();
256256
},
257257
},
258-
'.eslintrc.json commonJS': {
259-
'dist/commonjs/.eslintrc.json': function (fs, fd, done) {
260-
fs.writeSync(fd, '{ "extends": "../../.eslintrc.json", "env": { "node": true }, "plugins": ["commonjs"] }');
261-
done();
262-
},
263-
},
264258
},
265259
// minify js files
266260
uglify: {
@@ -269,7 +263,6 @@ module.exports = function (grunt) {
269263
mangle: true,
270264
beautify: false,
271265
sourceMap: false,
272-
banner: '/* eslint-disable @typescript-eslint/no-unused-vars */',
273266
output: {
274267
comments: 'some',
275268
},

assets/css/atcb-3d.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: 3D
77
*
8-
* Version: 2.6.20
8+
* Version: 2.6.21
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

assets/css/atcb-date.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Date
77
*
8-
* Version: 2.6.20
8+
* Version: 2.6.21
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

assets/css/atcb-flat.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Flat
77
*
8-
* Version: 2.6.20
8+
* Version: 2.6.21
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

assets/css/atcb-neumorphism.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Neumorphism
77
*
8-
* Version: 2.6.20
8+
* Version: 2.6.21
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

assets/css/atcb-round.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Round
77
*
8-
* Version: 2.6.20
8+
* Version: 2.6.21
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

assets/css/atcb-text.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Text
77
*
8-
* Version: 2.6.20
8+
* Version: 2.6.21
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

assets/css/atcb.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Default
77
*
8-
* Version: 2.6.20
8+
* Version: 2.6.21
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

demo/components/footer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function topFunction() {
7070
</span>
7171
<div class="mt-6 text-xs sm:mt-5 md:mt-3">
7272
<span class="font-semibold text-zinc-500 dark:text-zinc-400"> &copy; {{new Date().getFullYear()}} </span>
73-
<span class="lowercase text-zinc-400 dark:text-zinc-500"> , Current Version: 2.6.20 </span>
73+
<span class="lowercase text-zinc-400 dark:text-zinc-500"> , Current Version: 2.6.21 </span>
7474
</div>
7575
</div>
7676
<div class="hidden self-center sm:block">

0 commit comments

Comments
 (0)