quidproquo-deploy-webpack 0.0.42 → 0.0.44

package/lib/loaders/qpq-config-loader.d.ts

@@ -0,0 +1,2 @@
+declare function _exports(): string;
+export = _exports;

package/lib/loaders/qpq-config-loader.js

@@ -0,0 +1,8 @@
+"use strict";
+const path = require('path');
+module.exports = function () {
+    const config = JSON.parse(process.env.QPQLoaderConfig);
+    const result = `module.exports = ${JSON.stringify(config.qpqConfig, null, 2)}`;
+    // console.log(result);
+    return result;
+};

package/lib/loaders/qpq-dynamic-loader.js

@@ -1,9 +1,6 @@
 "use strict";
 const path = require('path');
 module.exports = function (source) {
-    // console.log('Loader Running');
-    // console.log(process.env.QPQLoaderConfig);
-    // console.log('---');
     const config = JSON.parse(process.env.QPQLoaderConfig);
     const ifStatements = config.allSrcEntries.map((e) => {
         return `if (moduleName === '${e}') {

package/lib/webpack.config.d.ts

@@ -3,11 +3,25 @@ export declare const getWebpackConfig: (qpqConfig: QPQConfig, buildPath: string,
     entry: {
         lambdaAPIGatewayEvent: string;
         lambdaEventBridgeEvent: string;
+        lambdaEventOriginRequest: string;
+        lambdaEventViewerRequest: string;
     };
     resolveLoader: {
         modules: string[];
     };
     mode: string;
+    optimization: {
+        splitChunks: {
+            chunks: string;
+            automaticNameDelimiter: string;
+            cacheGroups: {
+                vendors: {
+                    test: RegExp;
+                    priority: number;
+                };
+            };
+        };
+    };
     target: string;
     output: {
         path: string;
@@ -28,8 +42,8 @@ export declare const getWebpackConfig: (qpqConfig: QPQConfig, buildPath: string,
             options: {
                 presets: string[];
             };
-            exclude: RegExp;
             type?: undefined;
+            exclude?: undefined;
         } | {
             test: RegExp;
             type: string;

package/lib/webpack.config.js

@@ -23,36 +23,43 @@ const getWebpackConfig = (qpqConfig, buildPath, outputPrefix) => {
     process.env.QPQLoaderConfig = JSON.stringify({
         allSrcEntries,
         rootDir: path_1.default.resolve(buildPath, '..'),
+        qpqConfig,
     });
     return {
-        // entry: allSrcEntries.reduce(
-        //   (entry, path) => ({
-        //     ...entry,
-        //     [`./${outputPrefix}/${path}`]: `./${path}`,
-        //   }),
-        //   {},
-        // ),
         entry: {
             lambdaAPIGatewayEvent: 'quidproquo-deploy-awscdk/src/lambdas/lambdaAPIGatewayEvent.ts',
             lambdaEventBridgeEvent: 'quidproquo-deploy-awscdk/src/lambdas/lambdaEventBridgeEvent.ts',
+            lambdaEventOriginRequest: 'quidproquo-deploy-awscdk/src/lambdas/lambdaEventOriginRequest.ts',
+            lambdaEventViewerRequest: 'quidproquo-deploy-awscdk/src/lambdas/lambdaEventViewerRequest.ts',
         },
         resolveLoader: {
             modules: [path_1.default.resolve(__dirname, 'loaders'), 'node_modules'],
         },
         // mode: getWebpackBuildMode(qpqConfig),
         mode: 'production',
-        // We should: sort out how to split the bundles and get it to work on aws
-        // optimization: {
-        //   splitChunks: {
-        //     // include all types of chunks
-        //     chunks: "all",
-        //   },
+        // externals: ({ request }: { request: string }, callback: any) => {
+        //   if (/^@aws-sdk\//.test(request)) {
+        //     return callback(null, `commonjs ${request}`);
+        //   }
+        //   callback();
         // },
+        optimization: {
+            splitChunks: {
+                chunks: 'all',
+                automaticNameDelimiter: '.',
+                cacheGroups: {
+                    vendors: {
+                        test: /[\\/]node_modules[\\/]/,
+                        priority: -10,
+                    },
+                },
+            },
+        },
         target: 'node',
         output: {
             // Output path
             path: buildPath,
-            filename: '[name].js',
+            filename: '[name]/index.js',
             // Allow compiling as a lib ~ don't tree shake my exports plz
             globalObject: 'this',
             libraryTarget: 'commonjs2',
@@ -72,7 +79,7 @@ const getWebpackConfig = (qpqConfig, buildPath, outputPrefix) => {
                         // without additional settings, this will reference .babelrc
                         presets: ['@babel/preset-typescript'],
                     },
-                    exclude: /node_modules/,
+                    // exclude: /node_modules/,
                 },
                 {
                     test: /\.(yaml|json)$/,
@@ -81,6 +88,7 @@ const getWebpackConfig = (qpqConfig, buildPath, outputPrefix) => {
                 },
             ],
         },
+        // plugins: [new BundleAnalyzerPlugin()],
     };
 };
 exports.getWebpackConfig = getWebpackConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-deploy-webpack",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "description": "",
   "main": "./lib/webpack.config.js",
   "types": "./lib/webpack.config.d.js",
@@ -11,7 +11,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "clean": "npx rimraf lib",
     "build": "npm run clean && tsc",
-    "watch": "npm run clean && tsc -w"
+    "watch": "tsc -w"
   },
   "repository": {
     "type": "git",
@@ -31,8 +31,8 @@
     "esbuild": "^0.15.16",
     "quidproquo-actionprocessor-awslambda": "*",
     "quidproquo-actionprocessor-node": "*",
-    "quidproquo-deploy-awscdk": "*",
     "quidproquo-core": "*",
+    "quidproquo-deploy-awscdk": "*",
     "quidproquo-webserver": "*"
   },
   "devDependencies": {
@@ -43,10 +43,12 @@
     "@types/babel__traverse": "7.18.2",
     "@types/node": "^10.17.60",
     "@types/prettier": "2.6.0",
+    "@types/webpack-bundle-analyzer": "^4.6.0",
     "babel-loader": "^9.1.2",
     "quidproquo-tsconfig": "*",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.3",
-    "webpack": "^5.75.0"
+    "webpack": "^5.75.0",
+    "webpack-bundle-analyzer": "^4.7.0"
   }
 }