@filip.mazev/blocks 1.0.0 → 1.0.2

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@filip.mazev/blocks",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "schematics": "./schematics/collection.json",
   "peerDependencies": {
-    "@angular/core": "^17.0.0",
+    "@angular/core": "^21.1.1",
     "@filip.mazev/blocks-core": "latest",
     "@filip.mazev/modal": "latest",
     "@filip.mazev/toastr": "latest"

package/schematics/ng-add/index.js

@@ -16,7 +16,10 @@ function addDependencies(tree, context) {
         context.logger.warn('Could not find package.json. Skipping dependency injection.');
         return;
     }
-    const packageJson = JSON.parse(tree.read(packageJsonPath).toString('utf-8'));
+    const packageJsonBuffer = tree.read(packageJsonPath);
+    if (!packageJsonBuffer)
+        return;
+    const packageJson = JSON.parse(packageJsonBuffer.toString('utf-8'));
     if (!packageJson.dependencies) {
         packageJson.dependencies = {};
     }
@@ -25,22 +28,52 @@ function addDependencies(tree, context) {
         '@filip.mazev/modal',
         '@filip.mazev/toastr'
     ];
+    let dependenciesAdded = false;
     packages.forEach(pkg => {
         if (!packageJson.dependencies[pkg]) {
             packageJson.dependencies[pkg] = 'latest';
             context.logger.info(`Added ${pkg} to dependencies.`);
+            dependenciesAdded = true;
         }
     });
-    tree.overwrite(packageJsonPath, JSON.stringify(packageJson, null, 2));
+    if (dependenciesAdded) {
+        tree.overwrite(packageJsonPath, JSON.stringify(packageJson, null, 2));
+    }
 }
 function injectStyles(tree, context) {
-    const stylePaths = ['/src/styles.scss', '/src/styles.sass'];
-    const targetPath = stylePaths.find(p => tree.exists(p));
-    if (!targetPath) {
-        context.logger.warn('Could not find src/styles.scss. Please configure the Blocks theme manually.');
+    const workspaceConfigPath = '/angular.json';
+    if (!tree.exists(workspaceConfigPath)) {
+        context.logger.warn('Could not find angular.json. Please configure the Blocks theme manually.');
+        return;
+    }
+    const workspaceConfigBuffer = tree.read(workspaceConfigPath);
+    if (!workspaceConfigBuffer)
+        return;
+    const workspaceConfig = JSON.parse(workspaceConfigBuffer.toString('utf-8'));
+    const projectName = workspaceConfig.defaultProject || Object.keys(workspaceConfig.projects)[0];
+    const project = workspaceConfig.projects[projectName];
+    if (!project) {
+        context.logger.warn('Could not find a valid project in angular.json.');
+        return;
+    }
+    const buildOptions = project.architect?.build?.options;
+    if (!buildOptions || !buildOptions.styles) {
+        context.logger.warn(`Could not find styles configuration for project "${projectName}".`);
+        return;
+    }
+    let targetStylePath = '';
+    for (const style of buildOptions.styles) {
+        const styleString = typeof style === 'string' ? style : style.input;
+        if (styleString && (styleString.endsWith('.scss') || styleString.endsWith('.sass'))) {
+            targetStylePath = styleString;
+            break;
+        }
+    }
+    if (!targetStylePath || !tree.exists(targetStylePath)) {
+        context.logger.warn('Could not locate a global .scss or .sass file. Please configure the Blocks theme manually.');
         return;
     }
-    const content = tree.read(targetPath).toString('utf-8');
+    const content = tree.read(targetStylePath).toString('utf-8');
     if (content.includes('@filip.mazev/blocks-core')) {
         context.logger.info('Blocks SCSS configuration already exists. Skipping style injection.');
         return;
@@ -58,6 +91,6 @@ function injectStyles(tree, context) {
     }
 }
 `;
-    tree.overwrite(targetPath, blocksThemeSnippet + '\n' + content);
-    context.logger.info('Successfully injected Blocks theme configuration into styles.scss.');
+    tree.overwrite(targetStylePath, blocksThemeSnippet + '\n' + content);
+    context.logger.info(`Successfully injected Blocks theme configuration into ${targetStylePath}.`);
 }

package/schematics/ng-add/tsconfig.json

@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
+    "module": "nodenext",
     "target": "esnext",
     "lib": ["esnext", "dom"],
-    "moduleResolution": "node",
+    "moduleResolution": "nodenext",
     "strict": true,
     "declaration": false,
     "noImplicitAny": true