From ec8ea07af90b20a61ba965db50048c686c77a8b9 Mon Sep 17 00:00:00 2001
From: Aleksandras Sukelovic <alex.shukel@gmail.com>
Date: Thu, 20 Jul 2023 08:18:53 +0300
Subject: [PATCH] Fixed main pipeline

---
 .github/workflows/main.yml | 22 ++++++++++++----------
 aqu.config.js              | 26 --------------------------
 aqu.config.json            |  8 ++++++++
 package.json               |  7 ++++---
 pnpm-lock.yaml             |  6 +++++-
 5 files changed, 29 insertions(+), 40 deletions(-)
 delete mode 100644 aqu.config.js
 create mode 100644 aqu.config.json

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 30e7bdf..c03bf5e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,29 +9,31 @@ jobs:
         runs-on: ${{ matrix.os }}
         strategy:
             matrix:
-                node: ['14.x', '16.x']
+                node: ['16.x', '18.x']
                 os: [ubuntu-latest]
 
         steps:
             - name: Checkout repo
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Use Node ${{ matrix.node }}
-              uses: actions/setup-node@v1
+              uses: actions/setup-node@v3
               with:
                   node-version: ${{ matrix.node }}
 
-            - name: Install latest npm
-              run: npm i -g npm@latest
+            - name: Install pnpm 8.6.7
+              uses: pnpm/action-setup@v2.2.4
+              with:
+                  version: 8.6.7
 
-            - name: Install global dependencies
-              run: npm install
+            - name: Install pnpm dependencies (with cache)
+              uses: covbot/pnpm-install-with-cache@v1
 
             - name: Build
-              run: npm run build
+              run: pnpm build
 
             - name: Lint
-              run: npm run lint
+              run: pnpm lint
 
             - name: Test
-              run: npm run test
+              run: pnpm test
diff --git a/aqu.config.js b/aqu.config.js
deleted file mode 100644
index 84f8d22..0000000
--- a/aqu.config.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const sharedOpts = {
-    dtsBundleGeneratorOptions: {
-        libraries: {
-            importedLibraries: ['react'],
-            allowedTypesLibraries: [],
-        },
-    },
-};
-
-const entries = [
-    {
-        format: 'esm',
-        outfile: './dist/index.mjs',
-        declaration: 'none',
-    },
-    {
-        format: 'cjs',
-        cjsMode: 'development',
-        outfile: './dist/index.cjs',
-    },
-];
-
-module.exports = entries.map((entry) => ({
-    ...entry,
-    sharedOpts,
-}));
diff --git a/aqu.config.json b/aqu.config.json
new file mode 100644
index 0000000..05665e6
--- /dev/null
+++ b/aqu.config.json
@@ -0,0 +1,8 @@
+{
+    "dtsBundleGeneratorOptions": {
+        "libraries": {
+            "importedLibraries": ["react"],
+            "allowedTypesLibraries": []
+        }
+    }
+}
diff --git a/package.json b/package.json
index 07e4503..a4d1167 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
     "files": [
         "dist"
     ],
-    "main": "./dist/index.cjs",
+    "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
-    "module": "./dist/index.mjs",
+    "module": "./dist/reactive-popups.esm.js",
     "scripts": {
         "build": "aqu build",
         "start": "aqu watch",
@@ -57,5 +57,6 @@
     },
     "peerDependencies": {
         "react": ">=16"
-    }
+    },
+    "packageManager": "pnpm@8.6.9"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 864546c..faa8e23 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,5 +1,9 @@
 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
 dependencies:
   '@sirse-dev/safe-context':
     specifier: ^0.3.0
@@ -3470,7 +3474,7 @@ packages:
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      typescript: 4.5.4
+      typescript: 4.9.5
       yargs: 17.7.2
     dev: true