From cf7ad731651df8bcfc6f9a677e00b0822f15392d Mon Sep 17 00:00:00 2001 From: Jack Hsu Date: Mon, 28 Nov 2022 17:08:37 -0500 Subject: [PATCH] =?UTF-8?q?cleanup(bundling):=20remove=20unnecessary=20fil?= =?UTF-8?q?es=20and=20targets=20for=20Vite=20apps=E2=80=A6=20(#13456)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/generated/packages/vite.json | 2 +- .../library/files/vite/index.html__tmpl__ | 15 ------------- .../library/files/vite/src/demo.tsx__tmpl__ | 19 ---------------- .../generators/configuration/configuration.ts | 5 ++++- .../src/generators/configuration/schema.json | 2 +- packages/vite/src/utils/generator-utils.ts | 22 ++++--------------- 6 files changed, 10 insertions(+), 55 deletions(-) delete mode 100644 packages/react/src/generators/library/files/vite/index.html__tmpl__ delete mode 100644 packages/react/src/generators/library/files/vite/src/demo.tsx__tmpl__ diff --git a/docs/generated/packages/vite.json b/docs/generated/packages/vite.json index a9c6b09093..dd2e86efa1 100644 --- a/docs/generated/packages/vite.json +++ b/docs/generated/packages/vite.json @@ -67,7 +67,7 @@ }, "includeLib": { "type": "boolean", - "description": "Add a library build option.", + "description": "Add a library build option and skip the server option.", "default": false, "x-prompt": "Does this project contain a buildable library?" }, diff --git a/packages/react/src/generators/library/files/vite/index.html__tmpl__ b/packages/react/src/generators/library/files/vite/index.html__tmpl__ deleted file mode 100644 index 4c4c81ceb5..0000000000 --- a/packages/react/src/generators/library/files/vite/index.html__tmpl__ +++ /dev/null @@ -1,15 +0,0 @@ - - - - - <%= className %> Demo - - - - - - -
- - - diff --git a/packages/react/src/generators/library/files/vite/src/demo.tsx__tmpl__ b/packages/react/src/generators/library/files/vite/src/demo.tsx__tmpl__ deleted file mode 100644 index 617f6a880e..0000000000 --- a/packages/react/src/generators/library/files/vite/src/demo.tsx__tmpl__ +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This a a demo file that can be helpful when developing components by serving and interacting with them in the browser. - */ -<% if (component) { %> -import * as ReactDOM from 'react-dom/client'; -import { <%= className %> } from './index'; - -const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement); -root.render( - <<%= className %> /> -); -<% } else { %> -import * as ReactDOM from 'react-dom/client'; - -const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement); -root.render( -

<%= className %> Demo

-); -<% } %> \ No newline at end of file diff --git a/packages/vite/src/generators/configuration/configuration.ts b/packages/vite/src/generators/configuration/configuration.ts index 17c12ac2a7..49fde955a8 100644 --- a/packages/vite/src/generators/configuration/configuration.ts +++ b/packages/vite/src/generators/configuration/configuration.ts @@ -40,7 +40,10 @@ export async function viteConfigurationGenerator(tree: Tree, schema: Schema) { tasks.push(initTask); addOrChangeBuildTarget(tree, schema, buildTarget); - addOrChangeServeTarget(tree, schema, serveTarget); + + if (!schema.includeLib) { + addOrChangeServeTarget(tree, schema, serveTarget); + } writeViteConfig(tree, schema); diff --git a/packages/vite/src/generators/configuration/schema.json b/packages/vite/src/generators/configuration/schema.json index c48db6c5e7..8281bc2ddc 100644 --- a/packages/vite/src/generators/configuration/schema.json +++ b/packages/vite/src/generators/configuration/schema.json @@ -18,7 +18,7 @@ }, "includeLib": { "type": "boolean", - "description": "Add a library build option.", + "description": "Add a library build option and skip the server option.", "default": false, "x-prompt": "Does this project contain a buildable library?" }, diff --git a/packages/vite/src/utils/generator-utils.ts b/packages/vite/src/utils/generator-utils.ts index a2fec7bc8b..53b6b49824 100644 --- a/packages/vite/src/utils/generator-utils.ts +++ b/packages/vite/src/utils/generator-utils.ts @@ -150,23 +150,7 @@ export function addOrChangeBuildTarget( options: buildOptions, configurations: { development: {}, - production: options.includeLib - ? {} - : { - fileReplacements: [ - { - replace: joinPathFragments( - project.sourceRoot, - 'environments/environment.ts' - ), - with: joinPathFragments( - project.sourceRoot, - 'environments/environment.prod.ts' - ), - }, - ], - sourceMap: false, - }, + production: {}, }, }; } @@ -408,7 +392,9 @@ export function writeViteConfig(tree: Tree, options: Schema) { },` : ``; - const serverOption = ` + const serverOption = options.includeLib + ? '' + : ` server:{ port: 4200, host: 'localhost',