Merge remote-tracking branch 'origin/DELIVERY-8' into DELIVERY-8

# Conflicts: # .gitignore
add missing dependency
2023-06-24 13:06:30 +02:00 · 2023-06-24 13:06:14 +02:00 · 2023-06-24 13:05:29 +02:00 · 2023-06-03 13:13:29 +02:00 · 2023-04-14 18:00:07 +02:00 · 2023-04-14 17:59:45 +02:00
7 changed files with 78 additions and 64 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,6 +6,9 @@ name: npm-publish-snapshot
 trigger:
  event:
    - push
+  branch:
+    exclude:
+      - master

 steps:
  - name: publish-snapshot
@@ -15,12 +18,38 @@ steps:
        from_secret: gitea_token
    commands:
      - VERSION=$(cat VERSION 2>/dev/null) || echo "1.0.0"
-      - SNAPSHOT=${VERSION}-snapshot.${DRONE_BUILD_NUMBER}
-      - echo "Current version=${VERSION}"
-      - echo "Snapshot version=${SNAPSHOT}"
-      - npm config set @ioprojects:registry https://git.endmove.eu/api/packages/io-projectsofficial/npm/
-      - npm config set -- '//git.endmove.eu/api/packages/io-projectsofficial/npm/:_authToken' "${GITEA_TOKEN}"
+      - SNAPSHOT="$(echo $VERSION)-snapshot.${DRONE_BUILD_NUMBER}"
+      - echo $VERSION
+      - echo $SNAPSHOT
      - npm ci
-      - npm version ${SNAPSHOT}
+      - npm version $SNAPSHOT
+      - npm publish --tag snapshot
+      # - npm dist-tag add @ioprojects/ui-eslint-base@$SNAPSHOT snapshot
+
+---
+kind: pipeline
+type: docker
+name: npm-publish-release
+
+trigger:
+  event:
+    - push
+  branch:
+    - master
+
+steps:
+  - name: publish-release
+    image: node:18
+    environment:
+      GITEA_TOKEN:
+        from_secret: gitea_token
+      VERSION: ${NEW_VERSION}
+    commands:
+      - git fetch --tags
+      - OLD_VERSION=$(cat VERSION 2>/dev/null) || echo "1.0.0"
+      - echo $NEW_VERSION
+      - echo $OLD_VERSION
+      - npm ci
+      - npm version $NEW_VERSION
      - npm publish
-      - npm dist-tag add @ioprojects/ui-eslint-base@${SNAPSHOT} snapshot
+      # - npm dist-tag add @ioprojects/ui-eslint-base@$SNAPSHOT snapshot
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -15,7 +15,7 @@
  },
  "extends": [
    "eslint:recommended",
-    "plugin:react/recommended",
+    "plugin:vue/vue3-essential",
    "plugin:@typescript-eslint/recommended",
    "plugin:prettier/recommended"
  ],
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 # Created by https://www.toptal.com/developers/gitignore/api/node
 # Edit at https://www.toptal.com/developers/gitignore?templates=node

+.idea
+
 ### Node ###
 # Logs
 logs
--- a/.npmrc
+++ b/.npmrc
@@ -0,0 +1,4 @@
+@ioprojects:registry=https://git.endmove.eu/api/packages/io-projectsofficial/npm/
+//git.endmove.eu/api/packages/io-projectsofficial/npm/:_authToken="${GITEA_TOKEN}"
+tag-version-prefix=""
+message="chore(ci): %s"
--- a/2
+++ b/2
@@ -1 +1 @@
-1.0.0
+1.0.4
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@ioprojects/ui-eslint-base",
-  "version": "1.0.0",
+  "version": "1.0.3",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@ioprojects/ui-eslint-base",
-      "version": "1.0.0",
+      "version": "1.0.3",
      "license": "SEE LICENSE IN THE LICENSE FILE",
      "dependencies": {
        "@typescript-eslint/eslint-plugin": "^5.58.0",
@@ -14,10 +14,11 @@
        "eslint": "^8.38.0",
        "eslint-config-prettier": "^8.8.0",
        "eslint-plugin-cypress": "^2.13.2",
-        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-import": "^2.26.0",
        "eslint-plugin-jest": "^27.2.1",
        "eslint-plugin-prettier": "^4.2.1",
-        "eslint-plugin-vue": "^9.10.0"
+        "eslint-plugin-vue": "^9.10.0",
+        "prettier": "^2.8.8"
      }
    },
    "node_modules/@eslint-community/eslint-utils": {
@@ -445,23 +446,6 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/available-typed-arrays": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
@@ -865,24 +849,22 @@
      }
    },
    "node_modules/eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
