Merge branch '15.0.x' into mkirova/fix-12024

Author: dkamburov

package-lock.json

@@ -71,8 +71,8 @@
     "lodash-es": "^4.17.21",
     "rxjs": "^6.6.7",
     "tslib": "^2.3.0",
-    "uuid": "^8.3.0",
-    "zone.js": "~0.11.4"
+    "uuid": "^9.0.0",
+    "zone.js": "~0.12.0"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^15.0.0",
@@ -85,9 +85,9 @@
     "@angular/cli": "^15.0.0",
     "@angular/compiler-cli": "^15.0.0",
     "@angular/language-service": "^15.0.0",
-    "@angularclass/hmr": "^2.1.3",
+    "@angularclass/hmr": "^3.0.0",
     "@cypress/schematic": "^2.3.0",
-    "@types/estree": "^0.0.50",
+    "@types/estree": "^1.0.0",
     "@types/jasmine": "^4.3.0",
     "@types/jasminewd2": "^2.0.10",
     "@types/node": "^18.11.0",
@@ -135,7 +135,6 @@
     "ts-node": "^10.8.1",
     "typedoc": "^0.23.21",
     "typedoc-plugin-localization": "^2.4.0",
-    "typescript": "4.8.4",
-    "webpack-sources": "1.3.0"
+    "typescript": "4.8.4"
   }
 }

package.json

@@ -86,7 +86,7 @@
         "igniteui-theming": "^1.1.2"
     },
     "igxDevDependencies": {
-        "@igniteui/angular-schematics": "~15.0.1100-beta.0"
+        "@igniteui/angular-schematics": "~15.0.1100"
     },
     "ng-update": {
         "migrations": "./migrations/migration-collection.json"

projects/igniteui-angular/package.json

@@ -10,7 +10,7 @@ const resetPackage = { 'minireset.css': '~0.0.4' };
 export const cssImport = 'node_modules/minireset.css/minireset.css';
 export const scssImport =
     `// CSS Reset, comment out if not required or using a different module\n`
-    + `@import '~minireset.css/minireset';\n`;
+    + `@import 'minireset.css/minireset';\n`;
 
 
 export const addResetCss = (workspace: workspaces.WorkspaceDefinition, host: Tree): boolean => {
@@ -28,7 +28,7 @@ export const addResetCss = (workspace: workspaces.WorkspaceDefinition, host: Tre
             case 'sass':
             case 'scss':
                 let content = host.read(stylesFile).toString();
-                if (content.indexOf(`~minireset.css/minireset`) === -1) {
+                if (content.indexOf(`minireset.css/minireset`) === -1) {
                     content = scssImport + content;
                     host.overwrite(stylesFile, content);
                     addPackage = resetPackage;