fix(angular): check for root tslint.json before updating to support E…

…Slint (#4816) Closes #4761
nrwl · Feb 17, 2021 · 5d9c76b · 5d9c76b
1 parent 78a6f98
commit 5d9c76b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 20 deletions.
diff --git a/packages/workspace/src/generators/init/init.spec.ts b/packages/workspace/src/generators/init/init.spec.ts
@@ -312,6 +312,13 @@ describe('workspace', () => {
       const prettierIgnore = tree.read('/.prettierignore').toString();
       expect(prettierIgnore).toBe('# existing ignore rules');
     });
+
+    it('should work with no root tslint.json', async () => {
+      tree.delete('/tslint.json');
+      await initGenerator(tree, { name: 'myApp' });
+
+      expect(tree.exists('/tslint.json')).toBe(false);
+    });
   });
 
   describe('preserve angular cli layout', () => {

diff --git a/packages/workspace/src/generators/init/init.ts b/packages/workspace/src/generators/init/init.ts
@@ -294,27 +294,29 @@ function updateTsConfigsJson(host: Tree, options: Schema) {
 }
 
 function updateTsLint(host: Tree) {
-  updateJson(host, 'tslint.json', (tslintJson) => {
-    [
-      'no-trailing-whitespace',
-      'one-line',
-      'quotemark',
-      'typedef-whitespace',
-      'whitespace',
-    ].forEach((key) => {
-      tslintJson[key] = undefined;
+  if (host.exists(`tslint.json`)) {
+    updateJson(host, 'tslint.json', (tslintJson) => {
+      [
+        'no-trailing-whitespace',
+        'one-line',
+        'quotemark',
+        'typedef-whitespace',
+        'whitespace',
+      ].forEach((key) => {
+        tslintJson[key] = undefined;
+      });
+      tslintJson.rulesDirectory = tslintJson.rulesDirectory || [];
+      tslintJson.rulesDirectory.push('node_modules/@nrwl/workspace/src/tslint');
+      tslintJson.rules['nx-enforce-module-boundaries'] = [
+        true,
+        {
+          allow: [],
+          depConstraints: [{ sourceTag: '*', onlyDependOnLibsWithTags: ['*'] }],
+        },
+      ];
+      return tslintJson;
     });
-    tslintJson.rulesDirectory = tslintJson.rulesDirectory || [];
-    tslintJson.rulesDirectory.push('node_modules/@nrwl/workspace/src/tslint');
-    tslintJson.rules['nx-enforce-module-boundaries'] = [
-      true,
-      {
-        allow: [],
-        depConstraints: [{ sourceTag: '*', onlyDependOnLibsWithTags: ['*'] }],
-      },
-    ];
-    return tslintJson;
-  });
+  }
 }
 
 function updateProjectTsLint(host: Tree, options: Schema) {