-        "debug": "^3.2.7",
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
        "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.8.1",
        "is-glob": "^4.0.3",
        "minimatch": "^3.1.2",
-        "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
        "tsconfig-paths": "^3.14.1"
      },
      "engines": {
@@ -893,11 +875,11 @@
      }
    },
    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
      "dependencies": {
-        "ms": "^2.1.1"
+        "ms": "2.0.0"
      }
    },
    "node_modules/eslint-plugin-import/node_modules/doctrine": {
@@ -911,13 +893,10 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/eslint-plugin-import/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
+    "node_modules/eslint-plugin-import/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
    },
    "node_modules/eslint-plugin-jest": {
      "version": "27.2.1",
@@ -2056,10 +2035,9 @@
      }
    },
    "node_modules/prettier": {
-      "version": "2.8.7",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz",
-      "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==",
-      "peer": true,
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
      "bin": {
        "prettier": "bin-prettier.js"
      },
@@ -2207,9 +2185,9 @@
      }
    },
    "node_modules/semver": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz",
-      "integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
      "dependencies": {
        "lru-cache": "^6.0.0"
      },
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@ioprojects/ui-eslint-base",
-  "version": "1.0.0",
+  "version": "1.0.4",
  "description": "NPM package for ESLINT configuration of IO-Projects TypeScript front-end projects",
  "main": ".eslintrc.json",
  "files": [
@@ -12,10 +12,11 @@
    "eslint": "^8.38.0",
    "eslint-config-prettier": "^8.8.0",
    "eslint-plugin-cypress": "^2.13.2",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.26.0",
    "eslint-plugin-jest": "^27.2.1",
    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "^9.10.0"
+    "eslint-plugin-vue": "^9.10.0",
+    "prettier": "^2.8.8"
  },
  "repository": {
    "type": "git",
Author	SHA1	Message	Date
EndMove	f4614efcfd	Merge remote-tracking branch 'origin/DELIVERY-8' into DELIVERY-8 All checks were successful continuous-integration/drone/push Build is passing Details # Conflicts: # .gitignore	2023-06-24 13:06:30 +02:00
EndMove	709e3e4318	add missing dependency	2023-06-24 13:06:14 +02:00
EndMove	bebf13d84b	add missing dependency All checks were successful continuous-integration/drone/push Build is passing Details	2023-06-24 13:05:29 +02:00
EndMove	f7df86b0b1	update for vue3 compilance All checks were successful continuous-integration/drone/push Build is passing Details	2023-06-03 13:13:29 +02:00
EndMove	f9459d64fa	chore(ci): 1.0.3 🎉	2023-04-14 18:00:07 +02:00
EndMove	c4cb05f79c	up All checks were successful continuous-integration/drone/push Build is passing Details	2023-04-14 17:59:45 +02:00
EndMove	a5fe28b31b	update drone to try create snapshot All checks were successful continuous-integration/drone/push Build is passing Details	2023-04-14 17:33:39 +02:00
EndMove	2803c35f53	up All checks were successful continuous-integration/drone/push Build is passing Details	2023-04-13 19:05:14 +02:00
EndMove	8090226ce1	last up Some checks failed continuous-integration/drone/push Build is failing Details	2023-04-13 19:00:29 +02:00
EndMove	13830d5ef6	test Some checks failed continuous-integration/drone/push Build is failing Details	2023-04-12 22:08:04 +02:00
EndMove	70e65d4173	up Some checks failed continuous-integration/drone/push Build is failing Details	2023-04-12 22:01:17 +02:00
EndMove	b457ec4520	up Some checks failed continuous-integration/drone/push Build is failing Details	2023-04-12 21:58:10 +02:00
EndMove	0fec432a37	update Some checks failed continuous-integration/drone/push Build is failing Details	2023-04-12 21:52:36 +02:00
EndMove	e2c4e42f37	upd Some checks failed continuous-integration/drone/push Build is failing Details	2023-04-12 21:28:25 +02:00
EndMove	afca2fb51e	update Some checks failed continuous-integration/drone/push Build is failing Details	2023-04-12 21:26:06 +02:00
EndMove	684da9c450	drone .yml Some checks failed continuous-integration/drone/push Build is failing Details	2023-04-12 21:20:37 +02:00
EndMove	afc102061d	update drone.yml Some checks failed continuous-integration/drone/push Build is failing Details	2023-04-12 21:17:39 +02:00
EndMove	c8598e0a87	update drone.yml Some checks failed continuous-integration/drone/push Build is failing Details	2023-04-12 21:13:08 +02:00
EndMove	17b1307c85	update drone.yml Some checks failed continuous-integration/drone/push Build is failing Details	2023-04-12 21:09:36 +02:00
@@ -1 +1 @@
 .0.0
 .0.4