chore: update Nx to latest (#11)

kin-labs · Sep 9, 2022 · 9beb26c · 9beb26c
1 parent bacaeeb
commit 9beb26c
Show file tree

Hide file tree

Showing 25 changed files with 1,720 additions and 695 deletions.
diff --git a/jest.config.js → jest.config.ts b/jest.config.js → jest.config.ts
@@ -1,5 +1,5 @@
 const { getJestProjects } = require('@nrwl/jest');
 
-module.exports = {
+export default {
   projects: getJestProjects(),
 };
diff --git a/jest.preset.js b/jest.preset.js
@@ -1,3 +1,3 @@
-const nxPreset = require('@nrwl/jest/preset');
+const nxPreset = require('@nrwl/jest/preset').default;
 
 module.exports = { ...nxPreset };
diff --git a/nx.json b/nx.json
@@ -1,24 +1,26 @@
 {
-  "extends": "@nrwl/workspace/presets/npm.json",
+  "extends": "nx/presets/npm.json",
   "npmScope": "kin-tools",
   "affected": {
     "defaultBase": "master"
   },
   "tasksRunnerOptions": {
     "default": {
-      "runner": "@nrwl/workspace/tasks-runners/default",
+      "runner": "@nrwl/nx-cloud",
       "options": {
-        "cacheableOperations": [
-          "build",
-          "lint",
-          "test",
-          "e2e"
-        ],
-        "parallel": 1
+        "cacheableOperations": ["build", "lint", "test", "e2e"],
+        "parallel": 1,
+        "accessToken": "NDQ4Y2VmMmEtNjIwMy00NTYwLWJmZDAtZDBiOWE0MTRmYzgzfHJlYWQtd3JpdGU="
       }
     }
   },
   "cli": {
     "defaultCollection": "@nrwl/workspace"
+  },
+  "$schema": "./node_modules/nx/schemas/nx-schema.json",
+  "targetDefaults": {
+    "build": {
+      "dependsOn": ["^build"]
+    }
   }
 }
diff --git a/package.json b/package.json
@@ -5,34 +5,36 @@
   "scripts": {},
   "private": true,
   "dependencies": {
-    "@kin-kinetic/keypair": "^1.0.0-beta.16",
-    "@solana/spl-token": "^0.2.0",
-    "@solana/web3.js": "^1.34.0",
+    "@kin-kinetic/keypair": "^1.0.0-rc.0",
+    "@solana/spl-token": "^0.3.4",
+    "@solana/web3.js": "^1.59.1",
     "atob": "^2.1.2",
     "bs58": "^5.0.0",
     "crc": "^4.1.1",
     "hex-to-32": "^2.0.0",
-    "tslib": "^2.0.0"
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@nrwl/cli": "13.8.1",
-    "@nrwl/eslint-plugin-nx": "13.8.1",
-    "@nrwl/jest": "13.8.1",
-    "@nrwl/js": "13.8.1",
-    "@nrwl/linter": "13.8.1",
-    "@nrwl/node": "13.8.1",
-    "@nrwl/tao": "13.8.1",
-    "@nrwl/workspace": "13.8.1",
-    "@types/jest": "27.0.2",
-    "@types/node": "14.14.33",
-    "@typescript-eslint/eslint-plugin": "5.10.2",
-    "@typescript-eslint/parser": "5.10.2",
-    "eslint": "8.7.0",
+    "@nrwl/cli": "14.6.5",
+    "@nrwl/eslint-plugin-nx": "14.6.5",
+    "@nrwl/jest": "14.6.5",
+    "@nrwl/js": "14.6.5",
+    "@nrwl/linter": "14.6.5",
+    "@nrwl/node": "14.6.5",
+    "@nrwl/nx-cloud": "14.6.2",
+    "@nrwl/workspace": "14.6.5",
+    "@types/jest": "28.1.8",
+    "@types/node": "18.7.1",
+    "@typescript-eslint/eslint-plugin": "5.33.1",
+    "@typescript-eslint/parser": "5.33.1",
+    "eslint": "8.15.0",
     "eslint-config-prettier": "8.1.0",
-    "jest": "27.2.3",
+    "jest": "28.1.3",
+    "nx": "14.6.5",
     "nxpm": "^2.0.0",
-    "prettier": "2.5.1",
-    "ts-jest": "27.0.5",
-    "typescript": "~4.3.5"
+    "prettier": "2.7.1",
+    "ts-jest": "28.0.8",
+    "ts-node": "10.9.1",
+    "typescript": "4.7.4"
   }
 }
diff --git a/packages/keypair-compat/jest.config.js → packages/keypair-compat/jest.config.ts b/packages/keypair-compat/jest.config.js → packages/keypair-compat/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'keypair-compat',
   preset: '../../jest.preset.js',
   globals: {

diff --git a/packages/keypair-compat/project.json b/packages/keypair-compat/project.json
@@ -1,10 +1,10 @@
 {
-  "root": "packages/keypair-compat",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "packages/keypair-compat/src",
   "projectType": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/node:package",
+      "executor": "@nrwl/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/packages/keypair-compat",
@@ -25,7 +25,7 @@
       "executor": "@nrwl/jest:jest",
       "outputs": ["coverage/packages/keypair-compat"],
       "options": {
-        "jestConfig": "packages/keypair-compat/jest.config.js",
+        "jestConfig": "packages/keypair-compat/jest.config.ts",
         "passWithNoTests": true
       }
     }

diff --git a/packages/keypair-compat/tsconfig.lib.json b/packages/keypair-compat/tsconfig.lib.json
@@ -6,6 +6,6 @@
     "declaration": true,
     "types": ["node"]
   },
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
   "include": ["**/*.ts"]
 }
