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]>
IssouChancla · Oct 13, 2022 · ac347fb · ac347fb
1 parent 3ce139d
commit ac347fb
Show file tree

Hide file tree

Showing 47 changed files with 22,964 additions and 15,222 deletions.
diff --git a/.base-ammanrc.js b/.base-ammanrc.js
@@ -31,7 +31,7 @@ const programs = {
     deployPath: localDeployPath('mpl_hydra'),
   },
   candy_machine_core: {
-    label: "Candy Machine Core",
+    label: 'Candy Machine Core',
     programId: 'CndyV3LdqHUfDLmE5naZjVN8rBZz4tqhdefbAnjHG3JR',
     deployPath: localDeployPath('mpl_candy_machine_core'),
   },

diff --git a/.eslintignore b/.eslintignore
diff --git a/.github/actions/yarn-install-and-build/action.yml b/.github/actions/yarn-install-and-build/action.yml
@@ -84,6 +84,13 @@ runs:
     ##############
     # Build Contract 
     ##############
+    - name: Install Root Modules
+      run: |
+        echo 'Install Root Modules: yarn install'
+        yarn install
+      working-directory: ./
+      shell: bash
+
     - name: Install modules
       run: yarn install
       working-directory: ${{ inputs.working_dir }}

diff --git a/.github/workflows/integration-hydra.yml b/.github/workflows/integration-hydra.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  SOLANA_VERSION: 1.10.35
+  SOLANA_VERSION: 1.10.25
   RUST_TOOLCHAIN: stable
 
 jobs:
@@ -73,18 +73,13 @@ jobs:
         with:
           cache_id: sdk-hydra
           working_dir: ./hydra/js
-          build_token_metadata: true
 
       # Run integration test
       - name: start-local-test-validator
         working-directory: ./hydra/js
-        run: yarn run api:gen && yarn run build && DEBUG=amman* yarn amman:start && DEBUG=mpl* yarn test && yarn run amman:stop
+        run: DEBUG=amman* yarn amman:start
 
-      # - name: integration-test-hydra-program
-      #   id: run_integration_test
-      #   working-directory: ./hydra/js
-      #   run: DEBUG=mpl* yarn test
-
-      # - name: stop-local-test-validator
-      #   working-directory: ./hydra/js
-      #   run: yarn amman:stop
+      - name: integration-test-hydra-program
+        id: run_integration_test
+        working-directory: ./hydra/js
+        run: DEBUG=mpl* yarn test
diff --git a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
diff --git a/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
diff --git a/.yarn/releases/yarn-3.2.0-rc.12.cjs b/.yarn/releases/yarn-3.2.0-rc.12.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
diff --git a/auction-house/cli/package.json b/auction-house/cli/package.json
@@ -64,6 +64,10 @@
     "weighted": "^0.3.0"
   },
   "devDependencies": {
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@typescript-eslint/parser": "^5.4.0",
     "@babel/preset-env": "^7.15.6",
     "@babel/preset-typescript": "^7.15.0",
     "@types/jest": "^27.0.1",
@@ -78,4 +82,4 @@
     "ts-node": "^9.0.0",
     "typescript": "^4.3.5"
   }
-}
+}
diff --git a/auction-house/js/.eslintrc.js b/auction-house/js/.eslintrc.js
@@ -1 +1,16 @@
-module.exports = require('../../.eslintrc');
+module.exports = {
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaFeatures: {
+      ecmaVersion: 2020,
+      sourceType: 'module',
+    },
+  },
+  extends: ['plugin:@typescript-eslint/recommended', 'prettier', 'plugin:prettier/recommended'],
+  rules: {
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-empty-function': 'off',
+    '@typescript-eslint/ban-types': ['error', { extendDefaults: true, types: { '{}': false } }],
+    '@typescript-eslint/ban-ts-comment': 'off',
+  },
+};
diff --git a/auction-house/js/package.json b/auction-house/js/package.json
@@ -43,18 +43,22 @@
     "@metaplex-foundation/beet": "^0.6.1",
     "@metaplex-foundation/beet-solana": "^0.3.1",
     "@metaplex-foundation/cusper": "^0.0.2",
+    "@solana/spl-token": "^0.3.5",
     "@solana/web3.js": "^1.56.2",
     "bn.js": "^5.2.0"
   },
   "devDependencies": {
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^4.0.0",
     "@metaplex-foundation/solita": "^0.15.2",
-    "@solana/spl-token": "0.3.5",
     "@types/tape": "^4.13.2",
+    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@typescript-eslint/parser": "^5.4.0",
     "eslint": "^8.3.0",
     "prettier": "^2.5.1",
     "rimraf": "^3.0.2",
     "spok": "^1.4.3",
     "tape": "^5.5.2",
     "typescript": "^4.6.2"
   }
-}
+}