Skip to content

Commit ac347fb

Browse files
Remove JavaScript Workspaces (metaplex-foundation#792)
* remove workspaces from root package.json * chore: fix yarn workspace issue by cleaning plugins * chore: yarn 3.x be gone * fix: missing bn.js types for core * chore: clean package manager and bin deps from root * chore: add prettier back since eslintrc uses it as lib * create individual lock and eslintrc files * chore: add prettier deps * chore: various fixes * chore: add prettier dep to core * ci: install root modules * ci: fix hydra integration test * ci: try to fix hydra integration test * chore: clean up * add back package json for amman base file; other fixes * fix: revert fixed-price-sale amman version Co-authored-by: Thorsten Lorenz <[email protected]>
1 parent 3ce139d commit ac347fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+22964
-15222
lines changed

.base-ammanrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const programs = {
3131
deployPath: localDeployPath('mpl_hydra'),
3232
},
3333
candy_machine_core: {
34-
label: "Candy Machine Core",
34+
label: 'Candy Machine Core',
3535
programId: 'CndyV3LdqHUfDLmE5naZjVN8rBZz4tqhdefbAnjHG3JR',
3636
deployPath: localDeployPath('mpl_candy_machine_core'),
3737
},

.eslintignore

-5
This file was deleted.

.github/actions/yarn-install-and-build/action.yml

+7
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,13 @@ runs:
8484
##############
8585
# Build Contract
8686
##############
87+
- name: Install Root Modules
88+
run: |
89+
echo 'Install Root Modules: yarn install'
90+
yarn install
91+
working-directory: ./
92+
shell: bash
93+
8794
- name: Install modules
8895
run: yarn install
8996
working-directory: ${{ inputs.working_dir }}

.github/workflows/integration-hydra.yml

+6-11
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
CARGO_TERM_COLOR: always
11-
SOLANA_VERSION: 1.10.35
11+
SOLANA_VERSION: 1.10.25
1212
RUST_TOOLCHAIN: stable
1313

1414
jobs:
@@ -73,18 +73,13 @@ jobs:
7373
with:
7474
cache_id: sdk-hydra
7575
working_dir: ./hydra/js
76-
build_token_metadata: true
7776

7877
# Run integration test
7978
- name: start-local-test-validator
8079
working-directory: ./hydra/js
81-
run: yarn run api:gen && yarn run build && DEBUG=amman* yarn amman:start && DEBUG=mpl* yarn test && yarn run amman:stop
80+
run: DEBUG=amman* yarn amman:start
8281

83-
# - name: integration-test-hydra-program
84-
# id: run_integration_test
85-
# working-directory: ./hydra/js
86-
# run: DEBUG=mpl* yarn test
87-
88-
# - name: stop-local-test-validator
89-
# working-directory: ./hydra/js
90-
# run: yarn amman:stop
82+
- name: integration-test-hydra-program
83+
id: run_integration_test
84+
working-directory: ./hydra/js
85+
run: DEBUG=mpl* yarn test

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

-363
This file was deleted.

.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

-28
This file was deleted.

.yarn/releases/yarn-3.2.0-rc.12.cjs

-784
This file was deleted.

.yarnrc.yml

-9
This file was deleted.

auction-house/cli/package.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@
6464
"weighted": "^0.3.0"
6565
},
6666
"devDependencies": {
67+
"eslint-config-prettier": "^8.3.0",
68+
"eslint-plugin-prettier": "^4.0.0",
69+
"@typescript-eslint/eslint-plugin": "^5.4.0",
70+
"@typescript-eslint/parser": "^5.4.0",
6771
"@babel/preset-env": "^7.15.6",
6872
"@babel/preset-typescript": "^7.15.0",
6973
"@types/jest": "^27.0.1",
@@ -78,4 +82,4 @@
7882
"ts-node": "^9.0.0",
7983
"typescript": "^4.3.5"
8084
}
81-
}
85+
}

auction-house/js/.eslintrc.js

+16-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
1-
module.exports = require('../../.eslintrc');
1+
module.exports = {
2+
parser: '@typescript-eslint/parser',
3+
parserOptions: {
4+
ecmaFeatures: {
5+
ecmaVersion: 2020,
6+
sourceType: 'module',
7+
},
8+
},
9+
extends: ['plugin:@typescript-eslint/recommended', 'prettier', 'plugin:prettier/recommended'],
10+
rules: {
11+
'@typescript-eslint/explicit-module-boundary-types': 'off',
12+
'@typescript-eslint/no-empty-function': 'off',
13+
'@typescript-eslint/ban-types': ['error', { extendDefaults: true, types: { '{}': false } }],
14+
'@typescript-eslint/ban-ts-comment': 'off',
15+
},
16+
};

auction-house/js/package.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,22 @@
4343
"@metaplex-foundation/beet": "^0.6.1",
4444
"@metaplex-foundation/beet-solana": "^0.3.1",
4545
"@metaplex-foundation/cusper": "^0.0.2",
46+
"@solana/spl-token": "^0.3.5",
4647
"@solana/web3.js": "^1.56.2",
4748
"bn.js": "^5.2.0"
4849
},
4950
"devDependencies": {
51+
"eslint-config-prettier": "^8.3.0",
52+
"eslint-plugin-prettier": "^4.0.0",
5053
"@metaplex-foundation/solita": "^0.15.2",
51-
"@solana/spl-token": "0.3.5",
5254
"@types/tape": "^4.13.2",
55+
"@typescript-eslint/eslint-plugin": "^5.4.0",
56+
"@typescript-eslint/parser": "^5.4.0",
5357
"eslint": "^8.3.0",
5458
"prettier": "^2.5.1",
5559
"rimraf": "^3.0.2",
5660
"spok": "^1.4.3",
5761
"tape": "^5.5.2",
5862
"typescript": "^4.6.2"
5963
}
60-
}
64+
}

0 commit comments

Comments
 (0)