From 1560a43acd378743a413b36b27709b9fefbec415 Mon Sep 17 00:00:00 2001 From: Benjamin Cabanes <3447705+bcabanes@users.noreply.github.com> Date: Fri, 3 Dec 2021 21:14:13 -0500 Subject: [PATCH] docs(nxdev): flatten ui libs (#8006) --- nx-dev/feature-conf/src/lib/conf-speakers.tsx | 2 +- nx-dev/feature-conf/src/lib/conf-sponsors.tsx | 2 +- nx-dev/feature-conf/src/lib/conf-workshop.tsx | 2 +- nx-dev/feature-doc-viewer/src/lib/sidebar.tsx | 2 +- nx-dev/nx-dev/pages/[...segments].tsx | 2 +- nx-dev/nx-dev/pages/angular.tsx | 2 +- nx-dev/nx-dev/pages/community.tsx | 2 +- nx-dev/nx-dev/pages/conf.tsx | 2 +- nx-dev/nx-dev/pages/index.tsx | 2 +- nx-dev/nx-dev/pages/node.tsx | 2 +- nx-dev/nx-dev/pages/react.tsx | 2 +- nx-dev/ui-common/.eslintrc.json | 4 ++++ nx-dev/{ui/common => ui-common}/README.md | 0 nx-dev/{ui/common => ui-common}/jest.config.js | 2 +- nx-dev/{ui/common => ui-common}/project.json | 10 +++++----- nx-dev/{ui/common => ui-common}/src/index.ts | 0 .../common => ui-common}/src/lib/feature-list.spec.tsx | 0 .../{ui/common => ui-common}/src/lib/feature-list.tsx | 0 .../{ui/common => ui-common}/src/lib/footer.spec.tsx | 0 nx-dev/{ui/common => ui-common}/src/lib/footer.tsx | 0 .../{ui/common => ui-common}/src/lib/header.spec.tsx | 0 nx-dev/{ui/common => ui-common}/src/lib/header.tsx | 0 nx-dev/{ui/common => ui-common}/src/lib/media-query.ts | 0 .../src/lib/npx-create-nx-workspace.spec.tsx | 0 .../src/lib/npx-create-nx-workspace.tsx | 0 .../src/lib/nx-users-showcase.spec.tsx | 0 .../common => ui-common}/src/lib/nx-users-showcase.tsx | 0 .../common => ui-common}/src/lib/plugin-card.spec.tsx | 0 .../{ui/common => ui-common}/src/lib/plugin-card.tsx | 0 .../{ui/common => ui-common}/src/lib/selector.spec.tsx | 0 nx-dev/{ui/common => ui-common}/src/lib/selector.tsx | 0 .../{ui/common => ui-common}/src/lib/testimonials.tsx | 0 nx-dev/{ui/member-card => ui-common}/tsconfig.json | 2 +- .../{ui/sponsor-card => ui-common}/tsconfig.lib.json | 6 +++--- nx-dev/{ui/common => ui-common}/tsconfig.spec.json | 2 +- nx-dev/ui-home/jest.config.js | 2 +- .../{ui/member-card => ui-member-card}/.eslintrc.json | 2 +- nx-dev/{ui/member-card => ui-member-card}/README.md | 0 .../{ui/member-card => ui-member-card}/jest.config.js | 4 ++-- nx-dev/{ui/member-card => ui-member-card}/project.json | 10 +++++----- nx-dev/{ui/member-card => ui-member-card}/src/index.ts | 0 .../src/lib/member-card.spec.tsx | 0 .../src/lib/member-card.tsx | 0 .../{ui/member-card => ui-member-card}/test-setup.ts | 0 .../{ui/sponsor-card => ui-member-card}/tsconfig.json | 2 +- .../member-card => ui-member-card}/tsconfig.lib.json | 6 +++--- .../sponsor-card => ui-member-card}/tsconfig.spec.json | 2 +- .../sponsor-card => ui-sponsor-card}/.eslintrc.json | 2 +- nx-dev/{ui/sponsor-card => ui-sponsor-card}/README.md | 0 .../sponsor-card => ui-sponsor-card}/jest.config.js | 4 ++-- .../{ui/sponsor-card => ui-sponsor-card}/project.json | 10 +++++----- .../{ui/sponsor-card => ui-sponsor-card}/src/index.ts | 0 .../src/lib/sponsor-card.spec.tsx | 0 .../src/lib/sponsor-card.tsx | 0 .../{ui/sponsor-card => ui-sponsor-card}/test-setup.ts | 0 nx-dev/{ui/common => ui-sponsor-card}/tsconfig.json | 2 +- .../{ui/common => ui-sponsor-card}/tsconfig.lib.json | 6 +++--- .../member-card => ui-sponsor-card}/tsconfig.spec.json | 2 +- nx-dev/ui/common/.eslintrc.json | 4 ---- .../files/css-module/src/app/__fileName__.tsx__tmpl__ | 4 ++-- .../files/global-css/src/app/__fileName__.tsx__tmpl__ | 8 ++++---- .../files/none/src/app/__fileName__.tsx__tmpl__ | 4 ++-- .../styled-module/src/app/__fileName__.tsx__tmpl__ | 2 -- .../preset/__snapshots__/preset.spec.ts.snap | 1 + tsconfig.base.json | 6 +++--- workspace.json | 6 +++--- 66 files changed, 68 insertions(+), 69 deletions(-) create mode 100644 nx-dev/ui-common/.eslintrc.json rename nx-dev/{ui/common => ui-common}/README.md (100%) rename nx-dev/{ui/common => ui-common}/jest.config.js (81%) rename nx-dev/{ui/common => ui-common}/project.json (59%) rename nx-dev/{ui/common => ui-common}/src/index.ts (100%) rename nx-dev/{ui/common => ui-common}/src/lib/feature-list.spec.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/feature-list.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/footer.spec.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/footer.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/header.spec.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/header.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/media-query.ts (100%) rename nx-dev/{ui/common => ui-common}/src/lib/npx-create-nx-workspace.spec.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/npx-create-nx-workspace.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/nx-users-showcase.spec.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/nx-users-showcase.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/plugin-card.spec.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/plugin-card.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/selector.spec.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/selector.tsx (100%) rename nx-dev/{ui/common => ui-common}/src/lib/testimonials.tsx (100%) rename nx-dev/{ui/member-card => ui-common}/tsconfig.json (90%) rename nx-dev/{ui/sponsor-card => ui-common}/tsconfig.lib.json (60%) rename nx-dev/{ui/common => ui-common}/tsconfig.spec.json (88%) rename nx-dev/{ui/member-card => ui-member-card}/.eslintrc.json (79%) rename nx-dev/{ui/member-card => ui-member-card}/README.md (100%) rename nx-dev/{ui/member-card => ui-member-card}/jest.config.js (76%) rename nx-dev/{ui/member-card => ui-member-card}/project.json (57%) rename nx-dev/{ui/member-card => ui-member-card}/src/index.ts (100%) rename nx-dev/{ui/member-card => ui-member-card}/src/lib/member-card.spec.tsx (100%) rename nx-dev/{ui/member-card => ui-member-card}/src/lib/member-card.tsx (100%) rename nx-dev/{ui/member-card => ui-member-card}/test-setup.ts (100%) rename nx-dev/{ui/sponsor-card => ui-member-card}/tsconfig.json (90%) rename nx-dev/{ui/member-card => ui-member-card}/tsconfig.lib.json (62%) rename nx-dev/{ui/sponsor-card => ui-member-card}/tsconfig.spec.json (89%) rename nx-dev/{ui/sponsor-card => ui-sponsor-card}/.eslintrc.json (79%) rename nx-dev/{ui/sponsor-card => ui-sponsor-card}/README.md (100%) rename nx-dev/{ui/sponsor-card => ui-sponsor-card}/jest.config.js (75%) rename nx-dev/{ui/sponsor-card => ui-sponsor-card}/project.json (55%) rename nx-dev/{ui/sponsor-card => ui-sponsor-card}/src/index.ts (100%) rename nx-dev/{ui/sponsor-card => ui-sponsor-card}/src/lib/sponsor-card.spec.tsx (100%) rename nx-dev/{ui/sponsor-card => ui-sponsor-card}/src/lib/sponsor-card.tsx (100%) rename nx-dev/{ui/sponsor-card => ui-sponsor-card}/test-setup.ts (100%) rename nx-dev/{ui/common => ui-sponsor-card}/tsconfig.json (90%) rename nx-dev/{ui/common => ui-sponsor-card}/tsconfig.lib.json (58%) rename nx-dev/{ui/member-card => ui-sponsor-card}/tsconfig.spec.json (89%) delete mode 100644 nx-dev/ui/common/.eslintrc.json diff --git a/nx-dev/feature-conf/src/lib/conf-speakers.tsx b/nx-dev/feature-conf/src/lib/conf-speakers.tsx index d137581e24..f12da71d96 100644 --- a/nx-dev/feature-conf/src/lib/conf-speakers.tsx +++ b/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 = [ diff --git a/nx-dev/feature-conf/src/lib/conf-sponsors.tsx b/nx-dev/feature-conf/src/lib/conf-sponsors.tsx index c0538dbf46..c76dc79da8 100644 --- a/nx-dev/feature-conf/src/lib/conf-sponsors.tsx +++ b/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 { diff --git a/nx-dev/feature-conf/src/lib/conf-workshop.tsx b/nx-dev/feature-conf/src/lib/conf-workshop.tsx index 77120d4126..58358844d8 100644 --- a/nx-dev/feature-conf/src/lib/conf-workshop.tsx +++ b/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 ( diff --git a/nx-dev/feature-doc-viewer/src/lib/sidebar.tsx b/nx-dev/feature-doc-viewer/src/lib/sidebar.tsx index f6a5a333f1..c9e208f1e2 100644 --- a/nx-dev/feature-doc-viewer/src/lib/sidebar.tsx +++ b/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, diff --git a/nx-dev/nx-dev/pages/[...segments].tsx b/nx-dev/nx-dev/pages/[...segments].tsx index cb2096c715..ba325e34d5 100644 --- a/nx-dev/nx-dev/pages/[...segments].tsx +++ b/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, diff --git a/nx-dev/nx-dev/pages/angular.tsx b/nx-dev/nx-dev/pages/angular.tsx index 8163a0db85..6a31ef93eb 100644 --- a/nx-dev/nx-dev/pages/angular.tsx +++ b/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'; diff --git a/nx-dev/nx-dev/pages/community.tsx b/nx-dev/nx-dev/pages/community.tsx index 02fb8d7a6a..e3fce71b62 100644 --- a/nx-dev/nx-dev/pages/community.tsx +++ b/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'; diff --git a/nx-dev/nx-dev/pages/conf.tsx b/nx-dev/nx-dev/pages/conf.tsx index 9238065711..bdb2189cad 100644 --- a/nx-dev/nx-dev/pages/conf.tsx +++ b/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, diff --git a/nx-dev/nx-dev/pages/index.tsx b/nx-dev/nx-dev/pages/index.tsx index e8027bcdfd..e8c00d445d 100644 --- a/nx-dev/nx-dev/pages/index.tsx +++ b/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, diff --git a/nx-dev/nx-dev/pages/node.tsx b/nx-dev/nx-dev/pages/node.tsx index 9354ed8dcc..bcbb06bc32 100644 --- a/nx-dev/nx-dev/pages/node.tsx +++ b/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'; diff --git a/nx-dev/nx-dev/pages/react.tsx b/nx-dev/nx-dev/pages/react.tsx index ff6724a8b3..327a542e4a 100644 --- a/nx-dev/nx-dev/pages/react.tsx +++ b/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'; diff --git a/nx-dev/ui-common/.eslintrc.json b/nx-dev/ui-common/.eslintrc.json new file mode 100644 index 0000000000..4d71ffb140 --- /dev/null +++ b/nx-dev/ui-common/.eslintrc.json @@ -0,0 +1,4 @@ +{ + "extends": "../../.eslintrc.json", + "ignorePatterns": ["!**/*"] +} diff --git a/nx-dev/ui/common/README.md b/nx-dev/ui-common/README.md similarity index 100% rename from nx-dev/ui/common/README.md rename to nx-dev/ui-common/README.md diff --git a/nx-dev/ui/common/jest.config.js b/nx-dev/ui-common/jest.config.js similarity index 81% rename from nx-dev/ui/common/jest.config.js rename to nx-dev/ui-common/jest.config.js index a04d34d3d6..b477fb26e4 100644 --- a/nx-dev/ui/common/jest.config.js +++ b/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', }; diff --git a/nx-dev/ui/common/project.json b/nx-dev/ui-common/project.json similarity index 59% rename from nx-dev/ui/common/project.json rename to nx-dev/ui-common/project.json index dec14f508a..31c26a65d8 100644 --- a/nx-dev/ui/common/project.json +++ b/nx-dev/ui-common/project.json @@ -1,20 +1,20 @@ { - "root": "nx-dev/ui/common", - "sourceRoot": "nx-dev/ui/common/src", + "root": "nx-dev/ui-common", + "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 } } diff --git a/nx-dev/ui/common/src/index.ts b/nx-dev/ui-common/src/index.ts similarity index 100% rename from nx-dev/ui/common/src/index.ts rename to nx-dev/ui-common/src/index.ts diff --git a/nx-dev/ui/common/src/lib/feature-list.spec.tsx b/nx-dev/ui-common/src/lib/feature-list.spec.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/feature-list.spec.tsx rename to nx-dev/ui-common/src/lib/feature-list.spec.tsx diff --git a/nx-dev/ui/common/src/lib/feature-list.tsx b/nx-dev/ui-common/src/lib/feature-list.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/feature-list.tsx rename to nx-dev/ui-common/src/lib/feature-list.tsx diff --git a/nx-dev/ui/common/src/lib/footer.spec.tsx b/nx-dev/ui-common/src/lib/footer.spec.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/footer.spec.tsx rename to nx-dev/ui-common/src/lib/footer.spec.tsx diff --git a/nx-dev/ui/common/src/lib/footer.tsx b/nx-dev/ui-common/src/lib/footer.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/footer.tsx rename to nx-dev/ui-common/src/lib/footer.tsx diff --git a/nx-dev/ui/common/src/lib/header.spec.tsx b/nx-dev/ui-common/src/lib/header.spec.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/header.spec.tsx rename to nx-dev/ui-common/src/lib/header.spec.tsx diff --git a/nx-dev/ui/common/src/lib/header.tsx b/nx-dev/ui-common/src/lib/header.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/header.tsx rename to nx-dev/ui-common/src/lib/header.tsx diff --git a/nx-dev/ui/common/src/lib/media-query.ts b/nx-dev/ui-common/src/lib/media-query.ts similarity index 100% rename from nx-dev/ui/common/src/lib/media-query.ts rename to nx-dev/ui-common/src/lib/media-query.ts diff --git a/nx-dev/ui/common/src/lib/npx-create-nx-workspace.spec.tsx b/nx-dev/ui-common/src/lib/npx-create-nx-workspace.spec.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/npx-create-nx-workspace.spec.tsx rename to nx-dev/ui-common/src/lib/npx-create-nx-workspace.spec.tsx diff --git a/nx-dev/ui/common/src/lib/npx-create-nx-workspace.tsx b/nx-dev/ui-common/src/lib/npx-create-nx-workspace.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/npx-create-nx-workspace.tsx rename to nx-dev/ui-common/src/lib/npx-create-nx-workspace.tsx diff --git a/nx-dev/ui/common/src/lib/nx-users-showcase.spec.tsx b/nx-dev/ui-common/src/lib/nx-users-showcase.spec.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/nx-users-showcase.spec.tsx rename to nx-dev/ui-common/src/lib/nx-users-showcase.spec.tsx diff --git a/nx-dev/ui/common/src/lib/nx-users-showcase.tsx b/nx-dev/ui-common/src/lib/nx-users-showcase.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/nx-users-showcase.tsx rename to nx-dev/ui-common/src/lib/nx-users-showcase.tsx diff --git a/nx-dev/ui/common/src/lib/plugin-card.spec.tsx b/nx-dev/ui-common/src/lib/plugin-card.spec.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/plugin-card.spec.tsx rename to nx-dev/ui-common/src/lib/plugin-card.spec.tsx diff --git a/nx-dev/ui/common/src/lib/plugin-card.tsx b/nx-dev/ui-common/src/lib/plugin-card.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/plugin-card.tsx rename to nx-dev/ui-common/src/lib/plugin-card.tsx diff --git a/nx-dev/ui/common/src/lib/selector.spec.tsx b/nx-dev/ui-common/src/lib/selector.spec.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/selector.spec.tsx rename to nx-dev/ui-common/src/lib/selector.spec.tsx diff --git a/nx-dev/ui/common/src/lib/selector.tsx b/nx-dev/ui-common/src/lib/selector.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/selector.tsx rename to nx-dev/ui-common/src/lib/selector.tsx diff --git a/nx-dev/ui/common/src/lib/testimonials.tsx b/nx-dev/ui-common/src/lib/testimonials.tsx similarity index 100% rename from nx-dev/ui/common/src/lib/testimonials.tsx rename to nx-dev/ui-common/src/lib/testimonials.tsx diff --git a/nx-dev/ui/member-card/tsconfig.json b/nx-dev/ui-common/tsconfig.json similarity index 90% rename from nx-dev/ui/member-card/tsconfig.json rename to nx-dev/ui-common/tsconfig.json index bd1bd9e6fa..3230750a88 100644 --- a/nx-dev/ui/member-card/tsconfig.json +++ b/nx-dev/ui-common/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "jsx": "react-jsx", "allowJs": true, diff --git a/nx-dev/ui/sponsor-card/tsconfig.lib.json b/nx-dev/ui-common/tsconfig.lib.json similarity index 60% rename from nx-dev/ui/sponsor-card/tsconfig.lib.json rename to nx-dev/ui-common/tsconfig.lib.json index 2147d41ccf..acc8a9b9d8 100644 --- a/nx-dev/ui/sponsor-card/tsconfig.lib.json +++ b/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/next/typings/image.d.ts" + "../../node_modules/@nrwl/react/typings/cssmodule.d.ts", + "../../node_modules/@nrwl/react/typings/image.d.ts" ], "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"], "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] diff --git a/nx-dev/ui/common/tsconfig.spec.json b/nx-dev/ui-common/tsconfig.spec.json similarity index 88% rename from nx-dev/ui/common/tsconfig.spec.json rename to nx-dev/ui-common/tsconfig.spec.json index 487f02daf6..1f990ef06a 100644 --- a/nx-dev/ui/common/tsconfig.spec.json +++ b/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"] diff --git a/nx-dev/ui-home/jest.config.js b/nx-dev/ui-home/jest.config.js index bc62194762..6f703bd3b7 100644 --- a/nx-dev/ui-home/jest.config.js +++ b/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', }; diff --git a/nx-dev/ui/member-card/.eslintrc.json b/nx-dev/ui-member-card/.eslintrc.json similarity index 79% rename from nx-dev/ui/member-card/.eslintrc.json rename to nx-dev/ui-member-card/.eslintrc.json index 50e59482cf..734ddaceea 100644 --- a/nx-dev/ui/member-card/.eslintrc.json +++ b/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": [ { diff --git a/nx-dev/ui/member-card/README.md b/nx-dev/ui-member-card/README.md similarity index 100% rename from nx-dev/ui/member-card/README.md rename to nx-dev/ui-member-card/README.md diff --git a/nx-dev/ui/member-card/jest.config.js b/nx-dev/ui-member-card/jest.config.js similarity index 76% rename from nx-dev/ui/member-card/jest.config.js rename to nx-dev/ui-member-card/jest.config.js index fb744d02fe..9cf1514d0b 100644 --- a/nx-dev/ui/member-card/jest.config.js +++ b/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: ['/test-setup.ts'], }; diff --git a/nx-dev/ui/member-card/project.json b/nx-dev/ui-member-card/project.json similarity index 57% rename from nx-dev/ui/member-card/project.json rename to nx-dev/ui-member-card/project.json index aced290add..82d5acec1f 100644 --- a/nx-dev/ui/member-card/project.json +++ b/nx-dev/ui-member-card/project.json @@ -1,21 +1,21 @@ { - "root": "nx-dev/ui/member-card", - "sourceRoot": "nx-dev/ui/member-card/src", + "root": "nx-dev/ui-member-card", + "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 } } diff --git a/nx-dev/ui/member-card/src/index.ts b/nx-dev/ui-member-card/src/index.ts similarity index 100% rename from nx-dev/ui/member-card/src/index.ts rename to nx-dev/ui-member-card/src/index.ts diff --git a/nx-dev/ui/member-card/src/lib/member-card.spec.tsx b/nx-dev/ui-member-card/src/lib/member-card.spec.tsx similarity index 100% rename from nx-dev/ui/member-card/src/lib/member-card.spec.tsx rename to nx-dev/ui-member-card/src/lib/member-card.spec.tsx diff --git a/nx-dev/ui/member-card/src/lib/member-card.tsx b/nx-dev/ui-member-card/src/lib/member-card.tsx similarity index 100% rename from nx-dev/ui/member-card/src/lib/member-card.tsx rename to nx-dev/ui-member-card/src/lib/member-card.tsx diff --git a/nx-dev/ui/member-card/test-setup.ts b/nx-dev/ui-member-card/test-setup.ts similarity index 100% rename from nx-dev/ui/member-card/test-setup.ts rename to nx-dev/ui-member-card/test-setup.ts diff --git a/nx-dev/ui/sponsor-card/tsconfig.json b/nx-dev/ui-member-card/tsconfig.json similarity index 90% rename from nx-dev/ui/sponsor-card/tsconfig.json rename to nx-dev/ui-member-card/tsconfig.json index bd1bd9e6fa..3230750a88 100644 --- a/nx-dev/ui/sponsor-card/tsconfig.json +++ b/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, diff --git a/nx-dev/ui/member-card/tsconfig.lib.json b/nx-dev/ui-member-card/tsconfig.lib.json similarity index 62% rename from nx-dev/ui/member-card/tsconfig.lib.json rename to nx-dev/ui-member-card/tsconfig.lib.json index 29a96617d8..827fb6e8fd 100644 --- a/nx-dev/ui/member-card/tsconfig.lib.json +++ b/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/image.d.ts" + "../../node_modules/@nrwl/react/typings/cssmodule.d.ts", + "../../node_modules/@nrwl/react/typings/image.d.ts" ], "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"], "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] diff --git a/nx-dev/ui/sponsor-card/tsconfig.spec.json b/nx-dev/ui-member-card/tsconfig.spec.json similarity index 89% rename from nx-dev/ui/sponsor-card/tsconfig.spec.json rename to nx-dev/ui-member-card/tsconfig.spec.json index cab0321d30..6829644190 100644 --- a/nx-dev/ui/sponsor-card/tsconfig.spec.json +++ b/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"] }, diff --git a/nx-dev/ui/sponsor-card/.eslintrc.json b/nx-dev/ui-sponsor-card/.eslintrc.json similarity index 79% rename from nx-dev/ui/sponsor-card/.eslintrc.json rename to nx-dev/ui-sponsor-card/.eslintrc.json index 50e59482cf..734ddaceea 100644 --- a/nx-dev/ui/sponsor-card/.eslintrc.json +++ b/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": [ { diff --git a/nx-dev/ui/sponsor-card/README.md b/nx-dev/ui-sponsor-card/README.md similarity index 100% rename from nx-dev/ui/sponsor-card/README.md rename to nx-dev/ui-sponsor-card/README.md diff --git a/nx-dev/ui/sponsor-card/jest.config.js b/nx-dev/ui-sponsor-card/jest.config.js similarity index 75% rename from nx-dev/ui/sponsor-card/jest.config.js rename to nx-dev/ui-sponsor-card/jest.config.js index 77957a1829..2a7d0344ca 100644 --- a/nx-dev/ui/sponsor-card/jest.config.js +++ b/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: ['/test-setup.ts'], }; diff --git a/nx-dev/ui/sponsor-card/project.json b/nx-dev/ui-sponsor-card/project.json similarity index 55% rename from nx-dev/ui/sponsor-card/project.json rename to nx-dev/ui-sponsor-card/project.json index 329ccb85f3..f35d9f2e83 100644 --- a/nx-dev/ui/sponsor-card/project.json +++ b/nx-dev/ui-sponsor-card/project.json @@ -1,21 +1,21 @@ { - "root": "nx-dev/ui/sponsor-card", - "sourceRoot": "nx-dev/ui/sponsor-card/src", + "root": "nx-dev/ui-sponsor-card", + "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 } } diff --git a/nx-dev/ui/sponsor-card/src/index.ts b/nx-dev/ui-sponsor-card/src/index.ts similarity index 100% rename from nx-dev/ui/sponsor-card/src/index.ts rename to nx-dev/ui-sponsor-card/src/index.ts diff --git a/nx-dev/ui/sponsor-card/src/lib/sponsor-card.spec.tsx b/nx-dev/ui-sponsor-card/src/lib/sponsor-card.spec.tsx similarity index 100% rename from nx-dev/ui/sponsor-card/src/lib/sponsor-card.spec.tsx rename to nx-dev/ui-sponsor-card/src/lib/sponsor-card.spec.tsx diff --git a/nx-dev/ui/sponsor-card/src/lib/sponsor-card.tsx b/nx-dev/ui-sponsor-card/src/lib/sponsor-card.tsx similarity index 100% rename from nx-dev/ui/sponsor-card/src/lib/sponsor-card.tsx rename to nx-dev/ui-sponsor-card/src/lib/sponsor-card.tsx diff --git a/nx-dev/ui/sponsor-card/test-setup.ts b/nx-dev/ui-sponsor-card/test-setup.ts similarity index 100% rename from nx-dev/ui/sponsor-card/test-setup.ts rename to nx-dev/ui-sponsor-card/test-setup.ts diff --git a/nx-dev/ui/common/tsconfig.json b/nx-dev/ui-sponsor-card/tsconfig.json similarity index 90% rename from nx-dev/ui/common/tsconfig.json rename to nx-dev/ui-sponsor-card/tsconfig.json index bd1bd9e6fa..3230750a88 100644 --- a/nx-dev/ui/common/tsconfig.json +++ b/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, diff --git a/nx-dev/ui/common/tsconfig.lib.json b/nx-dev/ui-sponsor-card/tsconfig.lib.json similarity index 58% rename from nx-dev/ui/common/tsconfig.lib.json rename to nx-dev/ui-sponsor-card/tsconfig.lib.json index b2f36371b9..35df2f9aed 100644 --- a/nx-dev/ui/common/tsconfig.lib.json +++ b/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/image.d.ts" + "../../node_modules/@nrwl/react/typings/cssmodule.d.ts", + "../../node_modules/@nrwl/next/typings/image.d.ts" ], "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx"], "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] diff --git a/nx-dev/ui/member-card/tsconfig.spec.json b/nx-dev/ui-sponsor-card/tsconfig.spec.json similarity index 89% rename from nx-dev/ui/member-card/tsconfig.spec.json rename to nx-dev/ui-sponsor-card/tsconfig.spec.json index cab0321d30..6829644190 100644 --- a/nx-dev/ui/member-card/tsconfig.spec.json +++ b/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"] }, diff --git a/nx-dev/ui/common/.eslintrc.json b/nx-dev/ui/common/.eslintrc.json deleted file mode 100644 index 505351b0c0..0000000000 --- a/nx-dev/ui/common/.eslintrc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../../.eslintrc.json", - "ignorePatterns": ["!**/*"] -} diff --git a/packages/react/src/generators/application/files/css-module/src/app/__fileName__.tsx__tmpl__ b/packages/react/src/generators/application/files/css-module/src/app/__fileName__.tsx__tmpl__ index 54ed401f94..33f7304a9e 100644 --- a/packages/react/src/generators/application/files/css-module/src/app/__fileName__.tsx__tmpl__ +++ b/packages/react/src/generators/application/files/css-module/src/app/__fileName__.tsx__tmpl__ @@ -13,8 +13,8 @@ export function App() { return ( <> - - ); +
+ ); <% if (classComponent) { %> } } diff --git a/packages/react/src/generators/application/files/global-css/src/app/__fileName__.tsx__tmpl__ b/packages/react/src/generators/application/files/global-css/src/app/__fileName__.tsx__tmpl__ index aa138bac26..7f88d120b5 100644 --- a/packages/react/src/generators/application/files/global-css/src/app/__fileName__.tsx__tmpl__ +++ b/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 ( - <> - - - ); + <> + +
+ ); <% if (classComponent) { %> } } diff --git a/packages/react/src/generators/application/files/none/src/app/__fileName__.tsx__tmpl__ b/packages/react/src/generators/application/files/none/src/app/__fileName__.tsx__tmpl__ index f121fc3b45..cf1d42d4ba 100644 --- a/packages/react/src/generators/application/files/none/src/app/__fileName__.tsx__tmpl__ +++ b/packages/react/src/generators/application/files/none/src/app/__fileName__.tsx__tmpl__ @@ -12,8 +12,8 @@ export function App() { return ( <> - - ); +
+ ); <% if (classComponent) { %> } } diff --git a/packages/react/src/generators/application/files/styled-module/src/app/__fileName__.tsx__tmpl__ b/packages/react/src/generators/application/files/styled-module/src/app/__fileName__.tsx__tmpl__ index 2af30e84d8..e38786b375 100644 --- a/packages/react/src/generators/application/files/styled-module/src/app/__fileName__.tsx__tmpl__ +++ b/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 ( - <> - ); <% if (classComponent) { %> } diff --git a/packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap b/packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap index 54bf30d600..acdfe7b52c 100644 --- a/packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap +++ b/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", ] `; diff --git a/tsconfig.base.json b/tsconfig.base.json index 2277cca56d..ceefb641cc 100644 --- a/tsconfig.base.json +++ b/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/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-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-sponsor-card": ["./nx-dev/ui-sponsor-card/src/index.ts"], "@nrwl/react": ["./packages/react"], "@nrwl/react-native": ["./packages/react-native"], "@nrwl/react/*": ["./packages/react/*"], diff --git a/workspace.json b/workspace.json index c701ec49ca..858842c6cb 100644 --- a/workspace.json +++ b/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-sponsor-card": "nx-dev/ui/sponsor-card", + "nx-dev-ui-member-card": "nx-dev/ui-member-card", + "nx-dev-ui-sponsor-card": "nx-dev/ui-sponsor-card", "nx-plugin": "packages/nx-plugin", "react": "packages/react", "react-native": "packages/react-native",