@nx/js 16.4.0 → 16.5.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.4.0",
+  "version": "16.5.0-beta.0",
   "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",
-    "@nx/devkit": "16.4.0",
-    "@nx/workspace": "16.4.0",
+    "@nrwl/js": "16.5.0-beta.0",
+    "@nx/devkit": "16.5.0-beta.0",
+    "@nx/workspace": "16.5.0-beta.0",
     "@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": "ae698a72748d9f33aa5395aeeaa7b7af436a1dc5"
+  "gitHead": "376d656cfc7f6390ff1cd6d9de348baf7bccbf33"
 }

package/src/executors/node/node.impl.js

@@ -21,10 +21,10 @@ function debounce(fn, wait) {
     };
 }
 function nodeExecutor(options, context) {
-    var _a, _b, _c, _d;
-    var _e;
+    var _a, _b, _c;
+    var _d;
     return tslib_1.__asyncGenerator(this, arguments, function* nodeExecutor_1() {
-        (_a = (_e = process.env).NODE_ENV) !== null && _a !== void 0 ? _a : (_e.NODE_ENV = (_b = context === null || context === void 0 ? void 0 : context.configurationName) !== null && _b !== void 0 ? _b : 'development');
+        (_a = (_d = process.env).NODE_ENV) !== null && _a !== void 0 ? _a : (_d.NODE_ENV = (_b = context === null || context === void 0 ? void 0 : context.configurationName) !== null && _b !== void 0 ? _b : 'development');
         const project = context.projectGraph.nodes[context.projectName];
         const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph);
         let buildOptions;
@@ -44,12 +44,19 @@ function nodeExecutor(options, context) {
         }
         // Re-map buildable workspace projects to their output directory.
         const mappings = calculateResolveMappings(context, options);
-        const outputFileName = (_d = buildOptions.outputFileName) !== null && _d !== void 0 ? _d : `${path.parse(buildOptions.main).name}.js`;
+        let outputFileName = buildOptions.outputFileName || `${path.parse(buildOptions.main).name}.js`;
+        if (!buildOptions.outputFileName) {
+            const matches = buildOptions.main.match(/^(?!.*src)(.*)\/([^/]*)$/); //ignore strings that contain src and split paths into [folders before main, main.ts]
+            if (matches) {
+                const [mainFolder, mainFileName] = matches.slice(1);
+                outputFileName = path.join(mainFolder, `${path.parse(mainFileName).name}.js`);
+            }
+        }
         const fileToRun = (0, path_1.join)(context.root, buildOptions.outputPath, outputFileName);
         const tasks = [];
         let currentTask = null;
         yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, async_iterable_1.createAsyncIterable)(({ done, next, error }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _f;
+            var _e;
             const processQueue = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 if (tasks.length === 0)
                     return;
@@ -59,7 +66,7 @@ function nodeExecutor(options, context) {
                 yield (previousTask === null || previousTask === void 0 ? void 0 : previousTask.stop('SIGTERM'));
                 yield task.start();
             });
-            const debouncedProcessQueue = debounce(processQueue, (_f = options.debounce) !== null && _f !== void 0 ? _f : 1000);
+            const debouncedProcessQueue = debounce(processQueue, (_e = options.debounce) !== null && _e !== void 0 ? _e : 1000);
             const addToQueue = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const task = {
                     id: (0, crypto_1.randomUUID)(),
@@ -143,13 +150,13 @@ function nodeExecutor(options, context) {
                 watchProjects: [context.projectName],
                 includeDependentProjects: true,
             }, (err, data) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                var _g;
+                var _f;
                 if (err === 'closed') {
                     devkit_1.logger.error(`Watch error: Daemon closed the connection`);
                     process.exit(1);
                 }
                 else if (err) {
-                    devkit_1.logger.error(`Watch error: ${(_g = err === null || err === void 0 ? void 0 : err.message) !== null && _g !== void 0 ? _g : 'Unknown'}`);
+                    devkit_1.logger.error(`Watch error: ${(_f = err === null || err === void 0 ? void 0 : err.message) !== null && _f !== void 0 ? _f : 'Unknown'}`);
                 }
                 else {
                     devkit_1.logger.info(`NX File change detected. Restarting...`);

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

@@ -24,6 +24,14 @@ function setupVerdaccio(tree, options) {
         };
         if (!tree.exists('project.json')) {
             const { name } = (0, devkit_1.readJson)(tree, 'package.json');
+            (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+                if (!json.nx) {
+                    json.nx = {
+                        includedScripts: [],
+                    };
+                }
+                return json;
+            });
             (0, devkit_1.addProjectConfiguration)(tree, name, {
                 root: '.',
                 targets: {