test: remove common-tags dependency from E2E tests

clydin · clydin · commit af0ef747b223 · 2022-02-22T09:24:38.000-05:00
The `common-tags` development dependency was only used in several E2E tests.
Removing the usage of the dependency also allows it to be removed as a development dependency from the root `package.json`.
diff --git a/package.json b/package.json
@@ -128,7 +128,6 @@
     "browserslist": "^4.9.1",
     "cacache": "15.3.0",
     "chokidar": "^3.5.2",
-    "common-tags": "^1.8.0",
     "copy-webpack-plugin": "10.2.4",
     "core-js": "3.21.1",
     "critters": "0.0.16",
diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
@@ -1,4 +1,3 @@
-import { oneLineTrim } from 'common-tags';
 import { appendToFile, expectFileToMatch, writeMultipleFiles } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
@@ -53,13 +52,13 @@ export default async function () {
   // index.html lists the right bundles
   await expectFileToMatch(
     'dist/test-project/index.html',
-    oneLineTrim`
-    <script src="runtime.js" type="module"></script>
-    <script src="polyfills.js" type="module"></script>
-    <script src="scripts.js" defer></script>
-    <script src="renamed-script.js" defer></script>
-    <script src="vendor.js" type="module"></script>
-    <script src="main.js" type="module"></script>
-  `,
+    [
+      '<script src="runtime.js" type="module"></script>',
+      '<script src="polyfills.js" type="module"></script>',
+      '<script src="scripts.js" defer></script>',
+      '<script src="renamed-script.js" defer></script>',
+      '<script src="vendor.js" type="module"></script>',
+      '<script src="main.js" type="module"></script>',
+    ].join(''),
   );
 }
diff --git a/tests/legacy-cli/e2e/tests/basic/styles-array.ts b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
@@ -1,4 +1,3 @@
-import { oneLineTrim } from 'common-tags';
 import { expectFileToMatch, writeMultipleFiles } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
