fix yarn pnp

.dockerignore

@@ -0,0 +1,19 @@
+alice
+bob
+.dockerignore
+node_modules
+scripts
+test
+zero
+*.db
+charts
+helmfile.d
+build
+.circleci
+.editorconfig
+.git
+.github
+.gitignore
+.idea
+combined.log
+docker-compose.yml

.yarnrc.yml

@@ -3,5 +3,10 @@ plugins:
     spec: "@yarnpkg/plugin-interactive-tools"
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: "@yarnpkg/plugin-workspace-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
+    spec: "@yarnpkg/plugin-typescript"
 
 yarnPath: .yarn/releases/yarn-3.2.2.cjs
+pnpMode: loose
+nodeLinker: node-modules
+

package.json

@@ -20,12 +20,11 @@
   },
   "devDependencies": {
     "@types/node": "^18.7.14",
-    "@typescript-eslint/eslint-plugin": "latest",
-    "@typescript-eslint/parser": "latest",
+    "@typescript-eslint/eslint-plugin": "^5.36.1",
+    "@typescript-eslint/parser": "^5.36.1",
     "eslint": "^8.23.0",
-    "eslint-config-prettier": "latest",
-    "eslint-plugin-prettier": "latest",
-    "prettier": "^2.7.1",
-    "typescript": "^4.8.2"
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "prettier": "^2.7.1"
   }
 }

packages/common/.dockerignore

@@ -0,0 +1,10 @@
+alice
+bob
+node_modules
+scripts
+test
+zero
+*.db
+charts
+helmfile.d
+build

packages/common/Dockerfile-dev

@@ -1,6 +1,4 @@
 FROM node:18 AS builder
 COPY . /app
 WORKDIR /app
-RUN yarn && \
-    yarn workspace 1kv-core build
-CMD yarn start:dev:core
+RUN npm install -g typescript && yarn set version 3.2.2 && yarn install && yarn workspace @1kv/common build

packages/common/package.json

@@ -30,14 +30,14 @@
     ]
   },
   "dependencies": {
-    "@polkadot/keyring": "^9.4.1",
+    "@polkadot/keyring": "^10.1.6",
     "@types/mongoose": "^5.11.97",
-    "@types/node": "^17.0.42",
+    "@types/node": "^18.7.14",
     "hash.js": "^1.1.7",
     "mongoose": "^6.5.4",
-    "winston": "^3.7.2"
+    "winston": "^3.8.1"
   },
-  "devDependencies": {
-    "typescript": "^4.8.2"
+  "installConfig": {
+    "pnp": false
   }
 }

packages/common/tsconfig.json

@@ -1,8 +1,8 @@
 {
-  "extends": "../../tsconfig.json",
   "exclude": ["test", "node_modules"],
   "include": ["src/**/*.ts"],
   "files": [
+//    "src/chaindata.ts",
     "src/constants.ts",
     "src/db/index.ts",
     "src/index.ts",
@@ -24,13 +24,13 @@
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-     "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
     // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
-    "outDir": "build",
+    "outDir": "./build",
     "skipLibCheck": true,                        /* Redirect output structure to the directory. */
-     "rootDir": "src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
      "composite": true,                     /* Enable project compilation */
     // "removeComments": true,                /* Do not emit comments to output. */
     // "noEmit": true,                        /* Do not emit outputs. */
@@ -55,11 +55,11 @@
 
     /* Module Resolution Options */
     "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-     "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-//     "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
-//     "types": ["node"],                           /* Type declaration files to be included in compilation. */
+    // "types": [],                           /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */

packages/core/Dockerfile-dev

@@ -1,6 +1,5 @@
 FROM node:18 AS builder
 COPY . /app
 WORKDIR /app
-RUN yarn && \
-    yarn workspace @1kv/core build
+RUN npm install -g typescript && yarn set version 3.2.2 && yarn install && yarn workspace @1kv/core build
 CMD yarn start:dev:core

packages/core/package.json

@@ -54,7 +54,6 @@
     "reconnecting-websocket": "^4.4.0",
     "semver": "^7.3.7",
     "ts-node": "^10.8.1",
-    "typescript": "^4.7.3",
     "winston": "^3.7.2",
     "ws": "^8.8.0"
   },

packages/gateway/Dockerfile-dev

@@ -1,7 +1,5 @@
 FROM node:18 AS builder
 COPY . /app
 WORKDIR /app
-RUN yarn && \
-    yarn workspace @1kv/common build && \
-    yarn workspace @1kv/gateway build
+RUN npm install -g typescript && yarn set version 3.2.2 && yarn install && yarn workspace @1kv/common build && yarn workspace @1kv/gateway build
 CMD yarn start:dev:gateway

tsconfig.json

@@ -1,10 +1,30 @@
 {
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "target": "ESNext",
+    "useDefineForClassFields": true,
+    "lib": ["ESNext"],
+    "allowJs": false,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "outDir": "dist",
+    "composite": true,
+    "noEmit": false,
+  },
   "references": [
     { "path": "./packages/core" },
     { "path": "./packages/common" },
     { "path": "./packages/gateway" }
   ],
   "files": [],
-  "include": [],
+  "include": ["src/**/*.ts"],
   "exclude": ["**/node_modules"]
 }