@nstudio/focus 12.7.0 → 13.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstudio/focus",
-  "version": "12.7.0",
+  "version": "13.4.1",
   "description": "Focus helpers for monorepos in various IDEs",
   "homepage": "https://nstudio.io/xplat",
   "repository": {
@@ -32,7 +32,7 @@
   "dependencies": {
     "@angular-devkit/core": "^12.0.0",
     "@angular-devkit/schematics": "^12.0.0",
-    "@nstudio/xplat-utils": "12.7.0",
+    "@nstudio/xplat-utils": "13.4.1",
     "xml2js": "~0.4.23"
   }
 }

package/src/schematics/mode/index.js

@@ -8,7 +8,7 @@ let name;
 function default_1(options) {
     if (!options.name) {
         name = 'fullstack';
-        const extraNote = xplat_utils_1.isXplatWorkspace()
+        const extraNote = (0, xplat_utils_1.isXplatWorkspace)()
             ? ` Currently supported: fullstack,${xplat_utils_1.supportedPlatformsWithNx}. Example: nx g mode nativescript`
             : '';
         console.warn(`Defaulting to 'fullstack' and showing everything since no focus was specified.${extraNote}`);
@@ -16,9 +16,9 @@ function default_1(options) {
     else {
         name = options.name;
     }
-    return schematics_1.chain([
+    return (0, schematics_1.chain)([
         // init xplat settings
-        xplat_utils_1.prerun(),
+        (0, xplat_utils_1.prerun)(),
         // update tsconfig based on mode
         // (tree: Tree) => {
         //   return isXplatWorkspace() ? updateExcludes(name)(tree) : noop();
@@ -26,7 +26,7 @@ function default_1(options) {
         // update IDE settings
         (tree, context) => {
             // apps
-            const appPaths = xplat_utils_1.getAppPaths(tree);
+            const appPaths = (0, xplat_utils_1.getAppPaths)(tree);
             const allApps = [];
             for (const appPath of appPaths) {
                 allApps.push(`**${appPath}`);
@@ -54,7 +54,7 @@ function default_1(options) {
             let focusOnApps = [];
             if (name !== 'fullstack' && options.projects) {
                 focusOnApps = options.projects.split(',').map((p) => p.trim());
-                if (xplat_utils_1.isXplatWorkspace()) {
+                if ((0, xplat_utils_1.isXplatWorkspace)()) {
                     // allows for shorthand project/app names omitting platform from the app name
                     // just add platform to the name to be specific
                     for (let i = 0; i < focusOnApps.length; i++) {

package/src/schematics/mode/schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "$id": "mode",
+  "$id": "focus",
   "title": "focus schema",
   "type": "object",
   "properties": {

package/src/utils/index.js

@@ -4,21 +4,21 @@ exports.FocusHelpers = void 0;
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 const path_1 = require("path");
 const fs_1 = require("fs");
-const workspace_1 = require("@nrwl/workspace");
+const devkit_1 = require("@nrwl/devkit");
 const xml2js = require("xml2js");
 var FocusHelpers;
 (function (FocusHelpers) {
     function updateIDESettings(options) {
         return (tree, context) => {
-            if (xplat_utils_1.isTesting()) {
+            if ((0, xplat_utils_1.isTesting)()) {
                 // ignore node file modifications when just testing
                 return tree;
             }
             try {
                 // console.log('workspace dir:', process.cwd());
                 // const dirName = process.cwd().split('/').slice(-1);
-                const groupByName = xplat_utils_1.getGroupByName();
-                const framework = xplat_utils_1.getFrontendFramework();
+                const groupByName = (0, xplat_utils_1.getGroupByName)();
+                const framework = (0, xplat_utils_1.getFrontendFramework)();
                 let frameworkSuffix = framework ? `-${framework}` : '';
                 let isFullstack = false;
                 let isExcluding = false;
@@ -27,7 +27,7 @@ var FocusHelpers;
                 if (!options.devMode || options.devMode === 'fullstack') {
                     // show all
                     isFullstack = true;
-                    if (xplat_utils_1.isXplatWorkspace()) {
+                    if ((0, xplat_utils_1.isXplatWorkspace)()) {
                         for (const p of xplat_utils_1.supportedPlatformsWithNx) {
                             const appFilter = groupByName ? `*-${p}` : `${p}*`;
                             userUpdates[`**/apps/${appFilter}`] = false;
@@ -50,8 +50,8 @@ var FocusHelpers;
                     }
                 }
                 else if (options.platforms) {
-                    const platforms = xplat_utils_1.sanitizeCommaDelimitedArg(options.platforms);
-                    if (xplat_utils_1.isXplatWorkspace()) {
+                    const platforms = (0, xplat_utils_1.sanitizeCommaDelimitedArg)(options.platforms);
+                    if ((0, xplat_utils_1.isXplatWorkspace)()) {
                         // switch on/off platforms
                         for (const p of xplat_utils_1.supportedPlatformsWithNx) {
                             const excluded = platforms.includes(p) ? false : true;
@@ -131,7 +131,7 @@ var FocusHelpers;
                     allPackages: options.allPackages,
                     isFullstack,
                 });
-                if (xplat_utils_1.isXplatWorkspace() && !options.devMode) {
+                if ((0, xplat_utils_1.isXplatWorkspace)() && !options.devMode) {
                     // only when not specifying a dev mode
                     const workspaceUpdates = {
                         '**/node_modules': true,
@@ -203,16 +203,18 @@ var FocusHelpers;
                 : '/var/local/Code/User/settings.json';
             const windowsHome = process.env.APPDATA;
             if (windowsHome) {
-                userSettingsVSCodePath = path_1.join(windowsHome, 'Code', 'User', 'settings.json');
+                userSettingsVSCodePath = (0, path_1.join)(windowsHome, 'Code', 'User', 'settings.json');
             }
             // console.log('userSettingsVSCodePath:',userSettingsVSCodePath);
-            isVsCode = fs_1.existsSync(userSettingsVSCodePath);
+            isVsCode = (0, fs_1.existsSync)(userSettingsVSCodePath);
             let vscodeCreateSettingsNote = `It's possible you don't have a user settings.json yet. If so, open VS Code User settings and save any kind of setting to have it created.`;
             // console.log('isVsCode:',isVsCode);
             if (isVsCode) {
-                const userSettings = fs_1.readFileSync(userSettingsVSCodePath, { encoding: 'utf-8' });
+                const userSettings = (0, fs_1.readFileSync)(userSettingsVSCodePath, {
+                    encoding: 'utf-8',
+                });
                 if (userSettings) {
-                    const userSettingsJson = xplat_utils_1.jsonParse(userSettings);
+                    const userSettingsJson = (0, xplat_utils_1.jsonParse)(userSettings);
                     let exclude = userSettingsJson['files.exclude'];
                     if (!exclude) {
                         exclude = {};
@@ -223,7 +225,7 @@ var FocusHelpers;
                     }
                     userSettingsJson['files.exclude'] = Object.assign(exclude, options.userUpdates);
                     userSettingsJson['search.exclude'] = Object.assign(searchExclude, options.userUpdates);
-                    if (xplat_utils_1.isXplatWorkspace()) {
+                    if ((0, xplat_utils_1.isXplatWorkspace)()) {
                         if (options.allApps.length) {
                             // always reset specific app filters
                             for (const app of options.allApps) {
@@ -269,7 +271,7 @@ var FocusHelpers;
                             }
                         }
                     }
-                    fs_1.writeFileSync(userSettingsVSCodePath, workspace_1.serializeJson(userSettingsJson));
+                    (0, fs_1.writeFileSync)(userSettingsVSCodePath, (0, devkit_1.serializeJson)(userSettingsJson));
                     // TODO: print out the updates made
                     // Example of how the updates are represented
                     // true === hidden
@@ -301,21 +303,23 @@ var FocusHelpers;
             /**
              * Workspace settings
              */
-            const workspaceSettingsPath = path_1.join(process.cwd(), '.vscode', 'settings.json');
+            const workspaceSettingsPath = (0, path_1.join)(process.cwd(), '.vscode', 'settings.json');
             // console.log('workspaceSettingsPath:',workspaceSettingsPath);
             let workspaceSettingsJson = {};
-            if (fs_1.existsSync(workspaceSettingsPath)) {
-                const workspaceSettings = fs_1.readFileSync(workspaceSettingsPath, { encoding: 'utf-8' });
-                workspaceSettingsJson = xplat_utils_1.jsonParse(workspaceSettings);
+            if ((0, fs_1.existsSync)(workspaceSettingsPath)) {
+                const workspaceSettings = (0, fs_1.readFileSync)(workspaceSettingsPath, {
+                    encoding: 'utf-8',
+                });
+                workspaceSettingsJson = (0, xplat_utils_1.jsonParse)(workspaceSettings);
                 const exclude = workspaceSettingsJson['files.exclude'];
                 workspaceSettingsJson['files.exclude'] = Object.assign(exclude, options.workspaceUpdates);
             }
             else {
                 // console.log('creating workspace settings...');
-                fs_1.mkdirSync('.vscode');
+                (0, fs_1.mkdirSync)('.vscode');
                 workspaceSettingsJson['files.exclude'] = options.workspaceUpdates;
             }
-            fs_1.writeFileSync(workspaceSettingsPath, workspace_1.serializeJson(workspaceSettingsJson));
+            (0, fs_1.writeFileSync)(workspaceSettingsPath, (0, devkit_1.serializeJson)(workspaceSettingsJson));
         }
         return isVsCode;
     }