resolve merge conflicts

Author: manfredsteyer

.eslintrc

@@ -0,0 +1,40 @@
+{
+  "root": true,
+  "plugins": ["@nrwl/nx"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "parserOptions": {
+        "project": "./tsconfig.*?.json"
+      },
+      "rules": {
+        "@nrwl/nx/enforce-module-boundaries": [
+          "error",
+          {
+            "enforceBuildableLibDependency": true,
+            "allow": [],
+            "depConstraints": [
+              {
+                "sourceTag": "*",
+                "onlyDependOnLibsWithTags": ["*"]
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "extends": ["plugin:@nrwl/nx/typescript"],
+      "parserOptions": {
+        "project": "./tsconfig.*?.json"
+      },
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "extends": ["plugin:@nrwl/nx/javascript"],
+      "rules": {}
+    }
+  ]
+}

.eslintrc.json

@@ -1,6 +1,7 @@
 {
   "recommendations": [
     "ms-vscode.vscode-typescript-tslint-plugin",
-    "esbenp.prettier-vscode"
+    "esbenp.prettier-vscode",
+    "firsttris.vscode-jest-runner"
   ]
 }

.vscode/extensions.json

@@ -1,5 +1,5 @@
 module.exports = {
   name: 'ddd-e2e',
   preset: '../../jest.config.js',
-  coverageDirectory: '../../coverage/appsddd-e2e'
+  coverageDirectory: '../../coverage/appsddd-e2e',
 };

apps/ddd-e2e/jest.config.js

@@ -3,10 +3,10 @@ import {
   ensureNxProject,
   readJson,
   runNxCommandAsync,
-  uniq
+  uniq,
 } from '@nrwl/nx-plugin/testing';
 describe('ddd e2e', () => {
-  it('should create ddd', async done => {
+  it('should create ddd', async (done) => {
     const plugin = uniq('ddd');
     ensureNxProject('@angular-architects/ddd', 'dist/libs/ddd');
     await runNxCommandAsync(`generate @angular-architects/ddd:ddd ${plugin}`);
@@ -18,7 +18,7 @@ describe('ddd e2e', () => {
   });
 
   describe('--directory', () => {
-    it('should create src in the specified directory', async done => {
+    it('should create src in the specified directory', async (done) => {
       const plugin = uniq('ddd');
       ensureNxProject('@angular-architects/ddd', 'dist/libs/ddd');
       await runNxCommandAsync(
@@ -32,7 +32,7 @@ describe('ddd e2e', () => {
   });
 
   describe('--tags', () => {
-    it('should add tags to nx.json', async done => {
+    it('should add tags to nx.json', async (done) => {
       const plugin = uniq('ddd');
       ensureNxProject('@angular-architects/ddd', 'dist/libs/ddd');
       await runNxCommandAsync(

apps/ddd-e2e/tests/ddd.test.ts

@@ -1,9 +1,3 @@
 module.exports = {
-  testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
-  transform: {
-    '^.+\\.(ts|js|html)$': 'ts-jest'
-  },
-  resolver: '@nrwl/jest/plugins/resolver',
-  moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageReporters: ['html']
+  projects: ['<rootDir>/libs/ddd'],
 };

jest.config.js

@@ -0,0 +1,11 @@
+const nxPreset = require('@nrwl/jest/preset');
+module.exports = {
+  ...nxPreset,
+  testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
+  transform: {
+    '^.+\\.(ts|js|html)$': 'ts-jest',
+  },
+  resolver: '@nrwl/jest/plugins/resolver',
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageReporters: ['html'],
+};

jest.preset.js

@@ -14,11 +14,11 @@ The generated access restrictions prevent unwanted access between libraries resp
 - ⚙️ Generating feature libraries including a feature components using the facades
 - 🙅‍♂️ Adding linting rules for access restrictions between domains as proposed by Nrwl
 - 🙅‍♀️ Adding linting rules for access restrictions between layers as proposed by Nrwl (supports tslint and eslint)
-- 🔥 Optionally generates skeleton for NGRX and integrates it into the DDD design (``--ngrx`` switch)
+- 🔥 Optionally generates skeleton for NGRX and integrates it into the DDD design (`--ngrx` switch)
 
 ### Features Overview Video
-<a href="https://www.youtube.com/watch?v=39JLXMEE7Ds" target="_blank">![Screenshot of Overview Video](https://i.imgur.com/VlTRE80.png)</a>
 
+<a href="https://www.youtube.com/watch?v=39JLXMEE7Ds" target="_blank">![Screenshot of Overview Video](https://i.imgur.com/VlTRE80.png)</a>
 
 ## Usage
 
@@ -38,16 +38,15 @@ ng g @angular-architects/ddd:feature cancel --domain booking
 ng g @angular-architects/ddd:feature manage --domain boarding
 ```
 
-For NGRX support, just add the ``--ngrx`` switch:
+For NGRX support, just add the `--ngrx` switch:
 
 ```
 ng g @angular-architects/ddd:domain booking --addApp --ngrx
 ng g @angular-architects/ddd:feature search --domain booking --entity flight --ngrx
 [...]
 ```
 
-
-This example assumes that you have an app ``flight-app`` in place.
+This example assumes that you have an app `flight-app` in place.
 
 These schematics also wire up the individual libs. To see the result, create a dependency graph:
 
@@ -57,7 +56,7 @@ npm run dep-graph
 
 ![dependency graph](https://github.com/angular-architects/nx-ddd-plugin/blob/master/libs/ddd/assets/ddd.png?raw=true)
 
-To see that the skeleton works end-to-end, call the generated feature component in your ``app.component.html``:
+To see that the skeleton works end-to-end, call the generated feature component in your `app.component.html`:
 
 ```html
 <booking-search></booking-search>
@@ -79,7 +78,7 @@ The domain layer is subdivided into three parts:
 
 ### Generated Structure for Domain Library
 
-- **application:** Contains application services. This is a DDD term for what we call facades in Angular nowadays. They orchestrate everything for a use case given so that a feature component only needs to communicate with one such facade. Also, it hides details for state management. While the generates facades just use a ``BehaviorSubject``, feel free to add a library like NGRX underneath. As such a modifications changes nothing from the component's perspective, you can use facades to introduce NGRX later on demand.
+- **application:** Contains application services. This is a DDD term for what we call facades in Angular nowadays. They orchestrate everything for a use case given so that a feature component only needs to communicate with one such facade. Also, it hides details for state management. While the generates facades just use a `BehaviorSubject`, feel free to add a library like NGRX underneath. As such a modifications changes nothing from the component's perspective, you can use facades to introduce NGRX later on demand.
 - **entities:** Client-side data model including logic operating on it (like validations).
 - **infrastructure:** Services for communicating with the backend.
 
@@ -102,6 +101,7 @@ see https://github.com/angular-architects/ddd-demo
 - [Our eBook on Angular and architectures](https://leanpub.com/enterprise-angular)
 - [Thomas Burlison's article about facades in Angular](https://medium.com/@thomasburlesonIA/push-based-architectures-with-rxjs-81b327d7c32d)
 
-## More 
+## More
+
 - [Angular Architecture Workshop](https://www.angulararchitects.io/en/angular-workshops/advanced-angular-enterprise-architecture-incl-ivy/)
 - [Follow us on Twitter](https://twitter.com/ManfredSteyer)

libs/ddd/.eslintrc renamed to libs/ddd/.eslintrc.json

@@ -28,4 +28,4 @@
       "description": "adds a utility library to a domain or as a shared library"
     }
   }
-}
+}