Merge pull request #636 from add2cal/dev

Dev
add2cal · Sep 30, 2024 · 39229c5 · 39229c5
2 parents d0c4bd4 + 7d43ef4
commit 39229c5
Show file tree

Hide file tree

Showing 33 changed files with 569 additions and 702 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -1,8 +1,6 @@
 name: 'CodeQL Analysis'
 
 on:
-  push:
-    branches: [main, dev]
   pull_request:
     branches: [main, dev]
 

diff --git a/prettier.config.js → .prettierrc.mjs b/prettier.config.js → .prettierrc.mjs
@@ -1,10 +1,10 @@
-/* eslint-disable no-undef */
-// prettier.config.js or .prettierrc.js
-module.exports = {
+/** @type {import("prettier").Config} */
+export default {
   proseWrap: 'preserve',
   embeddedLanguageFormatting: 'off',
   useTabs: false,
   singleQuote: true,
+  trailingComma: 'all',
   arrowParens: 'always',
   printWidth: 300,
   endOfLine: 'lf',

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -198,7 +198,7 @@ module.exports = function (grunt) {
         dest: 'dist/commonjs/index.js',
         options: {
           stripBanners: true,
-          banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
+          banner: "const tzlibActions = require('timezones-ical-library');\r\n",
           footer: 'module.exports = { atcb_action, i18nStrings, cssStyles: atcbCssTemplate, atcb_generate_ty, atcb_generate_timestring };',
           process: (content) => prepareFinalFile(content, true, true, true),
         },
@@ -208,7 +208,7 @@ module.exports = function (grunt) {
         dest: 'dist/commonjs/no-pro/index.js',
         options: {
           stripBanners: true,
-          banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
+          banner: "const tzlibActions = require('timezones-ical-library');\r\n",
           footer: 'module.exports = { atcb_action, i18nStrings, cssStyles: atcbCssTemplate };',
           process: (content) => prepareFinalFile(content, true, true, true),
         },
@@ -218,7 +218,7 @@ module.exports = function (grunt) {
         dest: 'dist/commonjs/unstyle/index.js',
         options: {
           stripBanners: true,
-          banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
+          banner: "const tzlibActions = require('timezones-ical-library');\r\n",
           footer: 'module.exports = { atcb_action, i18nStrings, atcb_generate_ty, atcb_generate_timestring };',
           process: (content) => prepareFinalFile(content, true, true, true, true),
         },
@@ -228,7 +228,7 @@ module.exports = function (grunt) {
         dest: 'dist/commonjs/no-pro-unstyle/index.js',
         options: {
           stripBanners: true,
-          banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
+          banner: "const tzlibActions = require('timezones-ical-library');\r\n",
           footer: 'module.exports = { atcb_action, i18nStrings };',
           process: (content) => prepareFinalFile(content, true, true, true, true),
         },
@@ -255,12 +255,6 @@ module.exports = function (grunt) {
           done();
         },
       },
-      '.eslintrc.json commonJS': {
-        'dist/commonjs/.eslintrc.json': function (fs, fd, done) {
-          fs.writeSync(fd, '{ "extends": "../../.eslintrc.json", "env": { "node": true }, "plugins": ["commonjs"] }');
-          done();
-        },
-      },
     },
     // minify js files
     uglify: {
@@ -269,7 +263,6 @@ module.exports = function (grunt) {
         mangle: true,
         beautify: false,
         sourceMap: false,
-        banner: '/* eslint-disable @typescript-eslint/no-unused-vars */',
         output: {
           comments: 'some',
         },

diff --git a/assets/css/atcb-3d.css b/assets/css/atcb-3d.css
@@ -5,7 +5,7 @@
  *
  * Style: 3D
  *
- * Version: 2.6.20
+ * Version: 2.6.21
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

diff --git a/assets/css/atcb-date.css b/assets/css/atcb-date.css
@@ -5,7 +5,7 @@
  *
  * Style: Date
  *
- * Version: 2.6.20
+ * Version: 2.6.21
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

diff --git a/assets/css/atcb-flat.css b/assets/css/atcb-flat.css
@@ -5,7 +5,7 @@
  *
  * Style: Flat
  *
- * Version: 2.6.20
+ * Version: 2.6.21
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

diff --git a/assets/css/atcb-neumorphism.css b/assets/css/atcb-neumorphism.css
@@ -5,7 +5,7 @@
  *
  * Style: Neumorphism
  *
- * Version: 2.6.20
+ * Version: 2.6.21
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

diff --git a/assets/css/atcb-round.css b/assets/css/atcb-round.css
@@ -5,7 +5,7 @@
  *
  * Style: Round
  *
- * Version: 2.6.20
+ * Version: 2.6.21
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

diff --git a/assets/css/atcb-text.css b/assets/css/atcb-text.css
@@ -5,7 +5,7 @@
  *
  * Style: Text
  *
- * Version: 2.6.20
+ * Version: 2.6.21
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

diff --git a/assets/css/atcb.css b/assets/css/atcb.css
@@ -5,7 +5,7 @@
  *
  * Style: Default
  *
- * Version: 2.6.20
+ * Version: 2.6.21
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

diff --git a/demo/components/footer.vue b/demo/components/footer.vue
@@ -70,7 +70,7 @@ function topFunction() {
             </span>
             <div class="mt-6 text-xs sm:mt-5 md:mt-3">
               <span class="font-semibold text-zinc-500 dark:text-zinc-400"> &copy; {{new Date().getFullYear()}} </span>
-              <span class="lowercase text-zinc-400 dark:text-zinc-500"> , Current Version: 2.6.20 </span>
+              <span class="lowercase text-zinc-400 dark:text-zinc-500"> , Current Version: 2.6.21 </span>
             </div>
           </div>
           <div class="hidden self-center sm:block">