fix rebase

Author: ALEX-ANV

apps/codelab/src/app/admin/pages/content/pages/presentation-editor/components/wrappers/custom-component-editors/codelab-code-demo-console-editor/codelab-code-demo-console-editor.component.ts

@@ -3,7 +3,7 @@ import { ContentService } from '../../../../../../services/content.service';
 import { ContentSlide, CustomBlock } from '../../../../types';
 import { MonacoConfigService } from '@codelab/code-demos';
 import { IRange, Selection } from 'monaco-editor';
-import { assert } from '@codelab/code-demos/src/lib/shared/utils';
+import { assert } from '@codelab/utils';
 import { rangeToJSON } from './highlight-button/highlight-button.component';
 
 interface SelectableFile {

apps/codelab/src/app/admin/pages/content/pages/presentation-editor/components/wrappers/custom-component-editors/codelab-code-demo-console-editor/highlight-button/highlight-button.component.ts

@@ -4,8 +4,8 @@ import { editor, IRange, Range } from 'monaco-editor';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import { CommonModule } from '@angular/common';
-import { CodeDemoEditorInjector } from '@codelab/code-demos/src/lib/code-demo-editor/code-demo-editor.injector';
-import { MonacoSelection, MonacoSelectionService } from '@codelab/code-demos/src/lib/shared/monaco-selection.service';
+import { CodeDemoEditorInjector } from '@codelab/code-demos';
+import { MonacoSelection, MonacoSelectionService } from '@codelab/code-demos';
 import IEditorDecorationsCollection = editor.IEditorDecorationsCollection;
 import IStandaloneCodeEditor = editor.IStandaloneCodeEditor;
 

apps/codelab/src/app/admin/pages/feedback/components/feedback-message-table/feedback-message-table.component.ts

@@ -6,7 +6,7 @@ import {
 } from '@angular/core';
 import { MatTableDataSource } from '@angular/material/table';
 import { MatSort } from '@angular/material/sort';
-import { Message } from '@codelab/feedback/src/lib/message';
+import { Message } from '@codelab/feedback';
 
 const clearTags = (value: string) =>
   value.replace(/<[^>]+>/g, '').replace(/Angular Codelab \/ /, '');

apps/codelab/src/app/admin/pages/feedback/feedback.component.ts

@@ -3,7 +3,7 @@ import {
   AngularFireDatabase,
   AngularFireList,
 } from '@angular/fire/compat/database';
-import { Message } from '@codelab/feedback/src/lib/message';
+import { Message } from '@codelab/feedback';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 

apps/codelab/src/app/admin/pages/users/users.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { LoginService } from '@codelab/firebase-login';
-import { SyncDbService } from '@codelab/utils/src/lib/sync/services/sync-db.service';
+import { SyncDbService } from '@codelab/sync';
 import { map } from 'rxjs/operators';
-import { firebaseToValuesWithKey } from '@codelab/utils/src/lib/sync/common';
 import { combineLatest, Observable } from 'rxjs';
 import { Permissions } from '../../../shared/services/access.service';
+import { firebaseToValuesWithKey } from '@codelab/sync';
 
 export interface AdminDb {
   key: string;

package.json

@@ -32,13 +32,9 @@
     "build:30s": "npm run ng build angular-thirty-seconds --configuration production",
     "serve:30s": "ng serve angular-thirty-seconds",
     "//--------------- NX      ---------------------": "",
-    "affected:apps": "nx affected:apps",
-    "affected:libs": "nx affected:libs",
-    "affected:build": "nx affected:build",
-    "affected:test": "nx affected:test --watch=false",
-    "affected:lint": "nx affected:lint",
-    "affected:dep-graph": "nx affected:dep-graph",
-    "format": "nx format:write",
+    "affected:build": "ng affected --target=build --parallel=3",
+    "affected:test": "ng affected --target=test --parallel=3",
+    "affected:lint": "ng affected --target=lint --parallel=3",
     "format:write": "nx format:write --uncommitted",
     "format:check": "nx format:check",
     "update": "ng update @nrwl/workspace",