From ac7f2ccf4848098eae4bc78cef158c6da1eff26b Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Tue, 6 Feb 2024 12:45:05 +0000
Subject: [PATCH] fix(angular): ajv hoisting issue

chore(angular): update webpack ignored deps
---
 e2e/angular-core/src/projects.test.ts                          | 3 +--
 .../src/builders/webpack-browser/webpack-browser.impl.ts       | 2 +-
 packages/next/package.json                                     | 1 +
 packages/webpack/.eslintrc.json                                | 3 ++-
 packages/webpack/package.json                                  | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/e2e/angular-core/src/projects.test.ts b/e2e/angular-core/src/projects.test.ts
index 5f3173c6bdec6..bada37076e257 100644
--- a/e2e/angular-core/src/projects.test.ts
+++ b/e2e/angular-core/src/projects.test.ts
@@ -218,8 +218,7 @@ describe('Angular Projects', () => {
     removeFile(`${app1}/src/app/inline-template.component.ts`);
   }, 1000000);
 
-  // TODO(crystal, @jaysoo): enable this test when buildable libs work
-  xit('should build the dependent buildable lib and its child lib, as well as the app', async () => {
+  it('should build the dependent buildable lib and its child lib, as well as the app', async () => {
     // ARRANGE
     const buildableLib = uniq('buildlib1');
     const buildableChildLib = uniq('buildlib2');
diff --git a/packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts b/packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts
index 9247a6e6c30df..d4228f999241e 100644
--- a/packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts
+++ b/packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts
@@ -103,7 +103,7 @@ export function executeWebpackBrowserBuilder(
     switchMap(({ executeBrowserBuilder }) =>
       executeBrowserBuilder(delegateBuilderOptions, context as any, {
         webpackConfiguration: (baseWebpackConfig) => {
-          if (!buildLibsFromSource && delegateBuilderOptions.watch) {
+          if (!buildLibsFromSource) {
             const workspaceDependencies = dependencies
               .filter((dep) => !isNpmProject(dep.node))
               .map((dep) => dep.node.name);
diff --git a/packages/next/package.json b/packages/next/package.json
index c5ceafcfe01ee..1963b317f3a4f 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -49,6 +49,7 @@
     "@nx/eslint": "file:../eslint",
     "@nx/react": "file:../react",
     "@nx/web": "file:../web",
+    "@nx/webpack": "file:../webpack",
     "@nx/workspace": "file:../workspace"
   },
   "publishConfig": {
diff --git a/packages/webpack/.eslintrc.json b/packages/webpack/.eslintrc.json
index 8531c0f3919a0..4dab6d17bba4d 100644
--- a/packages/webpack/.eslintrc.json
+++ b/packages/webpack/.eslintrc.json
@@ -46,7 +46,8 @@
               "source-map-loader",
               "swc-loader",
               "@swc/core",
-              "ts-loader"
+              "ts-loader",
+              "ajv"
             ]
           }
         ]
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index 516156015f52b..8df59ae516908 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -30,6 +30,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.23.2",
+    "ajv": "^8.12.0",
     "autoprefixer": "^10.4.9",
     "babel-loader": "^9.1.2",
     "browserslist": "^4.21.4",