Merge pull request #369 from secretarium/chore/esm

chore!: Migrate to Pure ESM
secretarium · Aug 5, 2024 · 8140abb · 8140abb
2 parents 50b4454 + 0c9c230
commit 8140abb
Show file tree

Hide file tree

Showing 47 changed files with 70 additions and 89 deletions.
diff --git a/.commitlintrc.js b/.commitlintrc.js
@@ -1,6 +1,6 @@
-const { utils: { getProjects } } = require('@commitlint/config-nx-scopes');
+import configNxScopes from '@commitlint/config-nx-scopes';
 
-module.exports = {
+export default {
     extends: [
         '@commitlint/config-conventional',
         '@commitlint/config-nx-scopes'
@@ -10,7 +10,7 @@ module.exports = {
             const projectFilter = ({ name }) =>
                 !name.includes('e2e');
             const projectNames = new Set();
-            (await getProjects(ctx, projectFilter))
+            (await configNxScopes.utils.getProjects(ctx, projectFilter))
                 .forEach(element => {
                     projectNames.add(element);
                 });

diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
diff --git a/apps/endoscope-e2e/.eslintrc.json b/apps/endoscope-e2e/.eslintrc.json
@@ -1,7 +1,7 @@
 {
     "extends": [
         "plugin:cypress/recommended",
-        "../../.eslintrc.js"
+        "../../.eslintrc.cjs"
     ],
     "ignorePatterns": [
         "!**/*"

diff --git a/apps/endoscope-e2e/cypress.config.cjs b/apps/endoscope-e2e/cypress.config.cjs
@@ -0,0 +1,13 @@
+const cypress = require('cypress')
+const cypressPreset = require('@nx/cypress/plugins/cypress-preset');
+
+const cypressJsonConfig = {
+    baseUrl: 'http://127.0.0.1:4210'
+};
+
+module.exports = cypress.defineConfig({
+    e2e: {
+        ...cypressPreset.nxE2EPreset(__dirname),
+        ...cypressJsonConfig
+    }
+});
diff --git a/apps/endoscope-e2e/cypress.config.ts b/apps/endoscope-e2e/cypress.config.ts
diff --git a/apps/endoscope-e2e/project.json b/apps/endoscope-e2e/project.json
@@ -11,7 +11,7 @@
         "e2e": {
             "executor": "@nx/cypress:cypress",
             "options": {
-                "cypressConfig": "apps/endoscope-e2e/cypress.config.ts",
+                "cypressConfig": "apps/endoscope-e2e/cypress.config.cjs",
                 "devServerTarget": "endoscope:serve:development",
                 "testingType": "e2e"
             },

diff --git a/apps/endoscope/.eslintrc.json b/apps/endoscope/.eslintrc.json
@@ -1,6 +1,6 @@
 {
     "extends": [
-        "../../.eslintrc.js"
+        "../../.eslintrc.cjs"
     ],
     "ignorePatterns": [
         "!**/*"

diff --git a/apps/endoscope/jest.config.ts b/apps/endoscope/jest.config.ts
@@ -2,7 +2,7 @@ import path from 'path';
 
 export default {
     displayName: 'endoscope',
-    preset: '../../jest.preset.js',
+    preset: '../../jest.preset.cjs',
     transform: {
         '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
         '^.+\\.[tj]sx?$': [

diff --git a/apps/endoscope/postcss.config.cjs b/apps/endoscope/postcss.config.cjs
@@ -0,0 +1,13 @@
+const { join } = require('path');
+
+// Note: If you use library-specific PostCSS/Tailwind configuration then you should remove the `postcssConfig` build
+// option from your application's configuration (i.e. project.json).
+//
+// See: https://nx.dev/guides/using-tailwind-css-in-react#step-4:-applying-configuration-to-libraries
+
+module.exports = {
+    plugins: {
+        tailwindcss: { config: join(__dirname, 'tailwind.config.cjs') },
+        autoprefixer: {}
+    }
+};
diff --git a/apps/endoscope/postcss.config.js b/apps/endoscope/postcss.config.js
diff --git a/apps/endoscope/project.json b/apps/endoscope/project.json
@@ -35,7 +35,7 @@
                     "apps/endoscope/src/styles.css"
                 ],
                 "scripts": [],
-                "webpackConfig": "apps/endoscope/webpack.config"
+                "webpackConfig": "apps/endoscope/webpack.config.cjs"
             },
             "configurations": {
                 "production": {

diff --git a/apps/endoscope/tailwind.config.js → apps/endoscope/tailwind.config.cjs b/apps/endoscope/tailwind.config.js → apps/endoscope/tailwind.config.cjs
@@ -1,6 +1,7 @@
 const { join } = require('path');
 const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
 
+/** @type {import('tailwindcss').Config} */
 module.exports = {
     content: [
         ...createGlobPatternsForDependencies(__dirname),

diff --git a/apps/endoscope/tsconfig.spec.json b/apps/endoscope/tsconfig.spec.json
@@ -2,7 +2,7 @@
     "extends": "./tsconfig.json",
     "compilerOptions": {
         "outDir": "../../dist/out-tsc",
-        "module": "commonjs",
+        "module": "esnext",
         "types": [
             "jest",
             "node",

diff --git a/apps/endoscope/webpack.config.js → apps/endoscope/webpack.config.cjs b/apps/endoscope/webpack.config.js → apps/endoscope/webpack.config.cjs
diff --git a/apps/pocket-e2e/.eslintrc.json b/apps/pocket-e2e/.eslintrc.json
@@ -1,7 +1,7 @@
 {
     "extends": [
         "plugin:@nx/react",
-        "../../.eslintrc.js"
+        "../../.eslintrc.cjs"
     ],
     "ignorePatterns": [
         "!**/*"

diff --git a/apps/pocket/.eslintrc.json b/apps/pocket/.eslintrc.json
@@ -1,6 +1,6 @@
 {
     "extends": [
-        "../../.eslintrc.js"
+        "../../.eslintrc.cjs"
     ],
     "ignorePatterns": [
         "!**/*",

diff --git a/apps/pocket/package.json b/apps/pocket/package.json
@@ -2,6 +2,7 @@
     "name": "@secretarium/pocket",
     "version": "0.0.1",
     "private": true,
+    "type": "module",
     "dependencies": {
         "@testing-library/jest-native": "*",
         "@testing-library/react-native": "*",

diff --git a/apps/pocket/tsconfig.spec.json b/apps/pocket/tsconfig.spec.json
@@ -2,7 +2,7 @@
     "extends": "./tsconfig.json",
     "compilerOptions": {
         "outDir": "../../dist/out-tsc",
-        "module": "commonjs",
+        "module": "esnext",
         "types": [
             "jest",
             "node"

diff --git a/jest.preset.js → jest.preset.cjs b/jest.preset.js → jest.preset.cjs
diff --git a/libs/connector/.eslintrc.json b/libs/connector/.eslintrc.json
@@ -1,6 +1,6 @@
 {
     "extends": [
-        "../../.eslintrc.js"
+        "../../.eslintrc.cjs"
     ],
     "ignorePatterns": [
         "!**/*"

diff --git a/libs/connector/.swcrc b/libs/connector/.swcrc
@@ -1,6 +1,6 @@
 {
     "jsc": {
-        "target": "es2017",
+        "target": "es2021",
         "parser": {
             "syntax": "typescript",
             "decorators": true,

diff --git a/libs/connector/jest.config.ts b/libs/connector/jest.config.ts
@@ -20,7 +20,7 @@ if (swcJestConfig.swcrc === undefined) {
 
 export default {
     displayName: 'connector',
-    preset: '../../jest.preset.js',
+    preset: '../../jest.preset.cjs',
     transform: {
         '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig],
     },

diff --git a/libs/connector/package.json b/libs/connector/package.json
@@ -3,6 +3,7 @@
     "version": "0.17.0",
     "license": "MIT",
     "private": false,
+    "type": "module",
     "repository": {
         "type": "git",
         "url": "https://github.com/secretarium/devsuite-typescript.git",

diff --git a/libs/connector/project.json b/libs/connector/project.json
@@ -25,10 +25,6 @@
                 ],
                 "project": "libs/connector/package.json",
                 "compiler": "swc",
-                "format": [
-                    "cjs",
-                    "esm"
-                ],
                 "external": "all",
                 "generateExportsField": true
             }

diff --git a/libs/connector/src/secretarium.connector.ts b/libs/connector/src/secretarium.connector.ts
@@ -190,7 +190,7 @@ export class SCP {
         return this._socket?.bufferedAmount || 0;
     }
 
-    connect(url: string, userKey: Key, knownTrustedKey: Uint8Array | string | undefined = undefined, protocol: NNG.Protocol = NNG.Protocol.pair1): Promise<void> {
+    async connect(url: string, userKey: Key, knownTrustedKey: Uint8Array | string | undefined = undefined, protocol: NNG.Protocol = NNG.Protocol.pair1): Promise<void> {
         // if (this._socket && this._socket.state < ConnectionState.closing) this._socket.close();
 
         this._endpoint = {
@@ -245,7 +245,7 @@ export class SCP {
                             .send(ecdhPubKeyRaw);
                     });
                 })
-                .then((serverHello: Uint8Array): Promise<Uint8Array> => {
+                .then(async (serverHello: Uint8Array): Promise<Uint8Array> => {
                     const pow = this._computeProofOfWork(serverHello.subarray(0, 32));
                     const clientProofOfWork = Utils.concatBytesArrays([pow, trustedKey]);
                     return new Promise((resolve, reject) => {
@@ -403,7 +403,7 @@ export class SCP {
                 (cbs.onResult = cbs.onResult || []).push(x);
                 return query;
             },
-            send: () => {
+            send: async () => {
                 this.send(app, command, rid, args);
                 return pm;
             }
@@ -456,7 +456,7 @@ export class SCP {
                 (cbs.onResult = cbs.onResult || []).push(x);
                 return tx;
             }, // for chained tx + query
-            send: () => {
+            send: async () => {
                 this.send(app, command, rid, args);
                 return pm;
             }

diff --git a/libs/connector/tsconfig.json b/libs/connector/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../../tsconfig.base.json",
     "compilerOptions": {
-        "module": "commonjs",
+        "module": "esnext",
         "forceConsistentCasingInFileNames": true,
         "resolveJsonModule": true,
         "strict": true,

diff --git a/libs/connector/tsconfig.spec.json b/libs/connector/tsconfig.spec.json
@@ -2,7 +2,7 @@
     "extends": "./tsconfig.json",
     "compilerOptions": {
         "outDir": "../../dist/out-tsc",
-        "module": "commonjs",
+        "module": "esnext",
         "types": [
             "jest",
             "node"

diff --git a/libs/crypto/.eslintrc.json b/libs/crypto/.eslintrc.json
@@ -1,6 +1,6 @@
 {
     "extends": [
-        "../../.eslintrc.js"
+        "../../.eslintrc.cjs"
     ],
     "ignorePatterns": [
         "!**/*",

diff --git a/libs/crypto/.swcrc b/libs/crypto/.swcrc
@@ -1,6 +1,6 @@
 {
     "jsc": {
-        "target": "es2017",
+        "target": "es2021",
         "parser": {
             "syntax": "typescript",
             "decorators": true,

diff --git a/libs/crypto/jest.config.ts b/libs/crypto/jest.config.ts
@@ -20,7 +20,7 @@ if (swcJestConfig.swcrc === undefined) {
 
 export default {
     displayName: 'crypto',
-    preset: '../../jest.preset.js',
+    preset: '../../jest.preset.cjs',
     transform: {
         '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig],
     },

diff --git a/libs/crypto/package.json b/libs/crypto/package.json
@@ -3,6 +3,7 @@
     "version": "0.2.1",
     "license": "MIT",
     "private": false,
+    "type": "module",
     "repository": {
         "type": "git",
         "url": "https://github.com/secretarium/devsuite-typescript.git",

diff --git a/libs/crypto/project.json b/libs/crypto/project.json
@@ -30,10 +30,6 @@
                 ],
                 "project": "libs/crypto/package.json",
                 "compiler": "swc",
-                "format": [
-                    "cjs",
-                    "esm"
-                ],
                 "generateExportsField": true
             }
         },

diff --git a/libs/crypto/tsconfig.json b/libs/crypto/tsconfig.json
@@ -2,7 +2,7 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": {
         "allowJs": true,
-        "module": "commonjs",
+        "module": "esnext",
         "forceConsistentCasingInFileNames": true,
         "strict": true,
         "noImplicitOverride": true,

diff --git a/libs/crypto/tsconfig.spec.json b/libs/crypto/tsconfig.spec.json
@@ -2,7 +2,7 @@
     "extends": "./tsconfig.json",
     "compilerOptions": {
         "outDir": "../../dist/out-tsc",
-        "module": "commonjs",
+        "module": "esnext",
         "types": [
             "jest",
             "node"

diff --git a/libs/instrumentation/.eslintrc.json b/libs/instrumentation/.eslintrc.json
@@ -1,6 +1,6 @@
 {
     "extends": [
-        "../../.eslintrc.js"
+        "../../.eslintrc.cjs"
     ],
     "ignorePatterns": [
         "!**/*"

diff --git a/libs/instrumentation/.swcrc b/libs/instrumentation/.swcrc
@@ -1,6 +1,6 @@
 {
     "jsc": {
-        "target": "es2017",
+        "target": "es2021",
         "parser": {
             "syntax": "typescript",
             "decorators": true,

diff --git a/libs/instrumentation/jest.config.ts b/libs/instrumentation/jest.config.ts
@@ -20,7 +20,7 @@ if (swcJestConfig.swcrc === undefined) {
 
 export default {
     displayName: 'instrumentation',
-    preset: '../../jest.preset.js',
+    preset: '../../jest.preset.cjs',
     transform: {
         '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig],
     },

diff --git a/libs/instrumentation/package.json b/libs/instrumentation/package.json
@@ -3,12 +3,12 @@
     "version": "0.5.0",
     "license": "MIT",
     "private": false,
+    "type": "module",
     "repository": {
         "type": "git",
         "url": "https://github.com/secretarium/devsuite-typescript.git",
         "directory": "libs/instrumentation"
     },
-    "type": "commonjs",
     "peerDependencies": {
         "@secretarium/connector": "0.17.0",
         "@sentry/core": "7.118.0",

diff --git a/libs/instrumentation/project.json b/libs/instrumentation/project.json
@@ -23,10 +23,6 @@
                 ],
                 "project": "libs/instrumentation/package.json",
                 "compiler": "swc",
-                "format": [
-                    "cjs",
-                    "esm"
-                ],
                 "bundle": true,
                 "generateExportsField": true
             }

diff --git a/libs/instrumentation/tsconfig.json b/libs/instrumentation/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../../tsconfig.base.json",
     "compilerOptions": {
-        "module": "commonjs",
+        "module": "esnext",
         "allowSyntheticDefaultImports": true,
         "forceConsistentCasingInFileNames": true,
         "strict": true,

diff --git a/libs/instrumentation/tsconfig.spec.json b/libs/instrumentation/tsconfig.spec.json
@@ -2,7 +2,7 @@
     "extends": "./tsconfig.json",
     "compilerOptions": {
         "outDir": "../../dist/out-tsc",
-        "module": "commonjs",
+        "module": "esnext",
         "types": [
             "jest",
             "node"