Detect typegen template location for commonjs execution (#4738)

jacogr · web-flow · commit 1a31043cc41e · 2022-04-11T21:01:00.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 8.0.2 Apr 11, 2022
+
+Changes:
+
+- Detect typegen template location for commonjs execution
+
+
 ## 8.0.1 Apr 10, 2022
 
 - **Breaking change** In this major version the commonjs outputs are moved to a sub-folder. Since the export map and main field in package.json does reflect this change, there should be no usage changes. However the packages here will all need to be on the same version for internal linkage.
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   },
   "sideEffects": false,
   "type": "commonjs",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "workspaces": [
     "packages/*"
   ],
diff --git a/packages/api-augment/package.json b/packages/api-augment/package.json
@@ -20,18 +20,18 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/api-base": "8.0.1",
-    "@polkadot/rpc-augment": "8.0.1",
-    "@polkadot/types": "8.0.1",
-    "@polkadot/types-augment": "8.0.1",
-    "@polkadot/types-codec": "8.0.1",
+    "@polkadot/api-base": "8.0.2",
+    "@polkadot/rpc-augment": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-augment": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
     "@polkadot/util": "^9.0.1"
   },
   "devDependencies": {
-    "@polkadot/types-support": "8.0.1"
+    "@polkadot/types-support": "8.0.2"
   }
 }
diff --git a/packages/api-base/package.json b/packages/api-base/package.json
@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/rpc-core": "8.0.1",
-    "@polkadot/types": "8.0.1",
+    "@polkadot/rpc-core": "8.0.2",
+    "@polkadot/types": "8.0.2",
     "@polkadot/util": "^9.0.1",
     "rxjs": "^7.5.5"
   }
diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json
@@ -20,20 +20,20 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/api": "8.0.1",
-    "@polkadot/types": "8.0.1",
-    "@polkadot/types-codec": "8.0.1",
-    "@polkadot/types-create": "8.0.1",
+    "@polkadot/api": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/types-create": "8.0.2",
     "@polkadot/util": "^9.0.1",
     "@polkadot/util-crypto": "^9.0.1",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "8.0.1",
+    "@polkadot/api-augment": "8.0.2",
     "@polkadot/keyring": "^9.0.1"
   }
 }
diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
@@ -20,25 +20,25 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/api": "8.0.1",
-    "@polkadot/api-augment": "8.0.1",
-    "@polkadot/api-base": "8.0.1",
-    "@polkadot/rpc-core": "8.0.1",
-    "@polkadot/types": "8.0.1",
-    "@polkadot/types-codec": "8.0.1",
+    "@polkadot/api": "8.0.2",
+    "@polkadot/api-augment": "8.0.2",
+    "@polkadot/api-base": "8.0.2",
+    "@polkadot/rpc-core": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
     "@polkadot/util": "^9.0.1",
     "@polkadot/util-crypto": "^9.0.1",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
-    "@polkadot/api": "8.0.1",
-    "@polkadot/api-augment": "8.0.1",
-    "@polkadot/rpc-augment": "8.0.1",
-    "@polkadot/rpc-provider": "8.0.1",
-    "@polkadot/types-support": "8.0.1"
+    "@polkadot/api": "8.0.2",
+    "@polkadot/api-augment": "8.0.2",
+    "@polkadot/rpc-augment": "8.0.2",
+    "@polkadot/rpc-provider": "8.0.2",
+    "@polkadot/types-support": "8.0.2"
   }
 }
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -20,29 +20,29 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/api-augment": "8.0.1",
-    "@polkadot/api-base": "8.0.1",
-    "@polkadot/api-derive": "8.0.1",
+    "@polkadot/api-augment": "8.0.2",
+    "@polkadot/api-base": "8.0.2",
+    "@polkadot/api-derive": "8.0.2",
     "@polkadot/keyring": "^9.0.1",
-    "@polkadot/rpc-augment": "8.0.1",
-    "@polkadot/rpc-core": "8.0.1",
-    "@polkadot/rpc-provider": "8.0.1",
-    "@polkadot/types": "8.0.1",
-    "@polkadot/types-augment": "8.0.1",
-    "@polkadot/types-codec": "8.0.1",
-    "@polkadot/types-create": "8.0.1",
-    "@polkadot/types-known": "8.0.1",
+    "@polkadot/rpc-augment": "8.0.2",
+    "@polkadot/rpc-core": "8.0.2",
+    "@polkadot/rpc-provider": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-augment": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/types-create": "8.0.2",
+    "@polkadot/types-known": "8.0.2",
     "@polkadot/util": "^9.0.1",
     "@polkadot/util-crypto": "^9.0.1",
     "eventemitter3": "^4.0.7",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "8.0.1",
-    "@polkadot/types-support": "8.0.1"
+    "@polkadot/api-augment": "8.0.2",
+    "@polkadot/types-support": "8.0.2"
   }
 }
diff --git a/packages/rpc-augment/package.json b/packages/rpc-augment/package.json
@@ -20,13 +20,13 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/rpc-core": "8.0.1",
-    "@polkadot/types": "8.0.1",
-    "@polkadot/types-codec": "8.0.1",
+    "@polkadot/rpc-core": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
     "@polkadot/util": "^9.0.1"
   }
 }
diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json
@@ -20,18 +20,18 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/rpc-augment": "8.0.1",
-    "@polkadot/rpc-provider": "8.0.1",
-    "@polkadot/types": "8.0.1",
+    "@polkadot/rpc-augment": "8.0.2",
+    "@polkadot/rpc-provider": "8.0.2",
+    "@polkadot/types": "8.0.2",
     "@polkadot/util": "^9.0.1",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
     "@polkadot/keyring": "^9.0.1",