diff --git a/packages/keypair-compat/tsconfig.spec.json b/packages/keypair-compat/tsconfig.spec.json
@@ -14,6 +14,7 @@
     "**/*.spec.js",
     "**/*.test.jsx",
     "**/*.spec.jsx",
-    "**/*.d.ts"
+    "**/*.d.ts",
+    "jest.config.ts"
   ]
 }
diff --git a/packages/kin-burn/jest.config.js → packages/kin-burn/jest.config.ts b/packages/kin-burn/jest.config.js → packages/kin-burn/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'kin-burn',
   preset: '../../jest.preset.js',
   globals: {

diff --git a/packages/kin-burn/project.json b/packages/kin-burn/project.json
@@ -1,10 +1,10 @@
 {
-  "root": "packages/kin-burn",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "packages/kin-burn/src",
   "projectType": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/node:package",
+      "executor": "@nrwl/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/packages/kin-burn",
@@ -25,7 +25,7 @@
       "executor": "@nrwl/jest:jest",
       "outputs": ["coverage/packages/kin-burn"],
       "options": {
-        "jestConfig": "packages/kin-burn/jest.config.js",
+        "jestConfig": "packages/kin-burn/jest.config.ts",
         "passWithNoTests": true
       }
     }

diff --git a/packages/kin-burn/src/lib/kin-burn.ts b/packages/kin-burn/src/lib/kin-burn.ts
@@ -1,6 +1,7 @@
-import { KIN_MINT_MAINNET } from '@kin-tools/kin-transaction';
 import { clusterApiUrl, Connection, PublicKey } from '@solana/web3.js';
 
+const KIN_MINT_MAINNET = 'kinXdEcpDQeHPEuQnqmUgtYykqKGVFq6CeVX5iAHJq6';
+
 export interface BurnSummary {
   burnt: number;
   max: number;

diff --git a/packages/kin-burn/tsconfig.lib.json b/packages/kin-burn/tsconfig.lib.json
@@ -6,6 +6,6 @@
     "declaration": true,
     "types": ["node"]
   },
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
   "include": ["**/*.ts"]
 }
diff --git a/packages/kin-burn/tsconfig.spec.json b/packages/kin-burn/tsconfig.spec.json
@@ -14,6 +14,7 @@
     "**/*.spec.js",
     "**/*.test.jsx",
     "**/*.spec.jsx",
-    "**/*.d.ts"
+    "**/*.d.ts",
+    "jest.config.ts"
   ]
 }
diff --git a/packages/kin-memo/jest.config.js → packages/kin-memo/jest.config.ts b/packages/kin-memo/jest.config.js → packages/kin-memo/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'kin-memo',
   preset: '../../jest.preset.js',
   globals: {

diff --git a/packages/kin-memo/project.json b/packages/kin-memo/project.json
@@ -1,10 +1,10 @@
 {
-  "root": "packages/kin-memo",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "packages/kin-memo/src",
   "projectType": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/node:package",
+      "executor": "@nrwl/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/packages/kin-memo",
@@ -25,7 +25,7 @@
       "executor": "@nrwl/jest:jest",
       "outputs": ["coverage/packages/kin-memo"],
       "options": {
-        "jestConfig": "packages/kin-memo/jest.config.js",
+        "jestConfig": "packages/kin-memo/jest.config.ts",
         "passWithNoTests": true
       }
     }

diff --git a/packages/kin-memo/tsconfig.lib.json b/packages/kin-memo/tsconfig.lib.json
@@ -6,6 +6,6 @@
     "declaration": true,
     "types": ["node"]
   },
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
   "include": ["**/*.ts"]
 }
