@nx/react 16.4.0-beta.10 → 16.4.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "16.4.0-beta.10",
+  "version": "16.4.0-beta.13",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -31,11 +31,11 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/react": "16.4.0-beta.10",
-    "@nx/devkit": "16.4.0-beta.10",
-    "@nx/js": "16.4.0-beta.10",
-    "@nx/linter": "16.4.0-beta.10",
-    "@nx/web": "16.4.0-beta.10",
+    "@nrwl/react": "16.4.0-beta.13",
+    "@nx/devkit": "16.4.0-beta.13",
+    "@nx/js": "16.4.0-beta.13",
+    "@nx/linter": "16.4.0-beta.13",
+    "@nx/web": "16.4.0-beta.13",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
@@ -46,5 +46,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "d2bde0605c692a023bc9c28686f3a3037bbd56d3"
+  "gitHead": "d81afedfcc8d07db8cdb9b0e9286de0321ee184e"
 }

package/plugins/component-testing/index.js

@@ -29,10 +29,13 @@ function nxComponentTestingPreset(pathToConfig, options) {
     const normalizedProjectRootPath = ['.ts', '.js'].some((ext) => pathToConfig.endsWith(ext))
         ? pathToConfig
         : (0, path_1.dirname)(pathToConfig);
+    const basePresetSettings = (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig, {
+        testingType: 'component',
+    });
     if ((options === null || options === void 0 ? void 0 : options.bundler) === 'vite') {
-        return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}', devServer: Object.assign(Object.assign({}, { framework: 'react', bundler: 'vite' }), { viteConfig: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return Object.assign(Object.assign({}, basePresetSettings), { specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}', devServer: Object.assign(Object.assign({}, { framework: 'react', bundler: 'vite' }), { viteConfig: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     const viteConfigPath = findViteConfig(normalizedProjectRootPath);
-                    const { mergeConfig, loadConfigFromFile, searchForWorkspaceRoot } = (yield Promise.resolve().then(() => require('vite')));
+                    const { mergeConfig, loadConfigFromFile, searchForWorkspaceRoot } = yield Promise.resolve().then(() => require('vite'));
                     const resolved = yield loadConfigFromFile({
                         mode: 'watch',
                         command: 'serve',
@@ -78,7 +81,7 @@ function nxComponentTestingPreset(pathToConfig, options) {
             compiler: 'babel',
         });
     }
-    return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}', devServer: Object.assign(Object.assign({}, { framework: 'react', bundler: 'webpack' }), { webpackConfig }) });
+    return Object.assign(Object.assign({}, basePresetSettings), { specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}', devServer: Object.assign(Object.assign({}, { framework: 'react', bundler: 'webpack' }), { webpackConfig }) });
 }
 exports.nxComponentTestingPreset = nxComponentTestingPreset;
 /**
@@ -131,7 +134,11 @@ function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
     return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
         customWebpack = yield customWebpack;
         // TODO(jack): Once webpackConfig is always set in @nx/webpack:webpack, we no longer need this default.
-        const defaultWebpack = getWebpackConfig(context, Object.assign(Object.assign({}, options), { root: devkit_1.workspaceRoot, projectRoot: ctProjectConfig.root, sourceRoot: ctProjectConfig.sourceRoot }));
+        const defaultWebpack = getWebpackConfig(context, Object.assign(Object.assign({}, options), { 
+            // cypress will generate its own index.html from component-index.html
+            generateIndexHtml: false, 
+            // causes issues with buildable libraries with ENOENT: no such file or directory, scandir error
+            extractLicenses: false, root: devkit_1.workspaceRoot, projectRoot: ctProjectConfig.root, sourceRoot: ctProjectConfig.sourceRoot }));
         if (customWebpack) {
             return yield customWebpack(defaultWebpack, {
                 options,

package/src/generators/setup-ssr/setup-ssr.js

@@ -60,6 +60,7 @@ function setupSsrGenerator(tree, options) {
                     target: 'node',
                     main: `${projectRoot}/server.ts`,
                     outputPath: (0, devkit_1.joinPathFragments)(originalOutputPath, 'server'),
+                    outputFileName: 'server.js',
                     tsConfig: `${projectRoot}/tsconfig.server.json`,
                     compiler: 'babel',
                     externalDependencies: 'all',

package/src/utils/ast-utils.d.ts

@@ -9,7 +9,7 @@ export declare function findDefaultExportIdentifier(source: ts.SourceFile): ts.I
 export declare function findDefaultClassOrFunction(source: ts.SourceFile | null): ts.FunctionDeclaration | ts.ClassDeclaration | null;
 export declare function findComponentImportPath(componentName: string, source: ts.SourceFile): string;
 export declare function findElements(source: ts.SourceFile, tagName: string): ts.Node[];
-export declare function findClosestOpening(tagName: string, node: ts.Node): any;
+export declare function findClosestOpening(tagName: string, node: ts.Node): ts.Node;
 export declare function isTag(tagName: string, node: ts.Node): boolean;
 export declare function addInitialRoutes(sourcePath: string, source: ts.SourceFile): StringChange[];
 export declare function addRoute(sourcePath: string, source: ts.SourceFile, options: {