fix(@schematics/angular): Transfer baseHref when during update process

fixes #10915
angular · Jun 6, 2018 · 9a1210c · 9a1210c
1 parent f2d5bbf
commit 9a1210c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
@@ -403,6 +403,7 @@ function extractProjectsConfig(
         index: `${appRoot}/${app.index || defaults.index}`,
         main: `${appRoot}/${app.main || defaults.main}`,
         tsConfig: `${appRoot}/${app.tsconfig || defaults.tsConfig}`,
+        ...(app.baseHref ? { baseHref: app.baseHref } : {}),
         ...buildDefaults,
       };
 

diff --git a/packages/schematics/angular/migrations/update-6/index_spec.ts b/packages/schematics/angular/migrations/update-6/index_spec.ts
@@ -557,6 +557,22 @@ describe('Migration to v6', () => {
         });
       });
 
+      it('should not set baseHref on build & serve targets if not defined', () => {
+        tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
+        tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
+        const build = getConfig(tree).projects.foo.architect.build;
+        expect(build.options.baseHref).toBeUndefined();
+      });
+
+      it('should set baseHref on build & serve targets if defined', () => {
+        const config = {...baseConfig};
+        config.apps[0].baseHref = '/base/href/';
+        tree.create(oldConfigPath, JSON.stringify(config, null, 2));
+        tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
+        const build = getConfig(tree).projects.foo.architect.build;
+        expect(build.options.baseHref).toEqual('/base/href/');
+      });
+
       it('should add serviceWorker to production configuration', () => {
         baseConfig.apps[0].serviceWorker = true;
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));