[Focused Improvement] Consolidate packages

CHANGELOG.md

@@ -7,6 +7,8 @@ This project does NOT adhere to [Semantic Versioning](https://semver.org/spec/v2
 
 ### New Features & Improvements
 
+`[sitecore-jss-*]` Consolidated tightly coupled packages together and refactored the sitecore base package into submodules.  ([#824](https://github.com/Sitecore/jss/pull/824))
+
 `[samples/angular]` Language is now preserved when navigating to another page ([#793](https://github.com/Sitecore/jss/pull/793))
 
 `[samples/nextjs][samples/react][samples/vue][samples/angular][sitecore-jss-cli]` Prefix added to templates which is replaced on jss create ([#800](https://github.com/Sitecore/jss/pull/800), [#811](https://github.com/Sitecore/jss/pull/811), [#813](https://github.com/Sitecore/jss/pull/813), [#814](https://github.com/Sitecore/jss/pull/814), [#816](https://github.com/Sitecore/jss/pull/816))

docs/upgrade-guides.md

@@ -0,0 +1,37 @@
+# Refactoring JSS base packages
+
+1. Create submodules in base package
+2. Move all tightly couples packages together.
+3. Remove circular Dependency.
+
+## API changes in `sitecore-jss/*` packages
+
+The JSS base packages have been refactored to make the API reference generation better. As a result, some reorganizing was done in the base packages, which causes breaking changes for how some services, classes and functions are exported.
+
+If you are importing any of these into your project, the imports need to be updated per the table below.
+
+|Package Name|Submodule Added  | change description
+|---|------|---
+|**Sitecore-jss**||Broken into submodules so now all function, classes and interfaces within this package gets imported directly into all other packages and sample apps from individual submodules.|
+||`graphql` |   E.g. 'import { GraphQLClient } from @sitecore-jss/sitecore-jss/graphql'
+||`i18` | E.g. 'import { RestDictionaryService } from @sitecore-jss/sitecore-jss/i18n'
+|| `layout` | E.g. 'import { LayoutServiceData } from @sitecore-jss/sitecore-jss/layout'
+||`media` | E.g. 'import { mediaApi } from @sitecore-jss/sitecore-jss/media'
+||`utils` | E.g. 'import { isServer } from @sitecore-jss/sitecore-jss/utils'
+||`tracking` | Moved as a submodule from being a separate package. E.g. 'import { trackingApi } from @sitecore-jss/sitecore-jss/tracking'
+|**Sitecore-jss-angular**||*No Change*
+|**Sitecore-jss-angular-schematics**||*No Change*
+|**Sitecore-jss-cli**||*No Change*
+|**Sitecore-jss-dev-tools**|| Now manifest, pipelines and update package are part of this package.|
+|**Sitecore-jss-tracking**||Moved to Sitecore-jss
+|**Sitecore-jss-manifest**||Moved to Sitecore-jss-dev-tools
+|**Sitecore-jss-pipelines**||Moved to Sitecore-jss-dev-tools
+|**Sitecore-jss-update**||Moved to Sitecore-jss-dev-tools
+|**Sitecore-jss-forms**||*No Change*
+|**Sitecore-jss-nextjs**||*No Change*
+|**Sitecore-jss-proxy**||*No Change*
+|**Sitecore-jss-react**||*No Change*
+|**Sitecore-jss-react-forms**||*No Change*
+|**Sitecore-jss-react-native**||*No Change*
+|**Sitecore-jss-rendering-host**||*No Change*
+|**Sitecore-jss-vue**||*No Change*

package.json

@@ -10,7 +10,8 @@
     "lint-packages": "lerna run lint --ignore *-sample*",
     "lint-apps": "lerna run lint --ignore @sitecore-jss/*",
     "coverage-packages": "lerna run coverage --ignore *-sample*",
-    "install-git-hooks": "node ./scripts/install-hooks.js"
+    "install-git-hooks": "node ./scripts/install-hooks.js",
+    "generate-docs": "lerna run generate-docs"
   },
   "author": {
     "name": "Sitecore Corporation",
@@ -31,6 +32,9 @@
     "lerna": "^3.22.0",
     "nyc": "^14.1.1",
     "prettier": "^1.14.3",
+    "typedoc": "^0.22.5",
+    "typedoc-plugin-markdown": "^3.11.3",
     "typescript": "^3.9.6"
-  }
-}
+  },
+  "dependencies": {}
+}

packages/sitecore-jss-angular-schematics/src/jss-component/manifest-files/sitecore/definitions/components/__name@dasherize__.sitecore.ts

@@ -1,4 +1,4 @@
-import { CommonFieldTypes, SitecoreIcon, Manifest } from '@sitecore-jss/sitecore-jss-manifest';
+import { CommonFieldTypes, SitecoreIcon, Manifest } from '@sitecore-jss/sitecore-jss-dev-tools';
 
 /**
  * Adds the <%= name %> component to the disconnected manifest.

packages/sitecore-jss-angular/src/components/image.directive.ts

@@ -8,7 +8,7 @@ import {
   TemplateRef,
   ViewContainerRef,
 } from '@angular/core';
-import { mediaApi } from '@sitecore-jss/sitecore-jss';
+import { mediaApi } from '@sitecore-jss/sitecore-jss/media';
 import { ImageField, ImageFieldValue } from './rendering-field';
 
 @Directive({ selector: '[scImage]' })

packages/sitecore-jss-angular/src/components/missing-component.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { ComponentRendering } from '@sitecore-jss/sitecore-jss';
+import { ComponentRendering } from '@sitecore-jss/sitecore-jss/layout';
 
 @Component({
   selector: 'sc-missing-component',

packages/sitecore-jss-angular/src/components/placeholder.component.spec.ts

@@ -7,7 +7,7 @@ import {
   Output,
 } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ComponentRendering } from '@sitecore-jss/sitecore-jss';
+import { ComponentRendering } from '@sitecore-jss/sitecore-jss/layout';
 import { By } from '@angular/platform-browser';
 import { SpyNgModuleFactoryLoader } from '@angular/router/testing';
 

packages/sitecore-jss-angular/src/components/placeholder.component.ts

@@ -21,7 +21,7 @@ import {
   ViewChild,
   ViewContainerRef,
 } from '@angular/core';
-import { ComponentRendering, HtmlElementRendering } from '@sitecore-jss/sitecore-jss';
+import { ComponentRendering, HtmlElementRendering } from '@sitecore-jss/sitecore-jss/layout';
 import { Observable } from 'rxjs';
 import { takeWhile } from 'rxjs/operators';
 import {

packages/sitecore-jss-angular/src/components/raw.component.ts

@@ -1,5 +1,5 @@
 import { Component, ElementRef, Input, OnInit, Renderer2 } from '@angular/core';
-import { HtmlElementRendering } from '@sitecore-jss/sitecore-jss';
+import { HtmlElementRendering } from '@sitecore-jss/sitecore-jss/layout';
 
 @Component({
   selector: 'sc-raw',

packages/sitecore-jss-angular/src/components/render-component.component.ts

@@ -11,7 +11,7 @@ import {
   ViewChild,
   ViewContainerRef,
 } from '@angular/core';
-import { ComponentRendering, HtmlElementRendering } from '@sitecore-jss/sitecore-jss';
+import { ComponentRendering, HtmlElementRendering } from '@sitecore-jss/sitecore-jss/layout';
 import { Observable } from 'rxjs';
 import { takeWhile } from 'rxjs/operators';
 import {

packages/sitecore-jss-angular/src/components/rendering.ts

@@ -1,4 +1,4 @@
-import { ComponentRendering, HtmlElementRendering } from '@sitecore-jss/sitecore-jss';
+import { ComponentRendering, HtmlElementRendering } from '@sitecore-jss/sitecore-jss/layout';
 
 /**
  * @param {HtmlElementRendering | ComponentRendering} rendering

packages/sitecore-jss-angular/src/jss-component-factory.service.ts

@@ -7,7 +7,7 @@ import {
   Compiler,
   NgModuleFactory,
 } from '@angular/core';
-import { ComponentRendering, HtmlElementRendering } from '@sitecore-jss/sitecore-jss';
+import { ComponentRendering, HtmlElementRendering } from '@sitecore-jss/sitecore-jss/layout';
 import {
   ComponentNameAndModule,
   ComponentNameAndType,

packages/sitecore-jss-angular/src/public_api.ts

@@ -18,23 +18,20 @@ export {
 export { RichTextDirective } from './components/rich-text.directive';
 export { TextDirective } from './components/text.directive';
 export { JssModule } from './lib.module';
+export { mediaApi } from '@sitecore-jss/sitecore-jss/media';
 export { handleEditorAnchors } from './utils';
 export {
-  mediaApi,
-  isEditorActive,
-  resetEditorChromes,
-  constants,
-  isExperienceEditorActive,
-  resetExperienceEditorChromes,
   DictionaryService,
-  RestDictionaryService,
   GraphQLDictionaryService,
-  RestLayoutService,
-  GraphQLLayoutService,
+  RestDictionaryService,
+} from '@sitecore-jss/sitecore-jss/i18n';
+export {
   LayoutService,
   LayoutServiceData,
   LayoutServiceContextData,
-  PlaceholderData,
+  GraphQLLayoutService,
+  RestLayoutService,
+  PlaceholdersData,
   RouteData,
   Field,
   HtmlElementRendering,
@@ -43,7 +40,16 @@ export {
   ComponentRendering,
   ComponentFields,
   ComponentParams,
+} from '@sitecore-jss/sitecore-jss/layout';
+export {
+  constants,
   HttpDataFetcher,
-  HttpResponse,
-  isServer,
+  HttpResponse
 } from '@sitecore-jss/sitecore-jss';
+export {
+  isServer,
+  isExperienceEditorActive,
+  resetExperienceEditorChromes,
+  isEditorActive,
+  resetEditorChromes, }
+  from '@sitecore-jss/sitecore-jss/utils'

packages/sitecore-jss-angular/src/utils.ts

@@ -1,4 +1,4 @@
-import { ExperienceEditor } from '@sitecore-jss/sitecore-jss';
+import { ExperienceEditor } from '@sitecore-jss/sitecore-jss/utils';
 
 /**
  * @description in Experience Editor with an Angular sample app, anchor tags

packages/sitecore-jss-cli/package.json

@@ -32,8 +32,7 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss-dev-tools": "^20.0.0-canary.34",
-    "@sitecore-jss/sitecore-jss-manifest": "^20.0.0-canary.34",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^20.0.0-canary.23",
     "axios": "^0.21.1",
     "chalk": "^2.4.2",
     "cross-spawn": "^7.0.0",

packages/sitecore-jss-cli/src/scripts/manifest.ts

@@ -1,5 +1,4 @@
-import { clean } from '@sitecore-jss/sitecore-jss-dev-tools';
-import { generateToFile } from '@sitecore-jss/sitecore-jss-manifest';
+import { clean, generateToFile } from '@sitecore-jss/sitecore-jss-dev-tools';
 import chalk from 'chalk';
 import { existsSync } from 'fs';
 import path from 'path';

packages/sitecore-jss-dev-tools/.nycrc

@@ -5,7 +5,8 @@
   "exclude": [
     "**/*.d.ts",
     "**/*.test.ts",
-    "src/testData",
+    "src/**/testData",
+    "src/pipelines/test",
     "dist",
     "types"
   ],