diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 732d36c2..6cfc7307 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -62,7 +62,12 @@ jobs: rm package-lock.json || true echo "D: npm install $SDK_JS_PACKAGE_NAME@$VERSION_NAME --foreground-scripts" npm install $SDK_JS_PACKAGE_NAME@$VERSION_NAME --foreground-scripts - npm build + ls -lah node_modules + echo "" + echo "listing node_modules/@kindredgroup" + ls -lah node_modules/@kindredgroup || true + echo "" + npm run build npm version pwd ls -l diff --git a/cohort_sdk_client/.npmrc b/cohort_sdk_client/.npmrc new file mode 100644 index 00000000..e30b9555 --- /dev/null +++ b/cohort_sdk_client/.npmrc @@ -0,0 +1 @@ +@kindredgroup:registry=https://npm.pkg.github.com \ No newline at end of file diff --git a/cohort_sdk_client/package-lock.json b/cohort_sdk_client/package-lock.json index cc93ea1a..a70c94b0 100644 --- a/cohort_sdk_client/package-lock.json +++ b/cohort_sdk_client/package-lock.json @@ -9,7 +9,7 @@ "version": "0.2.13-dev", "license": "MIT", "dependencies": { - "@kindredgroup/cohort_sdk_js": "0.2.12", + "@kindredgroup/cohort_sdk_js": "^0.2.13", "@types/pg": "^8.10.2", "ts-node": "^10.9.1", "winston": "^3.10.0" @@ -57,9 +57,9 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.9", @@ -71,9 +71,9 @@ } }, "node_modules/@kindredgroup/cohort_sdk_js": { - "version": "0.2.12", - "resolved": "https://npm.pkg.github.com/download/@kindredgroup/cohort_sdk_js/0.2.12/775cea524ec268f6b1d5d2e179da7fff02ef2c25", - "integrity": "sha512-n/5PDlAXuGCYrf9Z9pto/Fz8LW+WV7S4kNLn5z74Gecld2vlTwzIiqyIZZa3oooeLrLcX2S71FZK4194Z+GnQw==", + "version": "0.2.13", + "resolved": "https://npm.pkg.github.com/download/@kindredgroup/cohort_sdk_js/0.2.13/6b33f54cdea1d015bef57b8a035c2e1082415f3c", + "integrity": "sha512-25jCtxu13fKFqlrPusQPu3MqDVmVvSIgZzDuTi9YdC+qlNPshe+hgmn7G4bBNCLXr0i8GKiP3EoYuPKVXrUGiQ==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -268,9 +268,9 @@ "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==" }, "node_modules/logform": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz", - "integrity": "sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.1.tgz", + "integrity": "sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA==", "dependencies": { "@colors/colors": "1.6.0", "@types/triple-beam": "^1.3.2", @@ -531,15 +531,15 @@ "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==" }, "node_modules/winston": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz", - "integrity": "sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", + "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", "async": "^3.2.3", "is-stream": "^2.0.0", - "logform": "^2.4.0", + "logform": "^2.6.0", "one-time": "^1.0.0", "readable-stream": "^3.4.0", "safe-stable-stringify": "^2.3.1", @@ -552,12 +552,12 @@ } }, "node_modules/winston-transport": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz", - "integrity": "sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg==", + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.1.tgz", + "integrity": "sha512-wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA==", "dependencies": { - "logform": "^2.3.2", - "readable-stream": "^3.6.0", + "logform": "^2.6.1", + "readable-stream": "^3.6.2", "triple-beam": "^1.3.0" }, "engines": { @@ -603,9 +603,9 @@ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==" }, "@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==" }, "@jridgewell/trace-mapping": { "version": "0.3.9", @@ -617,9 +617,9 @@ } }, "@kindredgroup/cohort_sdk_js": { - "version": "0.2.12", - "resolved": "https://npm.pkg.github.com/download/@kindredgroup/cohort_sdk_js/0.2.12/775cea524ec268f6b1d5d2e179da7fff02ef2c25", - "integrity": "sha512-n/5PDlAXuGCYrf9Z9pto/Fz8LW+WV7S4kNLn5z74Gecld2vlTwzIiqyIZZa3oooeLrLcX2S71FZK4194Z+GnQw==", + "version": "0.2.13", + "resolved": "https://npm.pkg.github.com/download/@kindredgroup/cohort_sdk_js/0.2.13/6b33f54cdea1d015bef57b8a035c2e1082415f3c", + "integrity": "sha512-25jCtxu13fKFqlrPusQPu3MqDVmVvSIgZzDuTi9YdC+qlNPshe+hgmn7G4bBNCLXr0i8GKiP3EoYuPKVXrUGiQ==", "requires": { "@napi-rs/cli": "^2.16.0" } @@ -781,9 +781,9 @@ "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==" }, "logform": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz", - "integrity": "sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.1.tgz", + "integrity": "sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA==", "requires": { "@colors/colors": "1.6.0", "@types/triple-beam": "^1.3.2", @@ -965,15 +965,15 @@ "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==" }, "winston": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz", - "integrity": "sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", + "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", "requires": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", "async": "^3.2.3", "is-stream": "^2.0.0", - "logform": "^2.4.0", + "logform": "^2.6.0", "one-time": "^1.0.0", "readable-stream": "^3.4.0", "safe-stable-stringify": "^2.3.1", @@ -983,12 +983,12 @@ } }, "winston-transport": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz", - "integrity": "sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg==", + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.1.tgz", + "integrity": "sha512-wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA==", "requires": { - "logform": "^2.3.2", - "readable-stream": "^3.6.0", + "logform": "^2.6.1", + "readable-stream": "^3.6.2", "triple-beam": "^1.3.0" } }, diff --git a/cohort_sdk_client/package.json b/cohort_sdk_client/package.json index 27b8d879..9c0b6306 100644 --- a/cohort_sdk_client/package.json +++ b/cohort_sdk_client/package.json @@ -16,7 +16,7 @@ "build": "npx tsc -d" }, "dependencies": { - "@kindredgroup/cohort_sdk_js": "0.2.12", + "@kindredgroup/cohort_sdk_js": "^0.2.13", "@types/pg": "^8.10.2", "ts-node": "^10.9.1", "winston": "^3.10.0" diff --git a/packages/cohort_sdk_js/scripts/postinstall.sh b/packages/cohort_sdk_js/scripts/postinstall.sh index 14327d96..e68f9a1b 100755 --- a/packages/cohort_sdk_js/scripts/postinstall.sh +++ b/packages/cohort_sdk_js/scripts/postinstall.sh @@ -36,14 +36,14 @@ echo "D: lenMinusOne=$lenMinusOne, lenMinusTwo=$lenMinusTwo, lenMinusThree=$lenM lastPathToken="${pathTokens[lenMinusFour]}/${pathTokens[lenMinusThree]}/${pathTokens[lenMinusTwo]}"/"${pathTokens[lenMinusOne]}" echo "D: lastPathToken=$lastPathToken" -if [ "$COHORT_SDK_CLIENT_DEV_MODE" == "true" ]; then - echo "Post install script of 'cohort_sdk_js' is running as transitional dependency. Enforced by COHORT_SDK_CLIENT_DEV_MODE=${COHORT_SDK_CLIENT_DEV_MODE}" -else - if [ "$lastPathToken" == "cohort_sdk_client/node_modules/@kindredgroup/cohort_sdk_js" ]; then - echo "Post install script of 'cohort_sdk_js' is designed to be executed when module is installed as transitional dependency. Currently, 'npm install' is running as part of installing 'cohort_sdk_client'. Postinstall script is skipped." - exit 0 - fi -fi +# if [ "$COHORT_SDK_CLIENT_DEV_MODE" == "true" ]; then +# echo "Post install script of 'cohort_sdk_js' is running as transitional dependency. Enforced by COHORT_SDK_CLIENT_DEV_MODE=${COHORT_SDK_CLIENT_DEV_MODE}" +# else +# if [ "$lastPathToken" == "cohort_sdk_client/node_modules/@kindredgroup/cohort_sdk_js" ]; then +# echo "Post install script of 'cohort_sdk_js' is designed to be executed when module is installed as transitional dependency. Currently, 'npm install' is running as part of installing 'cohort_sdk_client'. Postinstall script is skipped." +# exit 0 +# fi +# fi echo "Post install. Current directory is: $CURRENT_DIR" echo "The content is: "