From 89b522d2bceb31386a260a91b934c1cd6b08095c Mon Sep 17 00:00:00 2001 From: Jason Jean Date: Fri, 26 Jul 2019 09:01:38 -0400 Subject: [PATCH] fix(frontend): add style tag to head in html output (#1638) fix #1623 --- e2e/react.test.ts | 6 ++++++ e2e/web.test.ts | 3 +++ packages/web/src/builders/build/build.impl.ts | 3 +++ 3 files changed, 12 insertions(+) diff --git a/e2e/react.test.ts b/e2e/react.test.ts index 1adf54cf60..985c062ec0 100644 --- a/e2e/react.test.ts +++ b/e2e/react.test.ts @@ -125,6 +125,12 @@ forEachCli(() => { filesToCheck.push(`dist/apps/${appName}/styles.css`); } checkFilesExist(...filesToCheck); + if (opts.checkStyles) { + expect(readFile(`dist/apps/${appName}/index.html`)).toContain( + `` + ); + } + const testResults = await runCLIAsync(`test ${appName}`); expect(testResults.stderr).toContain('Test Suites: 1 passed, 1 total'); const lintE2eResults = runCLI(`lint ${appName}-e2e`); diff --git a/e2e/web.test.ts b/e2e/web.test.ts index c2e2fdc008..5730d24de8 100644 --- a/e2e/web.test.ts +++ b/e2e/web.test.ts @@ -49,6 +49,9 @@ forEachCli(() => { `dist/apps/${appName}/main-es5.js`, `dist/apps/${appName}/styles.css` ); + expect(readFile(`dist/apps/${appName}/index.html`)).toContain( + `` + ); const testResults = await runCLIAsync(`test ${appName}`); expect(testResults.stderr).toContain('Test Suites: 1 passed, 1 total'); const lintE2eResults = runCLI(`lint ${appName}-e2e`); diff --git a/packages/web/src/builders/build/build.impl.ts b/packages/web/src/builders/build/build.impl.ts index 25836ba5ba..fb95745849 100644 --- a/packages/web/src/builders/build/build.impl.ts +++ b/packages/web/src/builders/build/build.impl.ts @@ -105,6 +105,9 @@ export function run( normalize(context.workspaceRoot), options.index ), + files: result1.emittedFiles.filter( + x => x.extension === '.css' + ), noModuleFiles: result2.emittedFiles, moduleFiles: result1.emittedFiles, baseHref: options.baseHref,