diff --git a/packages/kin-memo/tsconfig.spec.json b/packages/kin-memo/tsconfig.spec.json
@@ -14,6 +14,7 @@
     "**/*.spec.js",
     "**/*.test.jsx",
     "**/*.spec.jsx",
-    "**/*.d.ts"
+    "**/*.d.ts",
+    "jest.config.ts"
   ]
 }
diff --git a/packages/kin-transaction/jest.config.js → packages/kin-transaction/jest.config.ts b/packages/kin-transaction/jest.config.js → packages/kin-transaction/jest.config.ts
@@ -1,4 +1,5 @@
-module.exports = {
+/* eslint-disable */
+export default {
   displayName: 'kin-transaction',
   preset: '../../jest.preset.js',
   globals: {

diff --git a/packages/kin-transaction/package.json b/packages/kin-transaction/package.json
@@ -2,9 +2,9 @@
   "name": "@kin-tools/kin-transaction",
   "version": "1.7.1",
   "peerDependencies": {
-    "@kin-tools/kin-memo": "^1.1.0",
-    "@solana/web3.js": "^1.34.0",
-    "@solana/spl-token": "^0.2.0"
+    "@kin-tools/kin-memo": "^1.7.1",
+    "@solana/web3.js": "^1.59.1",
+    "@solana/spl-token": "^0.3.4"
   },
   "license": "MIT"
 }
diff --git a/packages/kin-transaction/project.json b/packages/kin-transaction/project.json
@@ -1,10 +1,10 @@
 {
-  "root": "packages/kin-transaction",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "packages/kin-transaction/src",
   "projectType": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/node:package",
+      "executor": "@nrwl/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/packages/kin-transaction",
@@ -25,7 +25,7 @@
       "executor": "@nrwl/jest:jest",
       "outputs": ["coverage/packages/kin-transaction"],
       "options": {
-        "jestConfig": "packages/kin-transaction/jest.config.js",
+        "jestConfig": "packages/kin-transaction/jest.config.ts",
         "passWithNoTests": true
       }
     }

diff --git a/packages/kin-transaction/src/lib/helpers/generate-kin-memo-instruction.spec.ts b/packages/kin-transaction/src/lib/helpers/generate-kin-memo-instruction.spec.ts
@@ -1,6 +1,6 @@
-import { TransactionType } from '@kin-tools/kin-memo';
-import { MEMO_V1_TOKEN_ID } from '@kin-tools/kin-transaction';
-import { generateKinMemoInstruction } from './generate-kin-memo-instruction';
+import { TransactionType } from '@kin-tools/kin-memo'
+import { MEMO_V1_TOKEN_ID } from '../constants'
+import { generateKinMemoInstruction } from './generate-kin-memo-instruction'
 
 describe('generateMemoInstruction', () => {
   it('should create a Memo Instruction', async () => {

diff --git a/packages/kin-transaction/tsconfig.lib.json b/packages/kin-transaction/tsconfig.lib.json
@@ -6,6 +6,6 @@
     "declaration": true,
     "types": ["node"]
   },
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
   "include": ["**/*.ts"]
 }
diff --git a/packages/kin-transaction/tsconfig.spec.json b/packages/kin-transaction/tsconfig.spec.json
@@ -14,6 +14,7 @@
     "**/*.spec.js",
     "**/*.test.jsx",
     "**/*.spec.jsx",
-    "**/*.d.ts"
+    "**/*.d.ts",
+    "jest.config.ts"
   ]
 }
diff --git a/workspace.json b/workspace.json
@@ -5,5 +5,6 @@
     "kin-burn": "packages/kin-burn",
     "kin-memo": "packages/kin-memo",
     "kin-transaction": "packages/kin-transaction"
-  }
+  },
+  "$schema": "./node_modules/nx/schemas/workspace-schema.json"
 }