@nx/workspace 22.7.0-beta.1 → 22.7.0-beta.2

package/jest-mocks/prettier.js

@@ -0,0 +1,111 @@
+const path = require('path');
+
+const prettierDir = path.dirname(
+  require.resolve('prettier', {
+    paths: [path.join(__dirname, '../../../node_modules')],
+  })
+);
+
+// Load standalone prettier (no dynamic imports)
+const standalone = require(path.join(prettierDir, 'standalone.js'));
+
+// Pre-load CJS parser plugins (no dynamic imports)
+const pluginNames = [
+  'babel',
+  'estree',
+  'typescript',
+  'html',
+  'postcss',
+  'markdown',
+  'angular',
+  'yaml',
+];
+const plugins = pluginNames.map((name) =>
+  require(path.join(prettierDir, 'plugins', `${name}.js`))
+);
+
+const prettierMock = {
+  ...standalone,
+  resolveConfig: async () => null,
+  resolveConfigFile: async () => null,
+  clearConfigCache: () => {},
+  getFileInfo: async (filePath) => {
+    const ext = path.extname(filePath);
+    const parserMap = {
+      '.ts': 'typescript',
+      '.tsx': 'typescript',
+      '.js': 'babel',
+      '.jsx': 'babel',
+      '.mjs': 'babel',
+      '.cjs': 'babel',
+      '.json': 'json',
+      '.css': 'css',
+      '.scss': 'scss',
+      '.less': 'less',
+      '.html': 'html',
+      '.md': 'markdown',
+      '.yaml': 'yaml',
+      '.yml': 'yaml',
+    };
+    return { ignored: false, inferredParser: parserMap[ext] || null };
+  },
+  async format(source, options = {}) {
+    try {
+      return await standalone.format(source, {
+        ...options,
+        plugins: [...plugins, ...(options.plugins || [])],
+      });
+    } catch (e) {
+      return source;
+    }
+  },
+  async check(source, options = {}) {
+    try {
+      return await standalone.check(source, {
+        ...options,
+        plugins: [...plugins, ...(options.plugins || [])],
+      });
+    } catch (e) {
+      return true;
+    }
+  },
+  async formatWithCursor(source, options = {}) {
+    try {
+      return await standalone.formatWithCursor(source, {
+        ...options,
+        plugins: [...plugins, ...(options.plugins || [])],
+      });
+    } catch (e) {
+      return { formatted: source, cursorOffset: options.cursorOffset || 0 };
+    }
+  },
+};
+
+const handler = {
+  get(target, prop) {
+    if (prop === '__esModule') return true;
+    if (prop === 'default') return prettierMock;
+    return prettierMock[prop];
+  },
+  has(target, prop) {
+    return prop === '__esModule' || prop === 'default' || prop in prettierMock;
+  },
+  ownKeys() {
+    return [...Object.keys(prettierMock), '__esModule', 'default'];
+  },
+  getOwnPropertyDescriptor(target, prop) {
+    if (prop === '__esModule')
+      return { configurable: true, enumerable: true, value: true };
+    if (prop === 'default')
+      return { configurable: true, enumerable: true, value: prettierMock };
+    if (prop in prettierMock)
+      return {
+        configurable: true,
+        enumerable: true,
+        value: prettierMock[prop],
+      };
+    return undefined;
+  },
+};
+
+module.exports = new Proxy({}, handler);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "22.7.0-beta.1",
+  "version": "22.7.0-beta.2",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -38,7 +38,7 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-beta.1",
+    "@nx/devkit": "22.7.0-beta.2",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
@@ -46,10 +46,10 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "22.7.0-beta.1"
+    "nx": "22.7.0-beta.2"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.1"
+    "nx": "22.7.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/move/lib/update-cypress-config.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateCypressConfig = updateCypressConfig;
-const path = require("path");
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
 /**
  * Updates the videos and screenshots folders in the cypress.json/cypress.config.ts if it exists (i.e. we're moving an e2e project)
  *

package/src/generators/move/lib/update-package-json.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updatePackageJson = updatePackageJson;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 /**
  * Updates the name in the package.json if it exists.
  *

package/src/generators/move/lib/update-project-root-files.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectRootFiles = updateProjectRootFiles;
 exports.updateFilesForRootProjects = updateFilesForRootProjects;
 exports.updateFilesForNonRootProjects = updateFilesForNonRootProjects;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 const path_1 = require("path");
 const allowedExt = ['.ts', '.js', '.json', '.cts', '.cjs'];
 /**

package/src/generators/move/lib/update-storybook-config.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateStorybookConfig = updateStorybookConfig;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 const path_1 = require("path");
 /**
  * Updates relative path to root storybook config for `main.js` & `webpack.config.js`

package/src/generators/new/generate-preset.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addPresetDependencies = addPresetDependencies;
 exports.generatePreset = generatePreset;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const presets_1 = require("../utils/presets");
 const versions_1 = require("../../utils/versions");
 const get_npm_package_version_1 = require("../utils/get-npm-package-version");
 const path_1 = require("path");
-const yargsParser = require("yargs-parser");
+const yargs_parser_1 = tslib_1.__importDefault(require("yargs-parser"));
 const child_process_1 = require("child_process");
 const installation_directory_1 = require("nx/src/utils/installation-directory");
 function addPresetDependencies(host, options) {
@@ -15,7 +16,7 @@ function addPresetDependencies(host, options) {
     return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, dev, (0, path_1.join)(options.directory, 'package.json'));
 }
 function generatePreset(host, opts) {
-    const parsedArgs = yargsParser(process.argv, {
+    const parsedArgs = (0, yargs_parser_1.default)(process.argv, {
         boolean: ['interactive'],
         default: {
             interactive: true,

package/src/generators/new/new.js

@@ -21,7 +21,7 @@ async function newGenerator(tree, opts) {
                 (0, child_process_1.execSync)(pmc.preInstall, {
                     cwd: (0, devkit_1.joinPathFragments)(tree.root, options.directory),
                     stdio: process.env.NX_GENERATE_QUIET === 'true' ? 'ignore' : 'inherit',
-                    windowsHide: false,
+                    windowsHide: true,
                 });
             }
             (0, devkit_1.installPackagesTask)(tree, false, options.directory, options.packageManager);

package/src/generators/utils/get-npm-package-version.js

@@ -16,7 +16,7 @@ function getNpmPackageVersion(packageName, packageVersion) {
         const npmBin = process.platform === 'win32' ? 'npm.cmd' : 'npm';
         const version = require('child_process').execFileSync(npmBin, ['view', packageSpec, 'version', '--json'], {
             stdio: ['pipe', 'pipe', 'ignore'],
-            windowsHide: false,
+            windowsHide: true,
         });
         if (version) {
             // package@1.12 => ["1.12.0", "1.12.1"]

package/src/utilities/default-base.js

@@ -6,7 +6,7 @@ function deduceDefaultBase() {
     const nxDefaultBase = 'main';
     try {
         return ((0, child_process_1.execSync)('git config --get init.defaultBranch', {
-            windowsHide: false,
+            windowsHide: true,
         })
             .toString()
             .trim() || nxDefaultBase);

package/src/utils/output.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.output = void 0;
-const chalk = require("chalk");
+const tslib_1 = require("tslib");
+const chalk = tslib_1.__importStar(require("chalk"));
 /**
  * Automatically disable styling applied by chalk if CI=true
  */