Merge branch 'master' into nx-dev/webinar-banner

nrwl · Apr 15, 2024 · 9cf4b0d · 9cf4b0d
2 parents 0e19447 + 5429ba4
commit 9cf4b0d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/e2e/remix/tests/nx-remix.test.ts b/e2e/remix/tests/nx-remix.test.ts
@@ -118,12 +118,12 @@ describe('Remix E2E Tests', () => {
       it('should check for un-escaped dollar signs in routes', async () => {
         await expect(async () =>
           runCLI(
-            `generate @nx/remix:route --project ${plugin} --path my.route.$withParams.tsx`
+            `generate @nx/remix:route --project ${plugin} --path="my.route.$withParams.tsx"`
           )
         ).rejects.toThrow();
 
         runCLI(
-          `generate @nx/remix:route --project ${plugin} --path my.route.\\$withParams.tsx`
+          `generate @nx/remix:route --project ${plugin} --path="my.route.\\$withParams.tsx"`
         );
 
         expect(() =>
@@ -133,7 +133,7 @@ describe('Remix E2E Tests', () => {
 
       it('should pass un-escaped dollar signs in routes with skipChecks flag', async () => {
         await runCommandAsync(
-          `someWeirdUseCase=route-segment && yarn nx generate @nx/remix:route --project ${plugin} --path my.route.$someWeirdUseCase.tsx --force`
+          `someWeirdUseCase=route-segment && yarn nx generate @nx/remix:route --project ${plugin} --path="my.route.$someWeirdUseCase.tsx" --force`
         );
 
         expect(() =>
@@ -146,12 +146,12 @@ describe('Remix E2E Tests', () => {
       it('should check for un-escaped dollar signs in resource routes', async () => {
         await expect(async () =>
           runCLI(
-            `generate @nx/remix:resource-route --project ${plugin} --path my.route.$withParams.ts`
+            `generate @nx/remix:resource-route --project ${plugin} --path="my.route.$withParams.ts"`
           )
         ).rejects.toThrow();
 
         runCLI(
-          `generate @nx/remix:resource-route --project ${plugin} --path my.route.\\$withParams.ts`
+          `generate @nx/remix:resource-route --project ${plugin} --path="my.route.\\$withParams.ts"`
         );
 
         expect(() =>
@@ -161,7 +161,7 @@ describe('Remix E2E Tests', () => {
 
       xit('should pass un-escaped dollar signs in resource routes with skipChecks flag', async () => {
         await runCommandAsync(
-          `someWeirdUseCase=route-segment && yarn nx generate @nx/remix:resource-route --project ${plugin} --path my.route.$someWeirdUseCase.ts --force`
+          `someWeirdUseCase=route-segment && yarn nx generate @nx/remix:resource-route --project ${plugin} --path="my.route.$someWeirdUseCase.ts" --force`
         );
 
         expect(() =>

diff --git a/nx-dev/ui-home/src/lib/hero.tsx b/nx-dev/ui-home/src/lib/hero.tsx
@@ -147,7 +147,7 @@ export function Hero(): JSX.Element {
             </ButtonLink>
 
             <ButtonLink
-              href="https://nx.app/enterprise?utm_source=nx.dev&utm_medium=hero"
+              href="/contact"
               variant="secondary"
               size="large"
               title="Contact us"

diff --git a/packages/js/src/generators/library/library.spec.ts b/packages/js/src/generators/library/library.spec.ts
@@ -44,7 +44,6 @@ describe('lib', () => {
         name: '@proj/my-lib',
         private: true,
         version: '0.0.1',
-        type: 'commonjs',
         scripts: {
           build: "echo 'implement build'",
           test: "echo 'implement test'",
@@ -977,6 +976,9 @@ describe('lib', () => {
         expect(config.targets.build.options.project).toEqual(
           `my-lib/package.json`
         );
+
+        const pkgJson = readJson(tree, 'my-lib/package.json');
+        expect(pkgJson.type).not.toBeDefined();
       });
 
       it('should always set compiler to swc if bundler is rollup', async () => {

diff --git a/packages/js/src/generators/library/library.ts b/packages/js/src/generators/library/library.ts
@@ -869,10 +869,10 @@ function determineEntryFields(
       };
     case 'rollup':
       return {
-        type: 'commonjs',
+        // Since we're publishing both formats, skip the type field.
+        // Bundlers or Node will determine the entry point to use.
         main: './index.cjs',
         module: './index.js',
-        // typings is missing for rollup currently
       };
     case 'vite':
       return {
@@ -891,9 +891,9 @@ function determineEntryFields(
       };
     default: {
       return {
-        // CJS is the safest optional for now due to lack of support from some packages
-        // also setting `type: module` results in different resolution behavior (e.g. import 'foo' no longer resolves to 'foo/index.js')
-        type: 'commonjs',
+        // Safest option is to not set a type field.
+        // Allow the user to decide which module format their library is using
+        type: undefined,
       };
     }
   }

diff --git a/packages/rollup/src/executors/rollup/lib/update-package-json.ts b/packages/rollup/src/executors/rollup/lib/update-package-json.ts
@@ -52,7 +52,7 @@ export function updatePackageJson(
 
     packageJson.main = cjsExports['.'];
 
-    if (!hasEsmFormat) {
+    if (!hasEsmFormat && !options.skipTypeField) {
       packageJson.type = 'commonjs';
     }