fix(@angular-devkit/build-angular): refactor file replacement property names

filipesilva · hansl · commit 8349a65ae260 · 2018-06-05T17:55:17.000-07:00
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -90,7 +90,7 @@ export interface BrowserBuilderOptions {
   styles: ExtraEntryPoint[];
   stylePreprocessorOptions: { includePaths: string[] };
 
-  fileReplacements: { from: string; to: string; }[];
+  fileReplacements: { src: string; replaceWith: string; }[];
 }
 
 export interface AssetPattern {
@@ -222,10 +222,10 @@ export class BrowserBuilder implements Builder<BrowserBuilderOptions> {
 
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
 
-    options.fileReplacements.forEach(({ from, to }) => {
+    options.fileReplacements.forEach(({ src, replaceWith }) => {
       host.aliases.set(
-        join(root, normalize(from)),
-        join(root, normalize(to)),
+        join(root, normalize(src)),
+        join(root, normalize(replaceWith)),
       );
     });
 
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -64,10 +64,10 @@
       "items": {
         "type": "object",
         "properties": {
-          "from": {
+          "src": {
             "type": "string"
           },
-          "to": {
+          "replaceWith": {
             "type": "string"
           }
         }
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -63,7 +63,7 @@ export interface KarmaBuilderOptions {
   // logLevel?: string; // same as above
   // reporters?: string; // same as above
 
-  fileReplacements: { from: string; to: string; }[];
+  fileReplacements: { src: string; replaceWith: string; }[];
 }
 
 export class KarmaBuilder implements Builder<KarmaBuilderOptions> {
@@ -130,10 +130,10 @@ export class KarmaBuilder implements Builder<KarmaBuilderOptions> {
 
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
 
-    options.fileReplacements.forEach(({ from, to }) => {
+    options.fileReplacements.forEach(({ src, replaceWith }) => {
       host.aliases.set(
-        join(root, normalize(from)),
-        join(root, normalize(to)),
+        join(root, normalize(src)),
+        join(root, normalize(replaceWith)),
       );
     });
 
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -109,10 +109,10 @@
       "items": {
         "type": "object",
         "properties": {
-          "from": {
+          "src": {
             "type": "string"
           },
-          "to": {
+          "replaceWith": {
             "type": "string"
           }
         }
diff --git a/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
@@ -32,8 +32,8 @@ describe('Browser Builder file replacements', () => {
     const overrides = {
       fileReplacements: [
         {
-          from: normalize('/src/meaning.ts'),
-          to: normalize('/src/meaning-too.ts'),
+          src: normalize('/src/meaning.ts'),
+          replaceWith: normalize('/src/meaning-too.ts'),
         },
       ],
     };
@@ -54,8 +54,8 @@ describe('Browser Builder file replacements', () => {
     const overrides = {
       fileReplacements: [
         {
-          from: normalize('/src/meaning.ts'),
-          to: normalize('/src/meaning-three.ts'),
+          src: normalize('/src/meaning.ts'),
+          replaceWith: normalize('/src/meaning-three.ts'),
         },
       ],
     };
diff --git a/packages/angular_devkit/build_angular/test/karma/replacements_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/replacements_spec_large.ts
@@ -33,8 +33,8 @@ describe('Karma Builder file replacements', () => {
 
     const overrides = {
       fileReplacements: [{
-        from: normalize('/src/meaning.ts'),
-        to: normalize('/src/meaning-too.ts'),
+        src: normalize('/src/meaning.ts'),
+        replaceWith: normalize('/src/meaning-too.ts'),
       }],
     };
 
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
@@ -132,8 +132,8 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
           configurations: {
             production: {
               fileReplacements: [{
-                from: `${projectRoot}/src/environments/environment.ts`,
-                to: `${projectRoot}/src/environments/environment.prod.ts`,
+                src: `${projectRoot}/src/environments/environment.ts`,
+                replaceWith: `${projectRoot}/src/environments/environment.prod.ts`,
               }],
               optimization: true,
               outputHashing: 'all',
diff --git a/tests/@angular_devkit/build_angular/hello-world-app/.angular.json b/tests/@angular_devkit/build_angular/hello-world-app/.angular.json
@@ -43,8 +43,8 @@
             "production": {
               "fileReplacements": [
                 {
-                  "from": "src/environments/environments.ts",
-                  "to": "src/environments/environments.prod.ts"
+                  "src": "src/environments/environments.ts",
+                  "replaceWith": "src/environments/environments.prod.ts"
                 }
               ],
               "optimization": true,

Original file line number	Diff line number	Diff line change
`@@ -64,10 +64,10 @@`
`64`	`64`	`"items": {`
`65`	`65`	`"type": "object",`
`66`	`66`	`"properties": {`
`67`		`- "from": {`
	`67`	`+ "src": {`
`68`	`68`	`"type": "string"`
`69`	`69`	`},`
`70`		`- "to": {`
	`70`	`+ "replaceWith": {`
`71`	`71`	`"type": "string"`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,10 @@`
`109`	`109`	`"items": {`
`110`	`110`	`"type": "object",`
`111`	`111`	`"properties": {`
`112`		`- "from": {`
	`112`	`+ "src": {`
`113`	`113`	`"type": "string"`
`114`	`114`	`},`
`115`		`- "to": {`
	`115`	`+ "replaceWith": {`
`116`	`116`	`"type": "string"`
`117`	`117`	`}`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@`
`43`	`43`	`"production": {`
`44`	`44`	`"fileReplacements": [`
`45`	`45`	`{`
`46`		`- "from": "src/environments/environments.ts",`
`47`		`- "to": "src/environments/environments.prod.ts"`
	`46`	`+ "src": "src/environments/environments.ts",`
	`47`	`+ "replaceWith": "src/environments/environments.prod.ts"`
`48`	`48`	`}`
`49`	`49`	`],`
`50`	`50`	`"optimization": true,`