@datarailsshared/dr_renderer 1.2.8 → 1.2.9

package/.circleci/config.yml

@@ -1,8 +1,7 @@
-# Javascript Node CircleCI 2.0 configuration file
-#
-# Check {{ '/2.0/language-javascript/' | docs_url }} for more details
-#
-version: 2
+version: 2.1
+
+orbs:
+  datarails-cicd-orb: datarails-ns/datarails-cicd-orb@dev:primary
 
 defaults: &defaults
   working_directory: ~/repo
@@ -20,21 +19,67 @@ jobs:
       - run:
           name: Prepare publish version
           command: |
-            sed -i s/{{cicd_version}}/1.2.$CIRCLE_BUILD_NUM/g ./package.json
+            postfix=""
+            if [[ "${CIRCLE_BRANCH}" != master ]] ; then
+              postfix="-$CIRCLE_BRANCH"
+            fi
+
+            VERSION="1.2.$CIRCLE_BUILD_NUM$postfix"
+            sed -i s/{{cicd_version}}/$VERSION/g ./package.json
             cat ./package.json
       - run:
           name: Authenticate with registry
           command: echo "//registry.npmjs.org/:_authToken=$npm_TOKEN" > ~/repo/.npmrc
+      - run:
+          name: Install dependencies 
+          command: npm install
+      - run:
+          name: Run npm test
+          command: npm test
       - run:
           name: Publish package
           command: npm publish . --access=public
+      - datarails-cicd-orb/add-ssh-id:
+          private_key_env_var: github_deploy_private_encoded
+          public_key_env_var: github_deploy_pub_encoded
+          is_public_key_encoded: true
+          is_private_key_encoded: true
+      - run:
+          name: prepare git tag
+          command: |
+            postfix=""
+            if [[ "${CIRCLE_BRANCH}" != prod ]] ; then
+              postfix="-$CIRCLE_BRANCH"
+            fi
 
+            VERSION="1.2.$CIRCLE_BUILD_NUM$postfix"
+            git config --global user.email noreplay@circleci.com
+            git config --global user.name circleci
+            git config --global -l
+            git tag -a "$CIRCLE_BRANCH/$VERSION" -m "circleci build"
+            # Test SSH connection to GitHub
+            output=$(ssh -o "StrictHostKeyChecking no" -T git@github.com 2>&1 || true)
+            echo "$output"
+            if ! echo "$output" | grep -q "Hi.*You've successfully authenticated"; then
+              echo "Failed to authenticate with GitHub"
+              exit 1
+            fi
+            # Push the tag after successful authentication
+            git push origin "$CIRCLE_BRANCH/$VERSION"
 workflows:
   version: 2
-  test-deploy:
+  npm-publish:
     jobs:
       - deploy:
+          context:
+            - metadata
           filters:
             branches:
               only:
-                - /prod.*/
+                - /master/
+                - /tigers/
+                - /bratans/
+                - /dragons/
+                - /tigers/
+                - /wizards/
+                - /rocket/

package/README.md

@@ -13,12 +13,11 @@ This project was generated by amazing Datarails R&D team
     let default_colors = ["#106bd0", "#00cee8", "#95c8d8", "#89cff0", "#FE746D", "#6ADC4C", "#9B9AD9", "#ff8000", "#C11B12", "#5a41f9"];
     let hr = dr_renderer.getInitHighchartsRenderer($, document, default_colors, Highcharts);
 
+## Development
+### Types
+To be able to compile types with `npm run build:types` you need to install typescript globally:
+
+```npm i -g typescript```
 
 ## Publish to npm
 Just merge to prod branch
-
-~~First of all change version in `package.json`.~~
-
-~~For login run `npm login`~~
-
-~~For publish run `npm publish .  --access=public`~~

package/babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+    presets: [['@babel/preset-env', {targets: {node: 'current'}}]],
+};

package/jest.config.js

@@ -0,0 +1,27 @@
+module.exports = {
+    clearMocks: true,
+    setupFilesAfterEnv: ['regenerator-runtime/runtime'],
+    testPathIgnorePatterns: [
+        "/node_modules/",
+    ],
+    transformIgnorePatterns: [
+        "<rootDir>/node_modules/(?!jquery|lodash|moment/)",
+    ],
+    collectCoverage: true,
+    collectCoverageFrom: [
+        '**/*.js',
+        '!**/*.config.js',
+        '!**/build/**',
+        '!**/coverage/**',
+        '!**/node_modules/**',
+        '!**/vendor/**'
+    ],
+    // coverageThreshold: {
+    //     "global": {
+    //         "branches": 100,
+    //         "functions": 100,
+    //         "lines": 100,
+    //         "statements": 100
+    //     }
+    // },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",
@@ -9,7 +9,9 @@
     "tables"
   ],
   "scripts": {
-    "login": "npm login"
+    "login": "npm login",
+    "test": "jest --coverage",
+    "build:types": "tsc --build --verbose"
   },
   "author": "Sergey Spivakov",
   "repository": {
@@ -17,6 +19,21 @@
     "url": "git+https://bitbucket.org/datarails/dr_renderer.git"
   },
   "license": "",
+  "dependencies": {
+    "jquery": "^3.6.0",
+    "lodash": "^4.17.20",
+    "regenerator-runtime": "^0.13.5"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.20.12",
+    "@babel/preset-env": "^7.20.2",
+    "@testing-library/dom": "^7.2.1",
+    "@testing-library/jest-dom": "^5.5.0",
+    "babel-jest": "^25.5.1",
+    "jest": "^25.3.0",
+    "moment": "^2.29.1",
+    "serve": "^11.3.0"
+  },
   "bugs": {
     "url": ""
   },
@@ -24,5 +41,10 @@
   "whitelistedNonPeerDependencies": [],
   "main": "src/index.js",
   "module": "src/index.js",
-  "sideEffects": false
+  "sideEffects": false,
+  "jest": {
+    "setupFiles": [
+      "./setup-jest.js"
+    ]
+  }
 }