fix(@schematics/update): show warning for allowOutsideOutDir assets

Fix angular/angular-cli#10647
angular · May 24, 2018 · 9c0e5f1 · 9c0e5f1
1 parent 4a9a740
commit 9c0e5f1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
@@ -11,6 +11,7 @@ import {
   JsonParseMode,
   Path,
   join,
+  logging,
   normalize,
   parseJson,
   parseJsonAst,
@@ -90,7 +91,7 @@ function migrateKarmaConfiguration(config: CliConfig): Rule {
   };
 }
 
-function migrateConfiguration(oldConfig: CliConfig): Rule {
+function migrateConfiguration(oldConfig: CliConfig, logger: logging.LoggerApi): Rule {
   return (host: Tree, context: SchematicContext) => {
     const oldConfigPath = getConfigPath(host);
     const configPath = normalize('angular.json');
@@ -99,7 +100,7 @@ function migrateConfiguration(oldConfig: CliConfig): Rule {
       '$schema': './node_modules/@angular/cli/lib/config/schema.json',
       version: 1,
       newProjectRoot: 'projects',
-      projects: extractProjectsConfig(oldConfig, host),
+      projects: extractProjectsConfig(oldConfig, host, logger),
     };
     const defaultProject = extractDefaultProject(oldConfig);
     if (defaultProject !== null) {
@@ -211,7 +212,9 @@ function extractArchitectConfig(_config: CliConfig): JsonObject | null {
   return null;
 }
 
-function extractProjectsConfig(config: CliConfig, tree: Tree): JsonObject {
+function extractProjectsConfig(
+  config: CliConfig, tree: Tree, logger: logging.LoggerApi,
+): JsonObject {
   const builderPackage = '@angular-devkit/build-angular';
   const defaultAppNamePrefix = getDefaultAppNamePrefix(config);
 
@@ -256,7 +259,14 @@ function extractProjectsConfig(config: CliConfig, tree: Tree): JsonObject {
         if (typeof asset === 'string') {
           return normalize(appRoot + '/' + asset);
         } else {
-          if (asset.output) {
+          if (asset.allowOutsideOutDir) {
+            logger.warn(tags.oneLine`
+              Asset with input '${asset.input}' was not migrated because it
+              uses the 'allowOutsideOutDir' option which is not supported in Angular CLI 6.
+            `);
+
+            return null;
+          } else if (asset.output) {
             return {
               glob: asset.glob,
               input: normalize(appRoot + '/' + asset.input),
@@ -409,7 +419,7 @@ function extractProjectsConfig(config: CliConfig, tree: Tree): JsonObject {
         };
       }
 
-      buildOptions.assets = (app.assets || []).map(_mapAssets);
+      buildOptions.assets = (app.assets || []).map(_mapAssets).filter(x => !!x);
       buildOptions.styles = (app.styles || []).map(_extraEntryMapper);
       buildOptions.scripts = (app.scripts || []).map(_extraEntryMapper);
       architect.build = {
@@ -455,7 +465,7 @@ function extractProjectsConfig(config: CliConfig, tree: Tree): JsonObject {
         }
       testOptions.scripts = (app.scripts || []).map(_extraEntryMapper);
       testOptions.styles = (app.styles || []).map(_extraEntryMapper);
-      testOptions.assets = (app.assets || []).map(_mapAssets);
+      testOptions.assets = (app.assets || []).map(_mapAssets).filter(x => !!x);
 
       if (karmaConfig) {
         architect.test = {
@@ -752,7 +762,7 @@ export default function (): Rule {
 
     return chain([
       migrateKarmaConfiguration(config),
-      migrateConfiguration(config),
+      migrateConfiguration(config, context.logger),
       updateSpecTsConfig(config),
       updatePackageJson(config),
       updateTsLintConfig(),

diff --git a/packages/schematics/angular/migrations/update-6/index_spec.ts b/packages/schematics/angular/migrations/update-6/index_spec.ts
@@ -40,6 +40,12 @@ describe('Migration to v6', () => {
             'favicon.ico',
             { glob: '**/*', input: './assets/', output: './assets/' },
             { glob: 'favicon.ico', input: './', output: './' },
+            {
+              'glob': '**/*.*',
+              'input': '../server/',
+              'output': '../',
+              'allowOutsideOutDir': true,
+            },
           ],
           index: 'index.html',
           main: 'main.ts',