Skip to content

Commit

Permalink
Remove explorer source conditions (#14618)
Browse files Browse the repository at this point in the history
## Description 

Describe the changes or additions included in this PR.

## Test Plan 

How did you test the new or updated feature?

---
If your changes are not user-facing and not a breaking change, you can
skip the following section. Otherwise, please indicate what changed, and
then add to the Release Notes section as highlighted during the release
process.

### Type of Change (Check all that apply)

- [ ] protocol change
- [ ] user-visible impact
- [ ] breaking change for a client SDKs
- [ ] breaking change for FNs (FN binary must upgrade)
- [ ] breaking change for validators or node operators (must upgrade
binaries)
- [ ] breaking change for on-chain data layout
- [ ] necessitate either a data wipe or data migration

### Release notes
  • Loading branch information
Jordan-Mysten authored Nov 16, 2023
1 parent 3281c55 commit d2095d8
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 10 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ jobs:
if: ${{ needs.diff.outputs.isTypescriptSDK == 'true' || needs.diff.outputs.isRust == 'true'}}
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm sdk test:e2e'

- name: Build explorer
if: ${{ needs.diff.outputs.isTypescriptSDK == 'true' || needs.diff.outputs.isExplorer == 'true' || needs.diff.outputs.isRust == 'true'}}
run: pnpm turbo --filter=sui-explorer build

- name: Run Explorer e2e tests
# need to run Explorer e2e when its upstream(TS SDK and Rust) or itself is changed
if: ${{ needs.diff.outputs.isTypescriptSDK == 'true' || needs.diff.outputs.isExplorer == 'true' || needs.diff.outputs.isRust == 'true'}}
Expand Down
6 changes: 4 additions & 2 deletions apps/explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
"name": "sui-explorer",
"private": true,
"scripts": {
"dev": "vite --port 3000",
"dev": "concurrently 'pnpm:dev-deps' 'pnpm:dev-local'",
"dev-deps": "turbo run dev --filter sui-explorer^... --concurrency 100",
"dev-local": "vite --port 3000",
"test": "pnpm test:unit",
"test:unit": "vitest run",
"typecheck": "tsc -b",
"playwright": "NODE_OPTIONS='--conditions=source' playwright",
"playwright": "playwright",
"build": "pnpm typecheck && vite build",
"eslint:check": "eslint --max-warnings=0 \"./src/**/*.{js,jsx,ts,tsx}\"",
"eslint:fix": "pnpm eslint:check --fix",
Expand Down
6 changes: 1 addition & 5 deletions apps/explorer/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@
"jsx": "react-jsx",
"baseUrl": ".",
"paths": {
"~/*": ["./src/*"],
"@mysten/sui.js/transactions": ["../../sdk/typescript/src/builder/export.ts"],
"@mysten/sui.js/*": ["../../sdk/typescript/src/*"],
"@mysten/sui.js": ["../../sdk/typescript/src/"],
"@mysten/dapp-kit": ["../../sdk/dapp-kit/src/"]
"~/*": ["./src/*"]
}
},
"include": ["src", "tests"],
Expand Down
1 change: 0 additions & 1 deletion apps/explorer/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export default defineConfig({
sourcemap: true,
},
resolve: {
conditions: ['source'],
alias: {
'~': new URL('./src', import.meta.url).pathname,
},
Expand Down
4 changes: 2 additions & 2 deletions apps/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"eslint:fix": "pnpm run eslint:check --fix",
"lint": "pnpm run eslint:check && pnpm run prettier:check",
"lint:fix": "pnpm run eslint:fix && pnpm run prettier:fix",
"dev": "storybook dev -p 6006",
"build": "tsc -b && storybook build"
"storybook": "storybook dev -p 6006",
"build-storybook": "tsc -b && storybook build"
},
"dependencies": {
"@mysten/core": "workspace:*",
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"@tanstack/eslint-plugin-query": "^5.0.0",
"@typescript-eslint/eslint-plugin": "^6.1.0",
"@typescript-eslint/parser": "^6.1.0",
"concurrently": "^8.2.0",
"eslint": "^8.45.0",
"eslint-config-prettier": "^8.8.0",
"eslint-config-react-app": "^7.0.1",
Expand Down
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 comments on commit d2095d8

@vercel
Copy link

@vercel vercel bot commented on d2095d8 Nov 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on d2095d8 Nov 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

mysten-ui – ./apps/ui

mysten-ui.vercel.app
mysten-ui-mysten-labs.vercel.app
mysten-ui-git-main-mysten-labs.vercel.app

@vercel
Copy link

@vercel vercel bot commented on d2095d8 Nov 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on d2095d8 Nov 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on d2095d8 Nov 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

sui-kiosk – ./dapps/kiosk

sui-kiosk-git-main-mysten-labs.vercel.app
sui-kiosk-mysten-labs.vercel.app
sui-kiosk.vercel.app

@vercel
Copy link

@vercel vercel bot commented on d2095d8 Nov 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.