docs(nxdev): flatten ui libs (#8006)

nx-dev/feature-conf/src/lib/conf-speakers.tsx

@@ -1,4 +1,4 @@
-import { Member, MemberCard } from '@nrwl/nx-dev/ui/member-card';
+import { Member, MemberCard } from '@nrwl/nx-dev/ui-member-card';
 
 export function ConfSpeakers(): JSX.Element {
   const speakers: Array<Member> = [

nx-dev/feature-conf/src/lib/conf-sponsors.tsx

@@ -1,4 +1,4 @@
-import { Sponsor, SponsorCard } from '@nrwl/nx-dev/ui/sponsor-card';
+import { Sponsor, SponsorCard } from '@nrwl/nx-dev/ui-sponsor-card';
 import cx from 'classnames';
 
 export function ConfSponsors(): JSX.Element {

nx-dev/feature-conf/src/lib/conf-workshop.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { MemberCard } from '@nrwl/nx-dev/ui/member-card';
+import { MemberCard } from '@nrwl/nx-dev/ui-member-card';
 
 export function ConfWorkshop(): JSX.Element {
   return (

nx-dev/feature-doc-viewer/src/lib/sidebar.tsx

@@ -7,7 +7,7 @@ import {
   MenuSection,
 } from '@nrwl/nx-dev/data-access-documents';
 import { useRouter } from 'next/router';
-import { Selector } from '@nrwl/nx-dev/ui/common';
+import { Selector } from '@nrwl/nx-dev/ui-common';
 import { useSelectedFlavor } from '@nrwl/nx-dev/feature-flavor-selection';
 import {
   useActiveFlavor,

nx-dev/nx-dev/pages/[...segments].tsx

@@ -9,7 +9,7 @@ import type {
   VersionMetadata,
 } from '@nrwl/nx-dev/data-access-documents';
 import { DocViewer } from '@nrwl/nx-dev/feature-doc-viewer';
-import { Footer, Header } from '@nrwl/nx-dev/ui/common';
+import { Footer, Header } from '@nrwl/nx-dev/ui-common';
 import { documentsApi, menuApi } from '../lib/api';
 import {
   useActiveFlavor,

nx-dev/nx-dev/pages/angular.tsx

@@ -3,7 +3,7 @@ import { useRouter } from 'next/router';
 import Image from 'next/image';
 import Link from 'next/link';
 import Head from 'next/head';
-import { Footer, Header, NxUsersShowcase } from '@nrwl/nx-dev/ui/common';
+import { Footer, Header, NxUsersShowcase } from '@nrwl/nx-dev/ui-common';
 import { sendCustomEvent } from '@nrwl/nx-dev/feature-analytics';
 import { useStorage } from '@nrwl/nx-dev/feature-storage';
 import { InlineCommand } from '@nrwl/nx-dev/ui-commands';

nx-dev/nx-dev/pages/community.tsx

@@ -1,6 +1,6 @@
 import Image from 'next/image';
 import Link from 'next/link';
-import { Footer, Header, PluginCard } from '@nrwl/nx-dev/ui/common';
+import { Footer, Header, PluginCard } from '@nrwl/nx-dev/ui-common';
 import React from 'react';
 import { useStorage } from '@nrwl/nx-dev/feature-storage';
 import Head from 'next/head';

nx-dev/nx-dev/pages/conf.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import Head from 'next/head';
 import Link from 'next/link';
-import { Footer, Header } from '@nrwl/nx-dev/ui/common';
+import { Footer, Header } from '@nrwl/nx-dev/ui-common';
 import {
   ConfSchedule,
   ConfSpeakers,

nx-dev/nx-dev/pages/index.tsx

@@ -8,7 +8,7 @@ import {
   NpxCreateNxWorkspace,
   NxUsersShowcase,
   Testimonials,
-} from '@nrwl/nx-dev/ui/common';
+} from '@nrwl/nx-dev/ui-common';
 import { sendCustomEvent } from '@nrwl/nx-dev/feature-analytics';
 import {
   AffectedCommand,

nx-dev/nx-dev/pages/node.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { useRouter } from 'next/router';
 import Image from 'next/image';
 import Link from 'next/link';
-import { Footer, Header, NxUsersShowcase } from '@nrwl/nx-dev/ui/common';
+import { Footer, Header, NxUsersShowcase } from '@nrwl/nx-dev/ui-common';
 import { sendCustomEvent } from '@nrwl/nx-dev/feature-analytics';
 import { useStorage } from '@nrwl/nx-dev/feature-storage';
 import Head from 'next/head';

nx-dev/nx-dev/pages/react.tsx

@@ -3,7 +3,7 @@ import { useRouter } from 'next/router';
 import Image from 'next/image';
 import Link from 'next/link';
 import Head from 'next/head';
-import { Footer, Header, NxUsersShowcase } from '@nrwl/nx-dev/ui/common';
+import { Footer, Header, NxUsersShowcase } from '@nrwl/nx-dev/ui-common';
 import { sendCustomEvent } from '@nrwl/nx-dev/feature-analytics';
 import { useStorage } from '@nrwl/nx-dev/feature-storage';
 import { InlineCommand } from '@nrwl/nx-dev/ui-commands';

nx-dev/ui-common/.eslintrc.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../.eslintrc.json",
+  "ignorePatterns": ["!**/*"]
+}

nx-dev/ui-common/jest.config.js

@@ -6,5 +6,5 @@ module.exports = {
     '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../../coverage/nx-dev/ui/common',
+  coverageDirectory: '../../coverage/nx-dev/ui-common',
 };

nx-dev/ui-common/project.json

@@ -1,20 +1,20 @@
 {
-  "root": "nx-dev/ui/common",
+  "root": "nx-dev/ui-common",
-  "sourceRoot": "nx-dev/ui/common/src",
+  "sourceRoot": "nx-dev/ui-common/src",
   "projectType": "library",
   "targets": {
     "lint": {
       "executor": "@nrwl/linter:eslint",
       "options": {
-        "lintFilePatterns": ["nx-dev/ui/common/**/*.{ts,tsx,js,jsx}"]
+        "lintFilePatterns": ["nx-dev/ui-common/**/*.{ts,tsx,js,jsx}"]
       },
       "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/nx-dev/ui/common"],
+      "outputs": ["coverage/nx-dev/ui-common"],
       "options": {
-        "jestConfig": "nx-dev/ui/common/jest.config.js",
+        "jestConfig": "nx-dev/ui-common/jest.config.js",
         "passWithNoTests": true
       }
     }

nx-dev/ui-common/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "jsx": "react-jsx",
     "allowJs": true,

nx-dev/ui-common/tsconfig.lib.json

@@ -1,12 +1,12 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
+    "outDir": "../../dist/out-tsc",
     "types": ["node"]
   },
   "files": [
-    "../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "../../../node_modules/@nrwl/next/typings/image.d.ts"
+    "../../node_modules/@nrwl/react/typings/image.d.ts"
   ],
   "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
   "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]

nx-dev/ui-common/tsconfig.spec.json

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../../../dist/out-tsc",
+    "outDir": "../../dist/out-tsc",
     "module": "commonjs",
     "types": ["jest", "node"],
     "lib": ["DOM"]

nx-dev/ui-home/jest.config.js

@@ -5,5 +5,5 @@ module.exports = {
     '^.+\\.[tj]sx?$': 'babel-jest',
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../coverage//nx-dev/ui-home',
+  coverageDirectory: '../../coverage/nx-dev/ui-home',
 };

nx-dev/ui-member-card/.eslintrc.json

@@ -1,5 +1,5 @@
 {
-  "extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc.json"],
+  "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {

nx-dev/ui-member-card/jest.config.js

@@ -3,11 +3,11 @@ const nxPreset = require('@nrwl/jest/preset');
 module.exports = {
   ...nxPreset,
   displayName: 'nx-dev-ui-member-card',
-  preset: '../../../jest.preset.js',
+  preset: '../../jest.preset.js',
   transform: {
     '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../../coverage/nx-dev/ui/member-card',
+  coverageDirectory: '../../coverage/nx-dev/ui-member-card',
   setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
 };

nx-dev/ui-member-card/project.json

@@ -1,21 +1,21 @@
 {
-  "root": "nx-dev/ui/member-card",
+  "root": "nx-dev/ui-member-card",
-  "sourceRoot": "nx-dev/ui/member-card/src",
+  "sourceRoot": "nx-dev/ui-member-card/src",
   "projectType": "library",
   "tags": ["scope:nx-dev", "type:ui"],
   "targets": {
     "lint": {
       "executor": "@nrwl/linter:eslint",
       "options": {
-        "lintFilePatterns": ["nx-dev/ui/member-card/**/*.{ts,tsx,js,jsx}"]
+        "lintFilePatterns": ["nx-dev/ui-member-card/**/*.{ts,tsx,js,jsx}"]
       },
       "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/nx-dev/ui/member-card"],
+      "outputs": ["coverage/nx-dev/ui-member-card"],
       "options": {
-        "jestConfig": "nx-dev/ui/member-card/jest.config.js",
+        "jestConfig": "nx-dev/ui-member-card/jest.config.js",
         "passWithNoTests": true
       }
     }

nx-dev/ui-member-card/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "jsx": "react-jsx",
     "allowJs": true,

nx-dev/ui-member-card/tsconfig.lib.json

@@ -1,13 +1,13 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
+    "outDir": "../../dist/out-tsc",
     "types": ["node"],
     "lib": ["DOM"]
   },
   "files": [
-    "../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "../../../node_modules/@nrwl/react/typings/image.d.ts"
+    "../../node_modules/@nrwl/react/typings/image.d.ts"
   ],
   "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
   "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]

nx-dev/ui-member-card/tsconfig.spec.json

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
+    "outDir": "../../dist/out-tsc",
     "module": "commonjs",
     "types": ["jest", "node"]
   },

nx-dev/ui-sponsor-card/.eslintrc.json

@@ -1,5 +1,5 @@
 {
-  "extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc.json"],
+  "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {

nx-dev/ui-sponsor-card/jest.config.js

@@ -3,11 +3,11 @@ const nxPreset = require('@nrwl/jest/preset');
 module.exports = {
   ...nxPreset,
   displayName: 'nx-dev-ui-sponsor-card',
-  preset: '../../../jest.preset.js',
+  preset: '../../jest.preset.js',
   transform: {
     '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../../coverage/nx-dev/ui/sponsor-card',
+  coverageDirectory: '../../coverage/nx-dev/ui-sponsor-card',
   setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
 };

nx-dev/ui-sponsor-card/project.json

@@ -1,21 +1,21 @@
 {
-  "root": "nx-dev/ui/sponsor-card",
+  "root": "nx-dev/ui-sponsor-card",
-  "sourceRoot": "nx-dev/ui/sponsor-card/src",
+  "sourceRoot": "nx-dev/ui-sponsor-card/src",
   "projectType": "library",
   "tags": [],
   "targets": {
     "lint": {
       "executor": "@nrwl/linter:eslint",
       "options": {
-        "lintFilePatterns": ["nx-dev/ui/sponsor-card/**/*.{ts,tsx,js,jsx}"]
+        "lintFilePatterns": ["nx-dev/ui-sponsor-card/**/*.{ts,tsx,js,jsx}"]
       },
       "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/nx-dev/ui/sponsor-card"],
+      "outputs": ["coverage/nx-dev/ui-sponsor-card"],
       "options": {
-        "jestConfig": "nx-dev/ui/sponsor-card/jest.config.js",
+        "jestConfig": "nx-dev/ui-sponsor-card/jest.config.js",
         "passWithNoTests": true
       }
     }

nx-dev/ui-sponsor-card/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "jsx": "react-jsx",
     "allowJs": true,

nx-dev/ui-sponsor-card/tsconfig.lib.json

@@ -1,12 +1,12 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../../../dist/out-tsc",
+    "outDir": "../../dist/out-tsc",
     "types": ["node"]
   },
   "files": [
-    "../../../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "../../../../node_modules/@nrwl/react/typings/image.d.ts"
+    "../../node_modules/@nrwl/next/typings/image.d.ts"
   ],
   "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"],
   "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]

nx-dev/ui-sponsor-card/tsconfig.spec.json

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
+    "outDir": "../../dist/out-tsc",
     "module": "commonjs",
     "types": ["jest", "node"]
   },

nx-dev/ui/common/.eslintrc.json

@@ -1,4 +0,0 @@
-{
-  "extends": "../../../.eslintrc.json",
-  "ignorePatterns": ["!**/*"]
-}

packages/react/src/generators/application/files/css-module/src/app/__fileName__.tsx__tmpl__

@@ -13,8 +13,8 @@ export function App() {
   return (
     <>
       <NxWelcome title="<%= projectName %>"/>
-    </>
+      <div />
-  );
+    </>);
 <% if (classComponent) { %>
   }
 }

packages/react/src/generators/application/files/global-css/src/app/__fileName__.tsx__tmpl__

@@ -11,10 +11,10 @@ export class App extends Component {
 export function App() {
 <% } %>
   return (
-    <>
+  <>
-      <NxWelcome title="<%= projectName %>"/>
+    <NxWelcome title="<%= projectName %>"/>
-    </>
+    <div />
-  );
+  </>);
 <% if (classComponent) { %>
   }
 }

packages/react/src/generators/application/files/none/src/app/__fileName__.tsx__tmpl__

@@ -12,8 +12,8 @@ export function App() {
   return (
     <>
       <NxWelcome title="<%= projectName %>"/>
-    </>
+      <div />
-  );
+    </>);
 <% if (classComponent) { %>
   }
 }

packages/react/src/generators/application/files/styled-module/src/app/__fileName__.tsx__tmpl__

@@ -15,11 +15,9 @@ export class App extends Component {
 export function App() {
 <% } %>
   return (
-    <>
       <StyledApp>
         <NxWelcome title="<%= projectName %>"/>
       </StyledApp>
-    </>
   );
 <% if (classComponent) { %>
   }

packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap

@@ -34,5 +34,6 @@ Array [
   "app.component.html",
   "app.component.spec.ts",
   "app.component.ts",
+  "nx-welcome.component.ts",
 ]
 `;

tsconfig.base.json

@@ -59,9 +59,9 @@
       ],
       "@nrwl/nx-dev/ui-commands": ["./nx-dev/ui-commands/src/index.ts"],
       "@nrwl/nx-dev/ui-home": ["./nx-dev/ui-home/src/index.ts"],
-      "@nrwl/nx-dev/ui/common": ["./nx-dev/ui/common/src/index.ts"],
+      "@nrwl/nx-dev/ui-common": ["./nx-dev/ui-common/src/index.ts"],
-      "@nrwl/nx-dev/ui/member-card": ["./nx-dev/ui/member-card/src/index.ts"],
+      "@nrwl/nx-dev/ui-member-card": ["./nx-dev/ui-member-card/src/index.ts"],
-      "@nrwl/nx-dev/ui/sponsor-card": ["./nx-dev/ui/sponsor-card/src/index.ts"],
+      "@nrwl/nx-dev/ui-sponsor-card": ["./nx-dev/ui-sponsor-card/src/index.ts"],
       "@nrwl/react": ["./packages/react"],
       "@nrwl/react-native": ["./packages/react-native"],
       "@nrwl/react/*": ["./packages/react/*"],

workspace.json

@@ -52,10 +52,10 @@
     "nx-dev-feature-storage": "nx-dev/feature-storage",
     "nx-dev-feature-versions-and-flavors": "nx-dev/feature-versions-and-flavors",
     "nx-dev-ui-commands": "nx-dev/ui-commands",
-    "nx-dev-ui-common": "nx-dev/ui/common",
+    "nx-dev-ui-common": "nx-dev/ui-common",
     "nx-dev-ui-home": "nx-dev/ui-home",
-    "nx-dev-ui-member-card": "nx-dev/ui/member-card",
+    "nx-dev-ui-member-card": "nx-dev/ui-member-card",
-    "nx-dev-ui-sponsor-card": "nx-dev/ui/sponsor-card",
+    "nx-dev-ui-sponsor-card": "nx-dev/ui-sponsor-card",
     "nx-plugin": "packages/nx-plugin",
     "react": "packages/react",
     "react-native": "packages/react-native",