fix(schematics): replaceAppNameWithPath use pattern matching now

Make `replaceAppNameWithPath` uses pattern matching while replacing the strings, making sure it does not mess with the wrong properties or values. Example: `ui` was messing with `build` && `@angular-devkit/build-angular`. fix #856
nrwl · Nov 7, 2018 · f6af0b9 · f6af0b9
1 parent cf158c9
commit f6af0b9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/packages/schematics/src/collection/application/application.spec.ts b/packages/schematics/src/collection/application/application.spec.ts
@@ -367,4 +367,16 @@ describe('app', () => {
       expect(angularJson.projects['my-app-e2e']).toBeUndefined();
     });
   });
+
+  describe('replaceAppNameWithPath', () => {
+    it('should protect `angular.json` commands and properties', () => {
+      const tree = schematicRunner.runSchematic('app', { name: 'ui' }, appTree);
+
+      const angularJson = readJsonInTree(tree, 'angular.json');
+      expect(angularJson.projects['ui']).toBeDefined();
+      expect(
+        angularJson.projects['ui']['architect']['build']['builder']
+      ).toEqual('@angular-devkit/build-angular:browser');
+    });
+  });
 });
diff --git a/packages/schematics/src/utils/cli-config-utils.ts b/packages/schematics/src/utils/cli-config-utils.ts
@@ -33,7 +33,11 @@ export function replaceAppNameWithPath(
   root: string
 ): any {
   if (typeof node === 'string') {
-    if (node.indexOf(appName) > -1 && node.indexOf(`${appName}:`) === -1) {
+    const matchPattern = new RegExp(
+      `([^a-z0-9]+(${appName}))|((${appName})[^a-z0-9:]+)`,
+      'gi'
+    );
+    if (!!node.match(matchPattern)) {
       const r = node.replace(appName, root);
       return r.startsWith('/apps') || r.startsWith('/libs')
         ? r.substring(1)