Better libraries compilation

package.json

@@ -6,9 +6,10 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "start": "tsc && node dist/index.js",
-    "build": "tsc && npm run build:middleware && npm run build:lib",
-    "build:lib": "node prebuild.js",
-    "build:middleware": "tsc --out src/lib/middleware.js src/middleware/middleware.ts",
+    "build": "npm run build:wapi && npm run build:middleware && npm run build:jsQR && tsc",
+    "build:wapi": "cd src/lib/wapi/ && webpack",
+    "build:middleware": "cd src/lib/middleware/ && webpack",
+    "build:jsQR": "cd src/lib/jsQR/ && gulp",
     "watch": "concurrently \"tsc -w\" \"nodemon dist/index.js\"",
     "clean": "rm -rf session && rm -rf dist",
     "test": "echo \"No tests yet\""
@@ -37,16 +38,20 @@
   },
   "homepage": "https://github.com/danielcardeenas/sulla#readme",
   "devDependencies": {
-    "@types/node": "^13.1.8",
+    "@types/node": "^13.5.0",
     "@types/puppeteer": "^2.0.0",
     "@types/shelljs": "^0.8.6",
     "concurrently": "^5.0.2",
-    "husky": "^4.2.0",
+    "copy-webpack-plugin": "^5.1.1",
+    "gulp": "^4.0.2",
+    "husky": "^4.2.1",
     "nodemon": "^2.0.2",
     "prettier": "^1.19.1",
     "pretty-quick": "^2.0.1",
-    "shelljs": "^0.8.3",
-    "typescript": "^3.7.5"
+    "ts-loader": "^6.2.1",
+    "typescript": "^3.7.5",
+    "webpack": "^4.41.5",
+    "webpack-cli": "^3.3.10"
   },
   "dependencies": {
     "ora": "^4.0.3",

src/controllers/auth.ts

@@ -54,8 +54,9 @@ export async function retrieveQR(page: puppeteer.Page) {
 async function decodeQR(page: puppeteer.Page): Promise<string> {
   await page.waitForSelector('canvas', { timeout: 0 });
   await page.addScriptTag({
-    path: require.resolve(path.join(__dirname, '../lib', 'jsQR.js'))
+    path: require.resolve(path.join(__dirname, '../lib/jsQR', 'jsQR.js'))
   });
+
   return await page.evaluate(() => {
     const canvas = document.querySelector('canvas');
     const context = canvas.getContext('2d');

src/controllers/browser.ts

@@ -15,10 +15,10 @@ export async function initWhatsapp(session: string) {
 
 export async function injectApi(page: puppeteer.Page) {
   await page.addScriptTag({
-    path: require.resolve(path.join(__dirname, '../lib', 'wapi.js'))
+    path: require.resolve(path.join(__dirname, '../lib/wapi', 'wapi.js'))
   });
   await page.addScriptTag({
-    path: require.resolve(path.join(__dirname, '../lib', 'middleware.js'))
+    path: require.resolve(path.join(__dirname, '../lib/middleware', 'middleware.js'))
   });
 
   return page;

src/lib/jsQR/README.md

@@ -0,0 +1 @@
+This file is already bundled and minified. No need for building or webpack here

src/lib/jsQR/gulpfile.js

@@ -0,0 +1,9 @@
+const { src, dest } = require('gulp');
+const path = require('path');
+
+function copy() {
+  return src('./jsQR.js')
+    .pipe(dest(path.resolve(__dirname, '../../../dist/lib/jsQR')));
+}
+
+exports.default = copy;

src/lib/middleware/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "noImplicitAny": false,
+    "module": "es6",
+    "target": "es6",
+  }
+}

src/lib/middleware/webpack.config.js

@@ -0,0 +1,21 @@
+const path = require('path');
+
+module.exports = {
+  entry: './middleware.ts',
+  module: {
+    rules: [
+      {
+        test: /\.tsx?$/,
+        use: 'ts-loader',
+        exclude: /node_modules/,
+      },
+    ],
+  },
+  resolve: {
+    extensions: [ '.tsx', '.ts', '.js' ],
+  },
+  output: {
+    filename: 'middleware.js',
+    path: path.resolve(__dirname, '../../../dist/lib/middleware'),
+  },
+};