From 3f3435a11bf5f566d767f628ff1b9069c6d405e4 Mon Sep 17 00:00:00 2001 From: Ezhil Shanmugham Date: Thu, 30 Nov 2023 19:14:20 +0530 Subject: [PATCH] fix: dual-build (#281) --- .github/workflows/BuildAndRun.yml | 106 ------------ .github/workflows/pr-build.yml | 157 ++++++++++++----- .github/workflows/release-java.yml | 78 +++++++++ ...{prettier-js-format.yml => release-js.yml} | 67 ++++---- JS/edgechains/lib/package-lock.json | 158 +----------------- JS/edgechains/lib/package.json | 3 +- 6 files changed, 238 insertions(+), 331 deletions(-) delete mode 100644 .github/workflows/BuildAndRun.yml create mode 100644 .github/workflows/release-java.yml rename .github/workflows/{prettier-js-format.yml => release-js.yml} (61%) diff --git a/.github/workflows/BuildAndRun.yml b/.github/workflows/BuildAndRun.yml deleted file mode 100644 index fba422db4..000000000 --- a/.github/workflows/BuildAndRun.yml +++ /dev/null @@ -1,106 +0,0 @@ -name: Build and Run - -on: workflow_dispatch - -jobs: - build_and_run: - runs-on: ubuntu-latest - outputs: - VALUE: ${{ steps.short_hash.outputs.VALUE }} - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set SHORT_HASH - run: | - echo "::set-output name=VALUE::${LONG_HASH:0:8}" - echo "RELEASE_TAG=${LONG_HASH:0:8}-$(TZ=UTC-8 date +"%Y.%m.%d")" >> $GITHUB_ENV - id: short_hash - env: - LONG_HASH: ${{ github.sha }} - - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'adopt' - - - name: Set up Maven - uses: stCarolas/setup-maven@v4.5 - with: - maven-version: 3.9.3 - - - name: Create output folder - run: mkdir BuildOutput - -# - name: Build flyfly project -# working-directory: ./FlySpring/flyfly -# run: mvn clean package - -# - name: Copy flyfly JAR to Examples folder and rename -# run: cp ./FlySpring/flyfly/target/flyfly-0.0.1-SNAPSHOT.jar ././BuildOutput/flyfly.jar - - - name: Build edgechain-app project - working-directory: ./FlySpring/edgechain-app - # run: mvn -Djavacpp.platform=linux-x86_64 clean package -DskipTests - run: mvn clean package -DskipTests - - - name: Run edgechain testcases - working-directory: ./FlySpring/edgechain-app - run: mvn test - - - name: Copy edgechain-app JAR to Examples folder - run: cp ./FlySpring/edgechain-app/target/edgechain.jar ./BuildOutput/ - - - name: Upload Examples folder as artifact - uses: actions/upload-artifact@v3 - with: - name: Output - path: ./BuildOutput/ - - release: - name: Release jar - needs: build_and_run - if: startsWith(github.ref, 'refs/tags/') - runs-on: ubuntu-latest - steps: - - name: Download jar from build - uses: actions/download-artifact@v3 - with: - name: Output - path: Output - - name: Display structure of downloaded files - run: ls -R - - # - name: Create Release - # id: create_release - # uses: actions/create-release@v1.1.4 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # tag_name: ${{ github.ref }} - # release_name: ${{ github.ref }} - # - name: Upload Release jar - # id: upload_release_asset - # uses: actions/upload-release-asset@v1.0.1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ steps.create_release.outputs.upload_url }} - # asset_path: Examples/ - # asset_name: Examples - # asset_content_type: application/zip - - name: 'Get variables' - id: vars - run: | - echo "tag_name= ${{needs.build_and_run.outputs.VALUE}}" >> $GITHUB_OUTPUT - - name: Release - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ env.RELEASE_TAG }} - # body: 🚀 Automated build - files: | - ./Output/**/*.* - - # tag_name: ${{needs.build_and_run.steps.short_hash.outputs.VALUE}} - diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index af5fec411..3eb582d1b 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -1,54 +1,58 @@ -name: Generate attachments +name: PR Build on: - # This workflow is started only on PRs - pull_request_target: - types: + pull_request_target: + types: - opened - reopened - synchronize + paths: + - 'Java/**' + - 'JS/**' jobs: - # Main job - build: - permissions: - # Required to upload/save artifact, otherwise you'll get - # "Error: Resource not accessible by integration" - contents: write - # Required to post comment, otherwise you'll get - # "Error: Resource not accessible by integration" - pull-requests: write - + changes: runs-on: ubuntu-latest + permissions: + pull-requests: read outputs: - VALUE: ${{ steps.short_hash.outputs.VALUE }} + java: ${{ steps.filter.outputs.java }} + js: ${{ steps.filter.outputs.js }} steps: - # Put your steps here to generate the files to upload. - # Usually configure Node.js, build, etc. - # Finally, upload the artifacts and post comment: - - name: Checkout PR - if: ${{ github.event_name == 'pull_request_target' }} - uses: actions/checkout@v3 + - uses: dorny/paths-filter@v2 + id: filter with: - ref: ${{ github.event.pull_request.head.ref }} - repository: ${{ github.event.pull_request.head.repo.full_name }} + filters: | + java: + - 'Java/**' + js: + - 'JS/**' + + java: + needs: changes + if: ${{ needs.changes.outputs.java == 'true' }} + runs-on: ubuntu-latest + outputs: + VALUE: ${{ steps.set_short_hash.outputs.VALUE }} - # Token for current repo (used to post PR comment) - repo-token: ${{ secrets.GITHUB_TOKEN }} + steps: + - name: Checkout repository + uses: actions/checkout@v3 - name: Set SHORT_HASH + id: set_short_hash run: | - echo "::set-output name=VALUE::${LONG_HASH:0:8}" - echo "RELEASE_TAG=${LONG_HASH:0:8}-$(TZ=UTC-8 date +"%Y.%m.%d")" >> $GITHUB_ENV - id: short_hash - env: - LONG_HASH: ${{ github.sha }} + echo "::set-output name=VALUE::${{ github.sha }}" + echo "RELEASE_TAG=${{ github.sha }}-$(TZ=UTC-8 date +"%Y.%m.%d")" >> $GITHUB_ENV + + - name: Goto Java folder + run: cd Java - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v2 with: - java-version: '17' distribution: 'adopt' + java-version: '17' - name: Set up Maven uses: stCarolas/setup-maven@v4.5 @@ -56,23 +60,90 @@ jobs: maven-version: 3.9.3 - name: Create output folder - run: mkdir BuildOutput + run: mkdir -p Java/FlySpring/edgechain-app/BuildOutput - name: Build edgechain-app project - working-directory: ./FlySpring/edgechain-app - run: mvn clean package -DskipTests + working-directory: Java/FlySpring/edgechain-app + run: mvn clean package -DskipTests - name: Run edgechain testcases - working-directory: ./FlySpring/edgechain-app + working-directory: Java/FlySpring/edgechain-app run: mvn test - - name: Copy edgechain-app JAR to Examples folder - run: cp ./FlySpring/edgechain-app/target/edgechain.jar ./BuildOutput/ + - name: Copy edgechain-app JAR to BuildOutput + run: cp Java/FlySpring/edgechain-app/target/edgechain.jar Java/FlySpring/edgechain-app/BuildOutput + + + js: + needs: changes + if: ${{ needs.changes.outputs.js == 'true' }} + permissions: + contents: write + pull-requests: write + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Setup Node.js + uses: actions/setup-node@v3 + with: + node-version: '18' + - name: Install Prettier + run: npm install prettier + - name: Install ESLint + run: > + npm install eslint@latest && + npm install @microsoft/eslint-formatter-sarif@latest eslint-config-google@latest eslint-plugin-import@latest @typescript-eslint/eslint-plugin@latest @typescript-eslint/parser@latest eslint-config-prettier@latest eslint-plugin-prettier@latest + - name: Get cache date + id: get-date + run: echo "name=date::$(/bin/date -u "+%Y%m%d")" + shell: bash + - name: ESLint Cache + uses: actions/cache@v3 + with: + path: ./.eslintcache + key: ${{ runner.os }}-eslintcache-${{ hashFiles('./eslintcache') }} + restore-keys: | + ${{ runner.os }}-eslintcache- + - name: Run ESLint + run: npx eslint JS + --fix + --cache + --config JS/.eslintrc.js + --ext .js,.jsx,.ts,.tsx + continue-on-error: true + + - name: Run Prettiers + run: npx prettier --tab-width 4 --print-width 100 --trailing-comma es5 --ignore-path "$(CURDIR)/node_modules/*" --write JS/ + - name: Commit changes + uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: Automatically applying Prettier changes + commit_user_name: GitHub Actions + commit_user_email: actions@github.com + commit_author: GitHub Actions + branch: ${{ github.head_ref }} + + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Goto JS folder + run: cd JS/edgechains/lib - - name: Upload Examples folder as artifact - uses: actions/upload-artifact@v3 + - name: Set up Node.js + uses: actions/setup-node@v3 with: - name: Output - path: ./BuildOutput/ + node-version: '18' + + - name: Install dependencies + run: npm install + working-directory: JS/edgechains/lib + + - name: Build edgechain-app project + run: npm run build + working-directory: JS/edgechains/lib - + - name: Package edgechain-app project + run: npm pack + working-directory: JS/edgechains/lib \ No newline at end of file diff --git a/.github/workflows/release-java.yml b/.github/workflows/release-java.yml new file mode 100644 index 000000000..50d836e4b --- /dev/null +++ b/.github/workflows/release-java.yml @@ -0,0 +1,78 @@ +name: Release Java + +on: + workflow_dispatch + +jobs: + build: + runs-on: ubuntu-latest + outputs: + VALUE: ${{ steps.set_short_hash.outputs.VALUE }} + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set SHORT_HASH + id: set_short_hash + run: | + echo "::set-output name=VALUE::${{ github.sha }}" + echo "RELEASE_TAG=${{ github.sha }}-$(TZ=UTC-8 date +"%Y.%m.%d")" >> $GITHUB_ENV + + - name: Goto Java folder + run: cd Java + + - name: Set up JDK + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '17' + + - name: Set up Maven + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: 3.9.3 + + - name: Create output folder + run: mkdir -p Java/FlySpring/edgechain-app/BuildOutput + + - name: Build edgechain-app project + working-directory: Java/FlySpring/edgechain-app + run: mvn clean package -DskipTests + + - name: Run edgechain testcases + working-directory: Java/FlySpring/edgechain-app + run: mvn test + + - name: Copy edgechain-app JAR to Examples folder + run: cp Java/FlySpring/edgechain-app/target/edgechain.jar Java/FlySpring/edgechain-app/BuildOutput + + - name: Upload Examples folder as artifact + uses: actions/upload-artifact@v2 + with: + name: Output + path: Java/FlySpring/edgechain-app/BuildOutput + + release: + name: release-java + needs: build + if: startsWith(github.ref, 'refs/tags/') + runs-on: ubuntu-latest + steps: + - name: Download jar from build + uses: actions/download-artifact@v2 + with: + name: Output + path: Output + - name: Display structure of downloaded files + run: ls -R + + - name: Get variables + id: vars + run: echo "tag_name=${{ env.RELEASE_TAG }}" >> $GITHUB_ENV + + - name: Release + uses: softprops/action-gh-release@v1 + with: + files: | + ./Output/**/*.* + tag_name: ${{ env.RELEASE_TAG }} diff --git a/.github/workflows/prettier-js-format.yml b/.github/workflows/release-js.yml similarity index 61% rename from .github/workflows/prettier-js-format.yml rename to .github/workflows/release-js.yml index 37428d5ef..e039e267d 100644 --- a/.github/workflows/prettier-js-format.yml +++ b/.github/workflows/release-js.yml @@ -1,25 +1,16 @@ -name: Prettier JS +name: Release Js on: - push: - branches: [ ts ] - paths: - - JS/** - - .github/workflows/prettier-js-format.yml - pull_request: - paths: - - JS/** - - ".github/workflows/linter.yml" + workflow_dispatch permissions: contents: write jobs: - formatting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 # v2 minimum required + - uses: actions/checkout@v4 - name: Setup Node.js uses: actions/setup-node@v3 with: @@ -32,7 +23,7 @@ jobs: npm install @microsoft/eslint-formatter-sarif@latest eslint-config-google@latest eslint-plugin-import@latest @typescript-eslint/eslint-plugin@latest @typescript-eslint/parser@latest eslint-config-prettier@latest eslint-plugin-prettier@latest - name: Get cache date id: get-date - run: echo "::set-output name=date::$(/bin/date -u "+%Y%m%d")" + run: echo "name=date::$(/bin/date -u "+%Y%m%d")" shell: bash - name: ESLint Cache uses: actions/cache@v3 @@ -48,11 +39,7 @@ jobs: --config JS/.eslintrc.js --ext .js,.jsx,.ts,.tsx continue-on-error: true - # - name: Upload analysis results to GitHub - # uses: github/codeql-action/upload-sarif@v2 - # with: - # sarif_file: eslint-results.sarif - # wait-for-processing: true + - name: Run Prettiers run: npx prettier --tab-width 4 --print-width 100 --trailing-comma es5 --ignore-path "$(CURDIR)/node_modules/*" --write JS/ - name: Commit changes @@ -63,13 +50,37 @@ jobs: commit_user_email: actions@github.com commit_author: GitHub Actions branch: ${{ github.head_ref }} - # - name: Run JSON Prettier - # run: npx prettier --write "ts/**/*.json" --no-error-on-unmatched-pattern - # - name: Commit JSON Prettier cchanges - # uses: stefanzweifel/git-auto-commit-action@v4 - # with: - # commit_message: Format json via prettier - # commit_user_name: GitHub Actions - # commit_user_email: actions@github.com - # commit_author: GitHub Actions - # branch: ${{ github.head_ref }} + + release: + name: release-js + needs: formatting + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Goto JS folder + run: cd JS/edgechains/lib + + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: '18' + + - name: Install dependencies + run: npm install + working-directory: JS/edgechains/lib + + - name: Build edgechain-app project + run: npm run build + working-directory: JS/edgechains/lib + + - name: Package edgechain-app project + run: npm pack + working-directory: JS/edgechains/lib + + - name: Upload release Tarball + uses: actions/upload-artifact@v3 + with: + name: release-artifact + path: 'JS/edgechains/lib/*.tgz' diff --git a/JS/edgechains/lib/package-lock.json b/JS/edgechains/lib/package-lock.json index 211f5d139..73066c0c8 100644 --- a/JS/edgechains/lib/package-lock.json +++ b/JS/edgechains/lib/package-lock.json @@ -1,12 +1,12 @@ { "name": "@arakoodev/edgechains.js", - "version": "0.1.8", + "version": "0.1.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@arakoodev/edgechains.js", - "version": "0.1.8", + "version": "0.1.10", "dependencies": { "@hono/node-server": "^1.2.0", "@types/dotenv": "^8.2.0", @@ -14,7 +14,6 @@ "dotenv": "^16.3.1", "hono": "^3.9.2", "inquirer": "^9.2.12", - "pg": "^8.11.3", "prettier": "^3.1.0", "typeorm": "^0.3.17" }, @@ -660,9 +659,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz", - "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.5.tgz", + "integrity": "sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -2211,14 +2210,6 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, - "node_modules/buffer-writer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz", - "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==", - "engines": { - "node": ">=4" - } - }, "node_modules/bundle-require": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/bundle-require/-/bundle-require-4.0.2.tgz", @@ -4848,11 +4839,6 @@ "node": ">=6" } }, - "node_modules/packet-reader": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz", - "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==" - }, "node_modules/parse-json": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", @@ -4931,89 +4917,6 @@ "node": ">=8" } }, - "node_modules/pg": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.3.tgz", - "integrity": "sha512-+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g==", - "dependencies": { - "buffer-writer": "2.0.0", - "packet-reader": "1.0.0", - "pg-connection-string": "^2.6.2", - "pg-pool": "^3.6.1", - "pg-protocol": "^1.6.0", - "pg-types": "^2.1.0", - "pgpass": "1.x" - }, - "engines": { - "node": ">= 8.0.0" - }, - "optionalDependencies": { - "pg-cloudflare": "^1.1.1" - }, - "peerDependencies": { - "pg-native": ">=3.0.1" - }, - "peerDependenciesMeta": { - "pg-native": { - "optional": true - } - } - }, - "node_modules/pg-cloudflare": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz", - "integrity": "sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==", - "optional": true - }, - "node_modules/pg-connection-string": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.2.tgz", - "integrity": "sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA==" - }, - "node_modules/pg-int8": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", - "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==", - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/pg-pool": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.1.tgz", - "integrity": "sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==", - "peerDependencies": { - "pg": ">=8.0" - } - }, - "node_modules/pg-protocol": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz", - "integrity": "sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q==" - }, - "node_modules/pg-types": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", - "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", - "dependencies": { - "pg-int8": "1.0.1", - "postgres-array": "~2.0.0", - "postgres-bytea": "~1.0.0", - "postgres-date": "~1.0.4", - "postgres-interval": "^1.1.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/pgpass": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz", - "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==", - "dependencies": { - "split2": "^4.1.0" - } - }, "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", @@ -5140,41 +5043,6 @@ } } }, - "node_modules/postgres-array": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", - "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==", - "engines": { - "node": ">=4" - } - }, - "node_modules/postgres-bytea": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", - "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/postgres-date": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", - "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/postgres-interval": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", - "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", - "dependencies": { - "xtend": "^4.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/prettier": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", @@ -5599,14 +5467,6 @@ "node": ">=0.10.0" } }, - "node_modules/split2": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", - "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", - "engines": { - "node": ">= 10.x" - } - }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -6377,14 +6237,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "engines": { - "node": ">=0.4" - } - }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", diff --git a/JS/edgechains/lib/package.json b/JS/edgechains/lib/package.json index 6548b6620..4f191bad8 100644 --- a/JS/edgechains/lib/package.json +++ b/JS/edgechains/lib/package.json @@ -26,7 +26,8 @@ "dotenv": "^16.3.1", "hono": "^3.9.2", "inquirer": "^9.2.12", - "prettier": "^3.1.0" + "prettier": "^3.1.0", + "typeorm": "^0.3.17" }, "devDependencies": { "@hanazuki/node-jsonnet": "^2.1.0",