@oliasoft-open-source/react-ui-library 1.0.0 → 2.1.0

package/.gitlab-ci.yml

@@ -1,5 +1,10 @@
+image: node:18
+
+stages:
+  - test
+  - release
+
 test:
-  image: node:18
   stage: test
   only:
     - merge_requests
@@ -13,33 +18,57 @@ cache:
     - node_modules/
     - public/
 
+# Public the static docs site (including Storybook) upon merge to master
 pages:
-  image: node:18
+  stage: release
+  only:
+    - master
   script:
-    - npm install
+    - npm install --progress=false --no-save
     - npm run build
     - cp public/index.html public/404.html
   artifacts:
     paths:
       - public
-  only:
-    - master
-
-publish:
-  stage: publish
-  only:
-    - tags
-  script:
-    - npm run ci-publish
 
+# Push a tag and publish to the public NPM registry upon merge to master
 publish:
-  stage: publish
+  stage: release
   only:
     - master
   script:
-    - echo '//gitlab.com/api/v4/packages/npm/:_authToken=${CI_JOB_TOKEN}' >> .npmrc
-    - echo '//gitlab.com/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken=${CI_JOB_TOKEN}' >.npmrc
-    - echo '@oliasoft:registry=https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/packages/npm/' >>.npmrc
-    -
-    - npm config set -- '//gitlab.com/api/v4/projects/<your_project_id>/packages/npm/:_authToken' "<your_token>"
-    - npm publish --access public
+    # Get the version from package.json
+    - VERSION=$(node -p "require('./package.json').version")
+    # Prepare .npmrc
+    - echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
+    # Configure git
+    - mkdir -p ~/.ssh
+    - echo "$SSH_PRIVATE_KEY_TOOLKIT" > ~/.ssh/id_rsa; chmod 0600 ~/.ssh/id_rsa
+    - echo "StrictHostKeyChecking no " > /root/.ssh/config
+    - git config --global http.sslVerify false
+    - git config --global user.email "$GITLAB_USER_EMAIL"
+    - git config --global user.name "🤖 GitLab CI/CD"
+    - echo "setting origin remote to 'git@$CI_SERVER_HOST:$CI_PROJECT_PATH.git'"
+    - git remote -v
+    - git remote rm origin
+    - git remote add origin git@$CI_SERVER_HOST:$CI_PROJECT_PATH.git
+    - git remote -v
+    - git branch
+    - git fetch --quiet
+    - git checkout "$CI_BUILD_REF_NAME"
+    - git fetch --tags --quiet
+    # Only complete pipeline if version does not already exist
+    - >
+      if [ $(git tag -l "$VERSION") ]; then
+        echo "Version $VERSION already exists"
+        exit 1
+      else
+        # Tag a release in gitlab
+        echo "Tagging release in git"
+        git tag $VERSION -m "🤖 Tagged by Gitlab CI/CD Pipeline" -m "For further reference see $CI_PIPELINE_URL" -m "[skip ci]"
+        echo "Pushing tag to remote repository"
+        git push origin $VERSION --no-verify
+        # Publish the NPM package to the public NPM registry
+        echo "Publishing package to NPM registry"
+        npm publish
+      fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oliasoft-open-source/react-ui-library",
-  "version": "1.0.0",
+  "version": "2.1.0",
   "description": "Reusable UI components for React projects",
   "main": "index.js",
   "scripts": {
@@ -106,6 +106,7 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.8.7",
+    "@infinium/react-keyboard-event-handler": "^1.5.8",
     "@mdx-js/loader": "^1.6.22",
     "@mdx-js/react": "^1.6.22",
     "@minoru/react-dnd-treeview": "^1.6.1",
@@ -124,7 +125,6 @@
     "react-faux-dom": "^4.5.0",
     "react-icons": "^4.2.0",
     "react-infinite-scroll-component": "^6.1.0",
-    "react-keyboard-event-handler": "^1.5.4",
     "react-laag": "^2.0.3",
     "react-router-dom": "^5.3.0",
     "react-svg": "^14.0.12",

package/src/components/select/custom-select/custom-select.jsx

@@ -3,7 +3,7 @@ import React, { useRef, useReducer, useEffect, useContext } from 'react';
 import PropTypes from 'prop-types';
 import { useLayer, mergeRefs } from 'react-laag';
 import ResizeObserver from 'resize-observer-polyfill';
-import KeyboardEventHandler from 'react-keyboard-event-handler';
+import KeyboardEventHandler from '@infinium/react-keyboard-event-handler';
 import { useFocus } from '../../../hooks';
 import { placementOptions } from './layer/placementOptions';
 import { Layer } from './layer/layer';