Fix/step 31 final adjustments

.devcontainer/devcontainer.json

@@ -8,9 +8,9 @@
     "ghcr.io/devcontainers/features/git:1": {},
     "ghcr.io/devcontainers/features/github-cli:1": {}
   },
-  "forwardPorts": [1212, 3000],
+  "forwardPorts": [1313, 3000],
   "portsAttributes": {
-    "1212": { "label": "Webpack Dev Server (Renderer)" },
+    "1313": { "label": "Webpack Dev Server (Renderer)" },
     "3000": { "label": "Electron Debug Port" }
   },
   "mounts": [

.github/workflows/migration-ci.yml

@@ -22,10 +22,10 @@ jobs:
           cache: 'npm'
 
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --ignore-scripts
 
       - name: Validate architecture layers
-        run: npx tsx src2/__architecture__/validate.ts
+        run: npx tsx src/__architecture__/validate.ts
 
   unit-tests:
     name: Unit Tests + Coverage (src2)
@@ -41,10 +41,10 @@ jobs:
           cache: 'npm'
 
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --ignore-scripts
 
-      - name: Run src2 tests with 100% coverage threshold
-        run: npx jest --config jest.config.src2.json --collectCoverage --ci
+      - name: Run tests with coverage
+        run: npx jest --config jest.config.json --collectCoverage --ci
 
       - name: Upload coverage report
         uses: actions/upload-artifact@v4

configs/webpack/webpack.config.main.dev.ts

@@ -1,32 +1,57 @@
 /**
- * Webpack config for development electron main process
+ * Webpack config for development electron main process (new src)
+ *
+ * Builds from src/main/. All @root imports resolve to src/.
  */
 
 import { join } from 'path'
 import webpack from 'webpack'
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
 import { merge } from 'webpack-merge'
 
+import { dependencies as externals } from '../../release/app/package.json'
 import checkNodeEnv from '../../scripts/check-node-env'
-import baseConfig from './webpack.config.base'
 import webpackPaths from './webpack.paths'
 
-// When an ESLint server is running, we can't set the NODE_ENV so we'll check if it's
-// at the dev webpack config is not accidentally run in a production environment
 if (process.env.NODE_ENV === 'production') {
   checkNodeEnv('development')
 }
 
+const srcPath = join(webpackPaths.rootPath, 'src')
+const srcMainPath = join(srcPath, 'main')
+
 const configuration: webpack.Configuration = {
   devtool: 'inline-source-map',
 
   mode: 'development',
 
   target: 'electron-main',
 
+  externals: [...Object.keys(externals || {}), 'terser-webpack-plugin'],
+
+  stats: 'errors-only',
+
+  module: {
+    rules: [
+      {
+        test: /\.[jt]sx?$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'ts-loader',
+          options: {
+            transpileOnly: true,
+            compilerOptions: {
+              module: 'esnext',
+            },
+          },
+        },
+      },
+    ],
+  },
+
   entry: {
-    main: join(webpackPaths.srcMainPath, 'main.ts'),
-    preload: join(webpackPaths.srcMainPath, 'modules/preload/preload.ts'),
+    main: join(srcMainPath, 'main.ts'),
+    preload: join(srcMainPath, 'modules/preload/preload.ts'),
   },
 
   output: {
@@ -37,12 +62,19 @@ const configuration: webpack.Configuration = {
     },
   },
 
-
   resolve: {
-    extensions: ['.ts', '.js'],
+    extensions: ['.js', '.jsx', '.json', '.ts', '.tsx'],
+    modules: [srcPath, 'node_modules'],
+    alias: {
+      '@root/utils': join(srcPath, 'frontend', 'utils'),
+      '@root': srcPath,
+    },
   },
 
   plugins: [
+    new webpack.EnvironmentPlugin({
+      NODE_ENV: 'development',
+    }),
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     new BundleAnalyzerPlugin({
@@ -54,15 +86,10 @@ const configuration: webpack.Configuration = {
     }),
   ],
 
-  /**
-   * Disables webpack processing of __dirname and __filename.
-   * If you run the bundle in node.js it falls back to these values of node.js.
-   * https://github.com/webpack/webpack/issues/2010
-   */
   node: {
     __dirname: false,
     __filename: false,
   },
 }
 
-export default merge(baseConfig, configuration)
+export default configuration

configs/webpack/webpack.config.main.old.dev.ts

@@ -0,0 +1,68 @@
+/**
+ * Webpack config for development electron main process
+ */
+
+import { join } from 'path'
+import webpack from 'webpack'
+import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
+import { merge } from 'webpack-merge'
+
+import checkNodeEnv from '../../scripts/check-node-env'
+import baseConfig from './webpack.config.base'
+import webpackPaths from './webpack.paths'
+
+// When an ESLint server is running, we can't set the NODE_ENV so we'll check if it's
+// at the dev webpack config is not accidentally run in a production environment
+if (process.env.NODE_ENV === 'production') {
+  checkNodeEnv('development')
+}
+
+const configuration: webpack.Configuration = {
+  devtool: 'inline-source-map',
+
+  mode: 'development',
+
+  target: 'electron-main',
+
+  entry: {
+    main: join(webpackPaths.srcMainPath, 'main.ts'),
+    preload: join(webpackPaths.srcMainPath, 'modules/preload/preload.ts'),
+  },
+
+  output: {
+    path: webpackPaths.dllPath,
+    filename: '[name].bundle.dev.js',
+    library: {
+      type: 'umd',
+    },
+  },
+
+
+  resolve: {
+    extensions: ['.ts', '.js'],
+  },
+
+  plugins: [
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    new BundleAnalyzerPlugin({
+      analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
+      analyzerPort: 8888,
+    }),
+    new webpack.DefinePlugin({
+      'process.type': '"browser"',
+    }),
+  ],
+
+  /**
+   * Disables webpack processing of __dirname and __filename.
+   * If you run the bundle in node.js it falls back to these values of node.js.
+   * https://github.com/webpack/webpack/issues/2010
+   */
+  node: {
+    __dirname: false,
+    __filename: false,
+  },
+}
+
+export default merge(baseConfig, configuration)