@@ -36,10 +35,7 @@ export default async function () {
   await expectFileToMatch('dist/test-project/renamed-lazy-style.css', '.pre-rename-lazy-style');
   await expectFileToMatch(
     'dist/test-project/index.html',
-    oneLineTrim`
-      <link rel="stylesheet" href="styles.css">
-      <link rel="stylesheet" href="renamed-style.css">
-    `,
+    '<link rel="stylesheet" href="styles.css"><link rel="stylesheet" href="renamed-style.css">',
   );
 
   // Non injected styles should be listed under lazy chunk files
diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts
@@ -1,4 +1,3 @@
-import { oneLineTrim } from 'common-tags';
 import {
   expectFileSizeToBeUnder,
   expectFileToExist,
diff --git a/tests/legacy-cli/e2e/tests/build/styles/imports.ts b/tests/legacy-cli/e2e/tests/build/styles/imports.ts
@@ -1,9 +1,7 @@
 import { writeMultipleFiles, expectFileToMatch, replaceInFile } from '../../../utils/fs';
 import { expectToFail } from '../../../utils/utils';
 import { ng } from '../../../utils/process';
-import { stripIndents } from 'common-tags';
 import { updateJsonFile } from '../../../utils/project';
-import { getGlobalVariable } from '../../../utils/env';
 
 export default function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
@@ -15,24 +13,22 @@ export default function () {
     promise = promise.then(() => {
       return (
         writeMultipleFiles({
-          [`src/styles.${ext}`]: stripIndents`
+          [`src/styles.${ext}`]: `
           @import './imported-styles.${ext}';
           body { background-color: #00f; }
         `,
-          [`src/imported-styles.${ext}`]: stripIndents`
+          [`src/imported-styles.${ext}`]: `
           p { background-color: #f00; }
         `,
-          [`src/app/app.component.${ext}`]: stripIndents`
+          [`src/app/app.component.${ext}`]: `
           @import './imported-component-styles.${ext}';
           .outer {
             .inner {
               background: #fff;
             }
           }
         `,
-          [`src/app/imported-component-styles.${ext}`]: stripIndents`
-          h1 { background: #000; }
-        `,
+          [`src/app/imported-component-styles.${ext}`]: 'h1 { background: #000; }',
         })
           // change files to use preprocessor
           .then(() =>
diff --git a/tests/legacy-cli/e2e/tests/build/styles/less.ts b/tests/legacy-cli/e2e/tests/build/styles/less.ts
@@ -6,21 +6,18 @@ import {
 } from '../../../utils/fs';
 import { expectToFail } from '../../../utils/utils';
 import { ng } from '../../../utils/process';
-import { stripIndents } from 'common-tags';
 import { updateJsonFile } from '../../../utils/project';
 
 export default function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return writeMultipleFiles({
-    'src/styles.less': stripIndents`
+    'src/styles.less': `
       @import './imported-styles.less';
       body { background-color: blue; }
     `,
-    'src/imported-styles.less': stripIndents`
-      p { background-color: red; }
-    `,
-    'src/app/app.component.less': stripIndents`
+    'src/imported-styles.less': 'p { background-color: red; }',
+    'src/app/app.component.less': `
         .outer {
           .inner {
             background: #fff;
diff --git a/tests/legacy-cli/e2e/tests/build/styles/loaders.ts b/tests/legacy-cli/e2e/tests/build/styles/loaders.ts
@@ -2,40 +2,39 @@ import {
   writeMultipleFiles,
   deleteFile,
   expectFileToMatch,
-  replaceInFile
+  replaceInFile,
 } from '../../../utils/fs';
 import { ng } from '../../../utils/process';
-import { stripIndents } from 'common-tags';
 import { updateJsonFile } from '../../../utils/project';
 import { expectToFail } from '../../../utils/utils';
 
-export default function () {
-  return writeMultipleFiles({
-    'src/styles.scss': stripIndents`
+export default async function () {
+  await writeMultipleFiles({
+    'src/styles.scss': `
       @import './imported-styles.scss';
       body { background-color: blue; }
     `,
-    'src/imported-styles.scss': stripIndents`
-      p { background-color: red; }
-    `,
-    'src/app/app.component.scss': stripIndents`
-        .outer {
-          .inner {
-            background: #fff;
-          }
+    'src/imported-styles.scss': 'p { background-color: red; }',
+    'src/app/app.component.scss': `
+      .outer {
+        .inner {
+          background: #fff;
         }
-      `})
-    .then(() => deleteFile('src/app/app.component.css'))
-    .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
-      appArchitect.build.options.styles = [
-        { input: 'src/styles.scss' },
-      ];
-    }))
-    .then(() => replaceInFile('src/app/app.component.ts',
-      './app.component.css', './app.component.scss'))
-    .then(() => ng('build', '--configuration=development'))
-    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/styles.css', /exports/)))
-    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/main-es5.js',
-      /".*module\.exports.*\.outer.*background:/)));
+      }
+    `,
+  });
+
+  await deleteFile('src/app/app.component.css');
+  await updateJsonFile('angular.json', (workspaceJson) => {
+    const appArchitect = workspaceJson.projects['test-project'].architect;
+    appArchitect.build.options.styles = [{ input: 'src/styles.scss' }];
+  });
+  await replaceInFile('src/app/app.component.ts', './app.component.css', './app.component.scss');
+
+  await ng('build', '--configuration=development');
+
+  await expectToFail(() => expectFileToMatch('dist/test-project/styles.css', /exports/));
+  await expectToFail(() =>
+    expectFileToMatch('dist/test-project/main.js', /".*module\.exports.*\.outer.*background:/),
+  );
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/material-import.ts b/tests/legacy-cli/e2e/tests/build/styles/material-import.ts
@@ -1,4 +1,3 @@
-import { stripIndents } from 'common-tags';
 import { getGlobalVariable } from '../../../utils/env';
 import { replaceInFile, writeMultipleFiles } from '../../../utils/fs';
 import { installWorkspacePackages } from '../../../utils/packages';
@@ -25,12 +24,9 @@ export default async function () {
 
   for (const ext of ['css', 'scss', 'less', 'styl']) {
     await writeMultipleFiles({
-      [`src/styles.${ext}`]: stripIndents`
-        @import "~@angular/material/prebuilt-themes/indigo-pink.css";
-      `,
-      [`src/app/app.component.${ext}`]: stripIndents`
-        @import "~@angular/material/prebuilt-themes/indigo-pink.css";
-      `,
+      [`src/styles.${ext}`]: '@import "~@angular/material/prebuilt-themes/indigo-pink.css";',
+      [`src/app/app.component.${ext}`]:
+        '@import "~@angular/material/prebuilt-themes/indigo-pink.css";',
     });
 
     // change files to use preprocessor
@@ -48,12 +44,9 @@ export default async function () {
     // run build app
     await ng('build', '--source-map', '--configuration=development');
     await writeMultipleFiles({
-      [`src/styles.${ext}`]: stripIndents`
-          @import "@angular/material/prebuilt-themes/indigo-pink.css";
-        `,
-      [`src/app/app.component.${ext}`]: stripIndents`
-          @import "@angular/material/prebuilt-themes/indigo-pink.css";
-        `,
+      [`src/styles.${ext}`]: '@import "@angular/material/prebuilt-themes/indigo-pink.css";',
+      [`src/app/app.component.${ext}`]:
+        '@import "@angular/material/prebuilt-themes/indigo-pink.css";',
     });
 
     await ng('build', '--configuration=development');
diff --git a/tests/legacy-cli/e2e/tests/build/styles/scss.ts b/tests/legacy-cli/e2e/tests/build/styles/scss.ts
@@ -6,21 +6,18 @@ import {
 } from '../../../utils/fs';
 import { expectToFail } from '../../../utils/utils';
 import { ng } from '../../../utils/process';
-import { stripIndents } from 'common-tags';
 import { updateJsonFile } from '../../../utils/project';
 
 export default function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return writeMultipleFiles({
-    'src/styles.scss': stripIndents`
+    'src/styles.scss': `
       @import './imported-styles.scss';
       body { background-color: blue; }
     `,
-    'src/imported-styles.scss': stripIndents`
-      p { background-color: red; }
-    `,
-    'src/app/app.component.scss': stripIndents`
+    'src/imported-styles.scss': 'p { background-color: red; }',
+    'src/app/app.component.scss': `
         .outer {
           .inner {
             background: #fff;
diff --git a/tests/legacy-cli/e2e/tests/build/styles/stylus.ts b/tests/legacy-cli/e2e/tests/build/styles/stylus.ts
@@ -6,21 +6,18 @@ import {
 } from '../../../utils/fs';
 import { expectToFail } from '../../../utils/utils';
 import { ng } from '../../../utils/process';
-import { stripIndents } from 'common-tags';
 import { updateJsonFile } from '../../../utils/project';
 
 export default function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return writeMultipleFiles({
-    'src/styles.styl': stripIndents`
+    'src/styles.styl': `
       @import './imported-styles.styl';
       body { background-color: blue; }
     `,
-    'src/imported-styles.styl': stripIndents`
-      p { background-color: red; }
-    `,
-    'src/app/app.component.styl': stripIndents`
+    'src/imported-styles.styl': 'p { background-color: red; }',
+    'src/app/app.component.styl': `
         .outer {
           .inner {
             background: #fff;
diff --git a/tests/legacy-cli/e2e/tests/build/ts-paths.ts b/tests/legacy-cli/e2e/tests/build/ts-paths.ts
@@ -1,21 +1,14 @@
-import { stripIndents } from 'common-tags';
 import { appendToFile, createDir, replaceInFile, rimraf, writeMultipleFiles } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateTsConfig } from '../../utils/project';
 
 export default async function () {
-  await updateTsConfig(json => {
+  await updateTsConfig((json) => {
     json['compilerOptions']['baseUrl'] = './src';
     json['compilerOptions']['paths'] = {
-      '@shared': [
-        'app/shared',
-      ],
-      '@shared/*': [
-        'app/shared/*',
-      ],
-      '@root/*': [
-        './*',
-      ],
+      '@shared': ['app/shared'],
+      '@shared/*': ['app/shared/*'],
+      '@root/*': ['./*'],
     };
   });
 
@@ -29,14 +22,13 @@ export default async function () {
   await replaceInFile('src/app/app.module.ts', './app.component', '@root/app/app.component');
   await ng('build', '--configuration=development');
 
-  await updateTsConfig(json => {
-    json['compilerOptions']['paths']['*'] = [
-      '*',
-      'app/shared/*',
-    ];
+  await updateTsConfig((json) => {
+    json['compilerOptions']['paths']['*'] = ['*', 'app/shared/*'];
   });
 
-  await appendToFile('src/app/app.component.ts', stripIndents`
+  await appendToFile(
+    'src/app/app.component.ts',
+    `
     import { meaning } from 'app/shared/meaning';
     import { meaning as meaning2 } from '@shared';
     import { meaning as meaning3 } from '@shared/meaning';
@@ -50,7 +42,8 @@ export default async function () {
     console.log(meaning3)
     console.log(meaning4)
     console.log(meaning5)
-  `);
+  `,
+  );
 
   await ng('build', '--configuration=development');
 
diff --git a/tests/legacy-cli/e2e/tests/commands/help/help-hidden.ts b/tests/legacy-cli/e2e/tests/commands/help/help-hidden.ts
@@ -1,26 +1,19 @@
-import { oneLine } from 'common-tags';
-
 import { silentNg } from '../../../utils/process';
 
-
-export default function() {
+export default function () {
   return Promise.resolve()
     .then(() => silentNg('--help'))
     .then(({ stdout }) => {
       if (stdout.match(/(easter-egg)|(ng make-this-awesome)|(ng init)/)) {
-        throw new Error(oneLine`
-          Expected to not match "(easter-egg)|(ng make-this-awesome)|(ng init)"
-          in help output.
-        `);
+        throw new Error(
+          'Expected to not match "(easter-egg)|(ng make-this-awesome)|(ng init)" in help output.',
+        );
       }
     })
     .then(() => silentNg('--help', 'new'))
     .then(({ stdout }) => {
       if (stdout.match(/--link-cli/)) {
-        throw new Error(oneLine`
-          Expected to not match "--link-cli"
-          in help output.
-        `);
+        throw new Error('Expected to not match "--link-cli" in help output.');
       }
-    })
+    });
 }
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-duplicate.ts b/tests/legacy-cli/e2e/tests/generate/component/component-duplicate.ts
@@ -1,4 +1,3 @@
-import { oneLine } from 'common-tags';
 import { appendToFile } from '../../../utils/fs';
 import { ng } from '../../../utils/process';
 import { expectToFail } from '../../../utils/utils';
@@ -7,12 +6,11 @@ export default function () {
   return ng('generate', 'component', 'test-component')
     .then((output) => {
       if (!output.stdout.match(/UPDATE src[\\|\/]app[\\|\/]app.module.ts/)) {
-        throw new Error(oneLine`
-          Expected to match
-          "UPDATE src/app.module.ts"
-          in ${output.stdout}.`);
+        throw new Error(`Expected to match "UPDATE src/app.module.ts" in ${output.stdout}.`);
       }
     })
-    .then(() => appendToFile('src/app/test-component/test-component.component.ts', '\n// new content'))
+    .then(() =>
+      appendToFile('src/app/test-component/test-component.component.ts', '\n// new content'),
+    )
     .then(() => expectToFail(() => ng('generate', 'component', 'test-component')));
 }
diff --git a/tests/legacy-cli/e2e/tests/misc/common-async.ts b/tests/legacy-cli/e2e/tests/misc/common-async.ts
diff --git a/tests/legacy-cli/e2e/tests/test/test-scripts.ts b/tests/legacy-cli/e2e/tests/test/test-scripts.ts
diff --git a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
diff --git a/tests/legacy-cli/e2e/utils/fs.ts b/tests/legacy-cli/e2e/utils/fs.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import { oneLineTrim } from 'common-tags';`
`2`	`1`	`import {`
`3`	`2`	`expectFileSizeToBeUnder,`
`4`	`3`	`expectFileToExist,`