@nx/js 16.4.0-beta.8 → 16.4.0-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.4.0-beta.8",
+  "version": "16.4.0-beta.9",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,9 +39,9 @@
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/runtime": "^7.14.8",
-    "@nrwl/js": "16.4.0-beta.8",
-    "@nx/devkit": "16.4.0-beta.8",
-    "@nx/workspace": "16.4.0-beta.8",
+    "@nrwl/js": "16.4.0-beta.9",
+    "@nx/devkit": "16.4.0-beta.9",
+    "@nx/workspace": "16.4.0-beta.9",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
@@ -69,5 +69,5 @@
     "access": "public"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "a6589ab111fc01fd4d2cd215c31bfcff004dfc00"
+  "gitHead": "b7fbc25d5be1789d42805e2254cf4a6070889157"
 }

package/plugins/jest/local-registry.d.ts

@@ -0,0 +1 @@
+export * from '../../src/plugins/jest/start-local-registry';

package/plugins/jest/local-registry.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("../../src/plugins/jest/start-local-registry"), exports);

package/src/executors/verdaccio/verdaccio.impl.js

@@ -21,8 +21,12 @@ function verdaccioExecutor(options, context) {
         catch (e) {
             throw new Error('Verdaccio is not installed. Please run `npm install verdaccio` or `yarn add verdaccio`');
         }
-        if (options.clear && options.storage && (0, fs_extra_1.existsSync)(options.storage)) {
-            (0, fs_extra_1.removeSync)(options.storage);
+        if (options.storage) {
+            options.storage = (0, path_1.resolve)(context.root, options.storage);
+            if (options.clear && (0, fs_extra_1.existsSync)(options.storage)) {
+                (0, fs_extra_1.rmSync)(options.storage, { recursive: true, force: true });
+                console.log(`Cleared local registry storage folder ${options.storage}`);
+            }
         }
         const cleanupFunctions = options.location === 'none' ? [] : [setupNpm(options), setupYarn(options)];
         const processExitListener = (signal) => {
@@ -68,19 +72,7 @@ function startVerdaccio(options, workspaceRoot) {
             env: Object.assign(Object.assign(Object.assign({}, process.env), { VERDACCIO_HANDLE_KILL_SIGNALS: 'true' }), (options.storage
                 ? { VERDACCIO_STORAGE_PATH: options.storage }
                 : {})),
-            stdio: ['inherit', 'pipe', 'pipe', 'ipc'],
-        });
-        childProcess.stdout.on('data', (data) => {
-            process.stdout.write(data);
-        });
-        childProcess.stderr.on('data', (data) => {
-            if (data.includes('VerdaccioWarning') ||
-                data.includes('DeprecationWarning')) {
-                process.stdout.write(data);
-            }
-            else {
-                reject(data);
-            }
+            stdio: 'inherit',
         });
         childProcess.on('error', (err) => {
             reject(err);

package/src/generators/setup-verdaccio/files/config.yml

@@ -8,7 +8,7 @@ auth:
 # a list of other known repositories we can talk to
 uplinks:
   npmjs:
-    url: https://registry.npmjs.org/
+    url: <%= npmUplinkRegistry %>
     maxage: 60m
 
 packages:

package/src/generators/setup-verdaccio/generator.js

@@ -5,10 +5,14 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const versions_1 = require("../../utils/versions");
+const child_process_1 = require("child_process");
 function setupVerdaccio(tree, options) {
+    var _a, _b, _c;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (!tree.exists('.verdaccio/config.yml')) {
-            (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), '.verdaccio', {});
+            (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), '.verdaccio', {
+                npmUplinkRegistry: (_c = (_b = (_a = (0, child_process_1.execSync)('npm config get registry')) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : 'https://registry.npmjs.org',
+            });
         }
         const verdaccioTarget = {
             executor: '@nx/js:verdaccio',

package/src/plugins/jest/start-local-registry.d.ts

@@ -0,0 +1,12 @@
+/**
+ * This function is used to start a local registry for testing purposes.
+ * @param localRegistryTarget the target to run to start the local registry e.g. workspace:local-registry
+ * @param storage the storage location for the local registry
+ * @param verbose whether to log verbose output
+ */
+export declare function startLocalRegistry({ localRegistryTarget, storage, verbose, }: {
+    localRegistryTarget: string;
+    storage?: string;
+    verbose?: boolean;
+}): Promise<() => void>;
+export default startLocalRegistry;

package/src/plugins/jest/start-local-registry.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startLocalRegistry = void 0;
+const child_process_1 = require("child_process");
+/**
+ * This function is used to start a local registry for testing purposes.
+ * @param localRegistryTarget the target to run to start the local registry e.g. workspace:local-registry
+ * @param storage the storage location for the local registry
+ * @param verbose whether to log verbose output
+ */
+function startLocalRegistry({ localRegistryTarget, storage, verbose, }) {
+    if (!localRegistryTarget) {
+        throw new Error(`localRegistryTarget is required`);
+    }
+    return new Promise((resolve, reject) => {
+        var _a, _b;
+        const childProcess = (0, child_process_1.fork)(require.resolve('nx'), [
+            ...`run ${localRegistryTarget} --location none --clear true`.split(' '),
+            ...(storage ? [`--storage`, storage] : []),
+        ], { stdio: 'pipe' });
+        const listener = (data) => {
+            var _a, _b, _c;
+            if (verbose) {
+                process.stdout.write(data);
+            }
+            if (data.toString().includes('http://localhost:')) {
+                const port = parseInt((_b = (_a = data.toString().match(/localhost:(?<port>\d+)/)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.port);
+                console.log('Local registry started on port ' + port);
+                const registry = `http://localhost:${port}`;
+                process.env.npm_config_registry = registry;
+                process.env.YARN_REGISTRY = registry;
+                (0, child_process_1.execSync)(`npm config set //localhost:${port}/:_authToken "secretVerdaccioToken"`);
+                console.log('Set npm and yarn config registry to ' + registry);
+                resolve(() => {
+                    childProcess.kill();
+                    (0, child_process_1.execSync)(`npm config delete //localhost:${port}/:_authToken`);
+                });
+                (_c = childProcess === null || childProcess === void 0 ? void 0 : childProcess.stdout) === null || _c === void 0 ? void 0 : _c.off('data', listener);
+            }
+        };
+        (_a = childProcess === null || childProcess === void 0 ? void 0 : childProcess.stdout) === null || _a === void 0 ? void 0 : _a.on('data', listener);
+        (_b = childProcess === null || childProcess === void 0 ? void 0 : childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
+            process.stderr.write(data);
+        });
+        childProcess.on('error', (err) => {
+            console.log('local registry error', err);
+            reject(err);
+        });
+        childProcess.on('exit', (code) => {
+            console.log('local registry exit', code);
+            if (code !== 0) {
+                reject(code);
+            }
+            else {
+                resolve(() => { });
+            }
+        });
+    });
+}
+exports.startLocalRegistry = startLocalRegistry;
+exports.default = startLocalRegistry;

package/src/utils/add-local-registry-scripts.d.ts

@@ -0,0 +1,5 @@
+import { type Tree } from '@nx/devkit';
+export declare function addLocalRegistryScripts(tree: Tree): {
+    startLocalRegistryPath: string;
+    stopLocalRegistryPath: string;
+};

package/src/utils/add-local-registry-scripts.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addLocalRegistryScripts = void 0;
+const devkit_1 = require("@nx/devkit");
+const startLocalRegistryScript = (localRegistryTarget) => `
+/**
+ * This script starts a local registry for e2e testing purposes.
+ * It is meant to be called in jest's globalSetup.
+ */
+import { startLocalRegistry } from '@nx/js/plugins/jest/local-registry';
+import { execFileSync } from 'child_process';
+
+export default async () => {
+  // local registry target to run
+  const localRegistryTarget = '${localRegistryTarget}';
+  // storage folder for the local registry
+  const storage = './tmp/local-registry/storage';
+
+  global.stopLocalRegistry = await startLocalRegistry({
+    localRegistryTarget,
+    storage,
+    verbose: false,
+  });
+  const nx = require.resolve('nx');
+  execFileSync(
+    nx,
+    ['run-many', '--targets', 'publish', '--ver', '1.0.0', '--tag', 'e2e'],
+    { env: process.env, stdio: 'inherit' }
+  );
+};
+`;
+const stopLocalRegistryScript = `
+/**
+ * This script stops the local registry for e2e testing purposes.
+ * It is meant to be called in jest's globalTeardown.
+ */
+
+export default () => {
+  if (global.stopLocalRegistry) {
+    global.stopLocalRegistry();
+  }
+};
+`;
+function addLocalRegistryScripts(tree) {
+    const startLocalRegistryPath = 'tools/scripts/start-local-registry.ts';
+    const stopLocalRegistryPath = 'tools/scripts/stop-local-registry.ts';
+    const projectConfiguration = (0, devkit_1.readJson)(tree, 'project.json');
+    const localRegistryTarget = `${projectConfiguration.name}:local-registry`;
+    if (!tree.exists(startLocalRegistryPath)) {
+        tree.write(startLocalRegistryPath, startLocalRegistryScript(localRegistryTarget));
+    }
+    if (!tree.exists(stopLocalRegistryPath)) {
+        tree.write(stopLocalRegistryPath, stopLocalRegistryScript);
+    }
+    return { startLocalRegistryPath, stopLocalRegistryPath };
+}
+exports.addLocalRegistryScripts = addLocalRegistryScripts;

package/src/utils/minimal-publish-script.js

@@ -13,14 +13,13 @@ const publishScriptContent = `
 
 import { execSync } from 'child_process';
 import { readFileSync, writeFileSync } from 'fs';
-import chalk from 'chalk';
 
 import devkit from '@nx/devkit';
 const { readCachedProjectGraph } = devkit;
 
 function invariant(condition, message) {
   if (!condition) {
-    console.error(chalk.bold.red(message));
+    console.error(message);
     process.exit(1);
   } 
 }
@@ -59,9 +58,7 @@ try {
   json.version = version;
   writeFileSync(\`package.json\`, JSON.stringify(json, null, 2));
 } catch (e) {
-  console.error(
-    chalk.bold.red(\`Error reading package.json file from library build output.\`)
-  );
+  console.error(\`Error reading package.json file from library build output.\`);
 }
 
 // Execute "npm publish" to publish