feat(angular): generate directory instead of

nrwl · Apr 12, 2024 · 783afba · 783afba
1 parent ad9af80
commit 783afba
Show file tree

Hide file tree

Showing 21 changed files with 120 additions and 58 deletions.
diff --git a/docs/generated/packages/angular/executors/application.json b/docs/generated/packages/angular/executors/application.json
@@ -38,11 +38,12 @@
                 },
                 "output": {
                   "type": "string",
+                  "default": "",
                   "description": "Absolute path within the output."
                 }
               },
               "additionalProperties": false,
-              "required": ["glob", "input", "output"]
+              "required": ["glob", "input"]
             },
             { "type": "string" }
           ]
@@ -663,11 +664,12 @@
               },
               "output": {
                 "type": "string",
+                "default": "",
                 "description": "Absolute path within the output."
               }
             },
             "additionalProperties": false,
-            "required": ["glob", "input", "output"]
+            "required": ["glob", "input"]
           },
           { "type": "string" }
         ]

diff --git a/docs/generated/packages/angular/executors/browser-esbuild.json b/docs/generated/packages/angular/executors/browser-esbuild.json
@@ -38,11 +38,12 @@
                 },
                 "output": {
                   "type": "string",
+                  "default": "",
                   "description": "Absolute path within the output."
                 }
               },
               "additionalProperties": false,
-              "required": ["glob", "input", "output"]
+              "required": ["glob", "input"]
             },
             { "type": "string" }
           ]
@@ -572,11 +573,12 @@
               },
               "output": {
                 "type": "string",
+                "default": "",
                 "description": "Absolute path within the output."
               }
             },
             "additionalProperties": false,
-            "required": ["glob", "input", "output"]
+            "required": ["glob", "input"]
           },
           { "type": "string" }
         ]

diff --git a/docs/generated/packages/angular/executors/webpack-browser.json b/docs/generated/packages/angular/executors/webpack-browser.json
@@ -56,11 +56,12 @@
                 },
                 "output": {
                   "type": "string",
+                  "default": "",
                   "description": "Absolute path within the output."
                 }
               },
               "additionalProperties": false,
-              "required": ["glob", "input", "output"]
+              "required": ["glob", "input"]
             },
             { "type": "string" }
           ]
@@ -592,11 +593,12 @@
               },
               "output": {
                 "type": "string",
+                "default": "",
                 "description": "Absolute path within the output."
               }
             },
             "additionalProperties": false,
-            "required": ["glob", "input", "output"]
+            "required": ["glob", "input"]
           },
           { "type": "string" }
         ]

diff --git a/docs/generated/packages/angular/executors/webpack-server.json b/docs/generated/packages/angular/executors/webpack-server.json
@@ -38,11 +38,12 @@
                 },
                 "output": {
                   "type": "string",
+                  "default": "",
                   "description": "Absolute path within the output."
                 }
               },
               "additionalProperties": false,
-              "required": ["glob", "input", "output"]
+              "required": ["glob", "input"]
             },
             { "type": "string" }
           ]
@@ -323,11 +324,12 @@
               },
               "output": {
                 "type": "string",
+                "default": "",
                 "description": "Absolute path within the output."
               }
             },
             "additionalProperties": false,
-            "required": ["glob", "input", "output"]
+            "required": ["glob", "input"]
           },
           { "type": "string" }
         ]

diff --git a/e2e/angular-core/src/ng-add.test.ts b/e2e/angular-core/src/ng-add.test.ts
@@ -76,7 +76,7 @@ describe('convert Angular CLI workspace to an Nx workspace', () => {
     cleanupProject();
   });
 