-    "@polkadot/rpc-augment": "8.0.1"
+    "@polkadot/rpc-augment": "8.0.2"
   }
 }
diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json
@@ -20,13 +20,13 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
     "@polkadot/keyring": "^9.0.1",
-    "@polkadot/types": "8.0.1",
-    "@polkadot/types-support": "8.0.1",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-support": "8.0.2",
     "@polkadot/util": "^9.0.1",
     "@polkadot/util-crypto": "^9.0.1",
     "@polkadot/x-fetch": "^9.0.1",
diff --git a/packages/typegen/package.json b/packages/typegen/package.json
@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "bin": {
     "polkadot-types-chain-info": "./scripts/polkadot-types-chain-info.cjs",
@@ -33,15 +33,15 @@
     "@babel/core": "^7.17.9",
     "@babel/register": "^7.17.7",
     "@babel/runtime": "^7.17.9",
-    "@polkadot/api": "8.0.1",
-    "@polkadot/api-augment": "8.0.1",
-    "@polkadot/rpc-augment": "8.0.1",
-    "@polkadot/rpc-provider": "8.0.1",
-    "@polkadot/types": "8.0.1",
-    "@polkadot/types-augment": "8.0.1",
-    "@polkadot/types-codec": "8.0.1",
-    "@polkadot/types-create": "8.0.1",
-    "@polkadot/types-support": "8.0.1",
+    "@polkadot/api": "8.0.2",
+    "@polkadot/api-augment": "8.0.2",
+    "@polkadot/rpc-augment": "8.0.2",
+    "@polkadot/rpc-provider": "8.0.2",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-augment": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/types-create": "8.0.2",
+    "@polkadot/types-support": "8.0.2",
     "@polkadot/util": "^9.0.1",
     "@polkadot/x-ws": "^9.0.1",
     "handlebars": "^4.7.7",
diff --git a/packages/typegen/src/util/file.ts b/packages/typegen/src/util/file.ts
@@ -4,6 +4,8 @@
 import fs from 'fs';
 import path from 'path';
 
+import { assert } from '@polkadot/util';
+
 export function writeFile (dest: string, generator: () => string, noLog?: boolean): void {
   !noLog && console.log(`${dest}\n\tGenerating`);
 
@@ -21,5 +23,12 @@ export function writeFile (dest: string, generator: () => string, noLog?: boolea
 }
 
 export function readTemplate (template: string): string {
-  return fs.readFileSync(path.join(__dirname, `../templates/${template}.hbs`)).toString();
+  // NOTE With cjs in a subdir, search one lower as well
+  const file = ['../templates', '../../templates']
+    .map((p) => path.join(__dirname, p, `${template}.hbs`))
+    .find((p) => fs.existsSync(p));
+
+  assert(file, `Unable to locate ${template}.hbs from ${__dirname}`);
+
+  return fs.readFileSync(file).toString();
 }
diff --git a/packages/types-augment/package.json b/packages/types-augment/package.json
@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/types": "8.0.1",
-    "@polkadot/types-codec": "8.0.1",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
     "@polkadot/util": "^9.0.1"
   }
 }
diff --git a/packages/types-codec/package.json b/packages/types-codec/package.json
@@ -20,16 +20,16 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
     "@polkadot/util": "^9.0.1"
   },
   "devDependencies": {
-    "@polkadot/types": "8.0.1",
-    "@polkadot/types-augment": "8.0.1",
-    "@polkadot/types-support": "8.0.1",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-augment": "8.0.2",
+    "@polkadot/types-support": "8.0.2",
     "@polkadot/util-crypto": "^9.0.1"
   }
 }
diff --git a/packages/types-create/package.json b/packages/types-create/package.json
@@ -20,14 +20,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
-    "@polkadot/types-codec": "8.0.1",
+    "@polkadot/types-codec": "8.0.2",
     "@polkadot/util": "^9.0.1"
   },
   "devDependencies": {
-    "@polkadot/types": "8.0.1"
+    "@polkadot/types": "8.0.2"
   }
 }
diff --git a/packages/types-known/package.json b/packages/types-known/package.json
@@ -20,14 +20,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
     "@polkadot/networks": "^9.0.1",
-    "@polkadot/types": "8.0.1",
-    "@polkadot/types-codec": "8.0.1",
-    "@polkadot/types-create": "8.0.1",
+    "@polkadot/types": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/types-create": "8.0.2",
     "@polkadot/util": "^9.0.1"
   }
 }
diff --git a/packages/types-support/package.json b/packages/types-support/package.json
@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -20,20 +20,20 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.17.9",
     "@polkadot/keyring": "^9.0.1",
-    "@polkadot/types-augment": "8.0.1",
-    "@polkadot/types-codec": "8.0.1",
-    "@polkadot/types-create": "8.0.1",
+    "@polkadot/types-augment": "8.0.2",
+    "@polkadot/types-codec": "8.0.2",
+    "@polkadot/types-create": "8.0.2",
     "@polkadot/util": "^9.0.1",
     "@polkadot/util-crypto": "^9.0.1",
     "rxjs": "^7.5.5"
   },
   "devDependencies": {
     "@polkadot/keyring": "^9.0.1",
-    "@polkadot/types-support": "8.0.1"
+    "@polkadot/types-support": "8.0.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
