Skip to content

Commit

Permalink
renamed manually in makefile, fixed import from sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
Ptroger committed Oct 23, 2024
1 parent 2486c55 commit ad614a4
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 27 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,25 +54,25 @@ jobs:
- name: Code format
run: |
npx nx affected --target format:check lint:check \
--exclude tag:type:application,user-journey \
--exclude tag:type:application,armory-e2e-testing \
--base=origin/main
- name: Test types
run: |
npx nx affected --target test:type \
--exclude tag:type:application,user-journey \
--exclude tag:type:application,armory-e2e-testing \
--base=origin/main
- name: Test unit
run: |
npx nx affected --target test:unit \
--exclude tag:type:application,user-journey \
--exclude tag:type:application,armory-e2e-testing \
--base=origin/main
- name: Test integration
run: |
npx nx affected --target test:integration \
--exclude tag:type:application,user-journey \
--exclude tag:type:application,armory-e2e-testing \
--base=origin/main
- name: Test end-to-end
Expand All @@ -83,7 +83,7 @@ jobs:
# in-memory. It'd be a good time to revisit this TODO and think about
# using testcontainers.
npx nx affected --target test:e2e \
--exclude tag:type:application,user-journey \
--exclude tag:type:application,armory-e2e-testing \
--base=origin/main \
--testPathIgnorePatterns=packages/armory-sdk/src/lib/__test__/e2e/*
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include ./packages/policy-engine-shared/Makefile
include ./packages/transaction-request-intent/Makefile
include ./packages/signature/Makefile
include ./packages/armory-sdk/Makefile
include ./packages/user-journey/Makefile
include ./packages/armory-e2e-testing/Makefile

# For more terminal color codes, head over to
# https://opensource.com/article/19/9/linux-terminal-colors
Expand Down
40 changes: 20 additions & 20 deletions packages/armory-e2e-testing/Makefile
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
USER_JOURNEY_PROJECT_NAME := user-journey
USER_JOURNEY_PROJECT_DIR := ./packages/user-journey
ARMORY_E2E_TESTING_PROJECT_NAME := armory-e2e-testing
ARMORY_E2E_TESTING_PROJECT_DIR := ./packages/armory-e2e-testing

# === Build ===

user-journey/build:
npx nx build ${USER_JOURNEY_PROJECT_NAME}
armory-e2e-testing/build:
npx nx build ${ARMORY_E2E_TESTING_PROJECT_NAME}

# === Code format ===

user-journey/format:
npx nx format:write --projects ${USER_JOURNEY_PROJECT_NAME}
armory-e2e-testing/format:
npx nx format:write --projects ${ARMORY_E2E_TESTING_PROJECT_NAME}

user-journey/lint:
npx nx lint ${USER_JOURNEY_PROJECT_NAME} -- --fix
armory-e2e-testing/lint:
npx nx lint ${ARMORY_E2E_TESTING_PROJECT_NAME} -- --fix

user-journey/format/check:
npx nx format:check --projects ${USER_JOURNEY_PROJECT_NAME}
armory-e2e-testing/format/check:
npx nx format:check --projects ${ARMORY_E2E_TESTING_PROJECT_NAME}

user-journey/lint/check:
npx nx lint ${USER_JOURNEY_PROJECT_NAME}
armory-e2e-testing/lint/check:
npx nx lint ${ARMORY_E2E_TESTING_PROJECT_NAME}

# === Testing ===

user-journey/test/type:
armory-e2e-testing/test/type:
npx tsc \
--project ${USER_JOURNEY_PROJECT_DIR}/tsconfig.lib.json \
--project ${ARMORY_E2E_TESTING_PROJECT_DIR}/tsconfig.lib.json \
--noEmit

user-journey/test/unit/watch:
make user-journey/test/unit ARGS=--watch
armory-e2e-testing/test/unit/watch:
make armory-e2e-testing/test/unit ARGS=--watch

user-journey/test/e2e:
npx nx test:e2e ${USER_JOURNEY_PROJECT_NAME} -- ${ARGS}
armory-e2e-testing/test/e2e:
npx nx test:e2e ${ARMORY_E2E_TESTING_PROJECT_NAME} -- ${ARGS}

user-journey/test/e2e/watch:
make user-journey/test/e2e ARGS=--watch
armory-e2e-testing/test/e2e/watch:
make armory-e2e-testing/test/e2e ARGS=--watch
3 changes: 2 additions & 1 deletion packages/armory-sdk/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ export * from './lib/shared/promise'
export * from './lib/types'
export * from './lib/vault'

export type { AuthorizationResponseDtoStatusEnum, CreateClientResponseDto } from './lib/http/client/auth'
export { AuthorizationResponseDtoStatusEnum } from './lib/http/client/auth'
export type { CreateClientResponseDto } from './lib/http/client/auth'
export type { ClientDto, WalletDto } from './lib/http/client/vault'
export type { Signer } from './lib/shared/type'
export { resourceId } from './lib/utils'
Expand Down

0 comments on commit ad614a4

Please sign in to comment.