-  it('should generate a workspace', () => {
+  it('hhhhhhshould generate a workspace', () => {
     addProtractor();
 
     // update package.json
@@ -185,10 +185,7 @@ describe('convert Angular CLI workspace to an Nx workspace', () => {
         browser: `apps/${project}/src/main.ts`,
         polyfills: [`zone.js`],
         tsConfig: `apps/${project}/tsconfig.app.json`,
-        assets: [
-          `apps/${project}/src/favicon.ico`,
-          `apps/${project}/src/assets`,
-        ],
+        assets: [{ glob: '**/*', input: `apps/${project}/public` }],
         styles: [`apps/${project}/src/styles.css`],
         scripts: [`apps/${project}/src/scripts.js`],
       },
@@ -229,10 +226,7 @@ describe('convert Angular CLI workspace to an Nx workspace', () => {
       options: {
         polyfills: [`zone.js`, `zone.js/testing`],
         tsConfig: `apps/${project}/tsconfig.spec.json`,
-        assets: [
-          `apps/${project}/src/favicon.ico`,
-          `apps/${project}/src/assets`,
-        ],
+        assets: [{ glob: '**/*', input: `apps/${project}/public` }],
         styles: [`apps/${project}/src/styles.css`],
         scripts: [`apps/${project}/src/scripts.js`],
       },

diff --git a/e2e/angular-extensions/src/misc.test.ts b/e2e/angular-extensions/src/misc.test.ts
@@ -42,7 +42,7 @@ describe('Move Angular Project', () => {
     expect(moveOutput).toContain(`CREATE ${newPath}/tsconfig.json`);
     expect(moveOutput).toContain(`CREATE ${newPath}/tsconfig.spec.json`);
     expect(moveOutput).toContain(`CREATE ${newPath}/.eslintrc.json`);
-    expect(moveOutput).toContain(`CREATE ${newPath}/src/favicon.ico`);
+    expect(moveOutput).toContain(`CREATE ${newPath}/public/favicon.ico`);
     expect(moveOutput).toContain(`CREATE ${newPath}/src/index.html`);
     expect(moveOutput).toContain(`CREATE ${newPath}/src/main.ts`);
     expect(moveOutput).toContain(`CREATE ${newPath}/src/styles.css`);
@@ -52,7 +52,6 @@ describe('Move Angular Project', () => {
     );
     expect(moveOutput).toContain(`CREATE ${newPath}/src/app/app.component.ts`);
     expect(moveOutput).toContain(`CREATE ${newPath}/src/app/app.config.ts`);
-    expect(moveOutput).toContain(`CREATE ${newPath}/src/assets/.gitkeep`);
   });
 
   /**

diff --git a/packages/angular/src/builders/webpack-browser/schema.json b/packages/angular/src/builders/webpack-browser/schema.json
@@ -498,11 +498,12 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

diff --git a/packages/angular/src/builders/webpack-server/schema.json b/packages/angular/src/builders/webpack-server/schema.json
@@ -271,11 +271,12 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

diff --git a/packages/angular/src/executors/application/schema.json b/packages/angular/src/executors/application/schema.json
@@ -600,11 +600,12 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

diff --git a/packages/angular/src/executors/browser-esbuild/schema.json b/packages/angular/src/executors/browser-esbuild/schema.json
@@ -502,11 +502,12 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

diff --git a/packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap b/packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap
@@ -243,8 +243,10 @@ exports[`app --project-name-and-root-format=derived should generate correctly wh
       "executor": "@angular-devkit/build-angular:application",
       "options": {
         "assets": [
-          "apps/my-dir/my-app/src/favicon.ico",
-          "apps/my-dir/my-app/src/assets",
+          {
+            "glob": "**/*",
+            "input": "apps/my-dir/my-app/public",
+          },
         ],
         "browser": "apps/my-dir/my-app/src/main.ts",
         "index": "apps/my-dir/my-app/src/index.html",
@@ -444,8 +446,10 @@ exports[`app --project-name-and-root-format=derived should generate correctly wh
       "executor": "@angular-devkit/build-angular:application",
       "options": {
         "assets": [
-          "apps/my-app/src/favicon.ico",
-          "apps/my-app/src/assets",
+          {
+            "glob": "**/*",
+            "input": "apps/my-app/public",
+          },
         ],
         "browser": "apps/my-app/src/main.ts",
         "index": "apps/my-app/src/index.html",
@@ -819,7 +823,7 @@ exports[`app --strict should enable strict type checking: e2e tsconfig.json 1`]
 }
 `;
 
-exports[`app angular v15 support should import "ApplicationConfig" from "@angular/platform-browser" 1`] = `
+exports[`app angular compat support should import "ApplicationConfig" from "@angular/platform-browser" 1`] = `
 "import { ApplicationConfig } from '@angular/platform-browser';
 import { provideRouter } from '@angular/router';
 import { appRoutes } from './app.routes';
@@ -940,8 +944,10 @@ exports[`app nested should create project configs 1`] = `
       "executor": "@angular-devkit/build-angular:application",
       "options": {
         "assets": [
-          "my-dir/my-app/src/favicon.ico",
-          "my-dir/my-app/src/assets",
+          {
+            "glob": "**/*",
+            "input": "my-dir/my-app/public",
+          },
         ],
         "browser": "my-dir/my-app/src/main.ts",
         "index": "my-dir/my-app/src/index.html",
@@ -1054,8 +1060,10 @@ exports[`app not nested should create project configs 1`] = `
       "executor": "@angular-devkit/build-angular:application",
       "options": {
         "assets": [
-          "my-app/src/favicon.ico",
-          "my-app/src/assets",
+          {
+            "glob": "**/*",
+            "input": "my-app/public",
+          },
         ],
         "browser": "my-app/src/main.ts",
         "index": "my-app/src/index.html",

diff --git a/packages/angular/src/generators/application/application.spec.ts b/packages/angular/src/generators/application/application.spec.ts
@@ -1186,7 +1186,7 @@ describe('app', () => {
     });
   });
 
-  describe('angular v15 support', () => {
+  describe('angular compat support', () => {
     beforeEach(() => {
       appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
       updateJson(appTree, 'package.json', (json) => ({
@@ -1260,6 +1260,21 @@ describe('app', () => {
           .esModuleInterop
       ).toBeUndefined();
     });
+
+    it('should configure the correct assets for versions lower than v18', async () => {
+      updateJson(appTree, 'package.json', (json) => ({
+        ...json,
+        dependencies: { ...json.dependencies, '@angular/core': '~17.0.0' },
+      }));
+
+      await generateApp(appTree, 'my-app', { rootProject: true });
+
+      const project = readProjectConfiguration(appTree, 'my-app');
+      expect(project.targets.build.options.assets).toStrictEqual([
+        './src/favicon.ico',
+        './src/assets',
+      ]);
+    });
   });
 });
 

diff --git a/...rs/application/files/base/src/favicon.ico → ...ication/files/base-18+/public/favicon.ico b/...rs/application/files/base/src/favicon.ico → ...ication/files/base-18+/public/favicon.ico
diff --git a/...ion/files/base/src/assets/.gitkeep__tpl__ → ...les/base-pre18/src/assets/.gitkeep__tpl__ b/...ion/files/base/src/assets/.gitkeep__tpl__ → ...les/base-pre18/src/assets/.gitkeep__tpl__
diff --git a/packages/angular/src/generators/application/files/base-pre18/src/favicon.ico b/packages/angular/src/generators/application/files/base-pre18/src/favicon.ico
diff --git a/packages/angular/src/generators/application/lib/create-files.ts b/packages/angular/src/generators/application/lib/create-files.ts
@@ -46,6 +46,22 @@ export async function createFiles(
     substitutions
   );
 
+  if (angularMajorVersion >= 18) {
+    generateFiles(
+      tree,
+      joinPathFragments(__dirname, '../files/base-18+'),
+      options.appProjectRoot,
+      substitutions
+    );
+  } else {
+    generateFiles(
+      tree,
+      joinPathFragments(__dirname, '../files/base-pre18'),
+      options.appProjectRoot,
+      substitutions
+    );
+  }
+
   if (options.standalone) {
     generateFiles(
       tree,

diff --git a/packages/angular/src/generators/application/lib/create-project.ts b/packages/angular/src/generators/application/lib/create-project.ts
@@ -1,4 +1,4 @@
-import { addProjectConfiguration, Tree } from '@nx/devkit';
+import { addProjectConfiguration, joinPathFragments, Tree } from '@nx/devkit';
 import type { AngularProjectConfiguration } from '../../../utils/types';
 import { getInstalledAngularVersionInfo } from '../../utils/version-utils';
 import type { NormalizedSchema } from './normalized-schema';
@@ -64,12 +64,23 @@ export function createProject(tree: Tree, options: NormalizedSchema) {
           index: `${options.appProjectSourceRoot}/index.html`,
           [buildMainOptionName]: `${options.appProjectSourceRoot}/main.ts`,
           polyfills: ['zone.js'],
-          tsConfig: `${options.appProjectRoot}/tsconfig.app.json`,
+          tsConfig: joinPathFragments(
+            options.appProjectRoot,
+            'tsconfig.app.json'
+          ),
           inlineStyleLanguage,
-          assets: [
-            `${options.appProjectSourceRoot}/favicon.ico`,
-            `${options.appProjectSourceRoot}/assets`,
-          ],
+          assets:
+            angularMajorVersion >= 18
+              ? [
+                  {
+                    glob: '**/*',
+                    input: joinPathFragments(options.appProjectRoot, 'public'),
+                  },
+                ]
+              : [
+                  `${options.appProjectSourceRoot}/favicon.ico`,
+                  `${options.appProjectSourceRoot}/assets`,
+                ],
           styles: [`${options.appProjectSourceRoot}/styles.${options.style}`],
           scripts: [],
         },

diff --git a/packages/angular/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.ts b/packages/angular/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.ts
@@ -73,8 +73,9 @@ export class AngularDevkitKarmaMigrator extends BuilderMigrator {
     target.options.main =
       target.options.main && this.convertAsset(target.options.main);
     target.options.polyfills = Array.isArray(target.options.polyfills)
-      ? target.options.polyfills.map((p) => this.convertAsset(p))
-      : target.options.polyfills && this.convertAsset(target.options.polyfills);
+      ? target.options.polyfills.map((p) => this.convertSourceRootPath(p))
+      : target.options.polyfills &&
+        this.convertSourceRootPath(target.options.polyfills);
     target.options.tsConfig =
       target.options.tsConfig &&
       joinPathFragments(