build(yarn): Upgrade from yarn 1.x to yarn 2.x (#518)

paritytech · Apr 28, 2021 · 41d0dce · 41d0dce
1 parent 409b611
commit 41d0dce
Show file tree

Hide file tree

Showing 5 changed files with 9,969 additions and 7,159 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,6 @@ yarn-error.log
 /.clinic
 **.log
 **/logs
+.yarn/*
+!.yarn/releases
+!.yarn/plugins
diff --git a/.yarn/releases/yarn-2.4.1.cjs b/.yarn/releases/yarn-2.4.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-2.4.1.cjs
diff --git a/package.json b/package.json
@@ -28,12 +28,12 @@
     "build:docker": "docker build -t substrate-api-sidecar .",
     "build:docs": "(cd docs && yarn && yarn build)",
     "main": "node ./build/src/main.js",
-    "lint": "tsc && eslint . --ext ts",
+    "lint": "substrate-dev-run-lint",
     "deploy": "yarn build && standard-version",
     "start": "yarn run main",
     "start:log-rpc": "yarn run build && NODE_ENV=test yarn run main ",
     "dev": "tsc-watch --onSuccess \"yarn run main\"",
-    "test": "jest --silent"
+    "test": "substrate-exec-jest --silent"
   },
   "dependencies": {
     "@polkadot/api": "^4.7.1",
@@ -47,15 +47,14 @@
     "winston": "^3.3.3"
   },
   "devDependencies": {
-    "@substrate/dev": "^0.4.1",
+    "@substrate/dev": "^0.5.2",
     "@types/express": "^4.17.11",
     "@types/express-serve-static-core": "^4.17.19",
     "@types/http-errors": "^1.6.3",
     "@types/morgan": "^1.9.2",
     "@types/triple-beam": "^1.3.2",
     "rimraf": "^3.0.2",
     "standard-version": "^9.2.0",
-    "ts-jest": "^26.5.5",
     "tsc-watch": "^4.2.9",
     "typescript": "4.2.4"
   },
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		nodeLinker: node-modules

		yarnPath: .yarn/releases/yarn-2.4.1.cjs