fix: improve astro compatibilty

package.json

@@ -26,8 +26,8 @@
     ".": {
       "types": "./dist/index.d.ts",
       "source": "./src/node/index.ts",
-      "require": "./dist/index.cjs",
       "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
       "default": "./dist/index.js"
     },
     "./package.json": "./package.json"

playground/babel-plugin/package.json

@@ -8,8 +8,8 @@
     ".": {
       "types": "./dist/index.d.ts",
       "source": "./src/index.ts",
-      "require": "./dist/index.cjs",
       "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
       "default": "./dist/index.js"
     },
     "./package.json": "./package.json"

playground/custom-dist/package.json

@@ -8,8 +8,8 @@
     ".": {
       "types": "./lib/src/index.d.ts",
       "source": "./src/index.ts",
-      "require": "./lib/index.cjs",
       "import": "./lib/index.js",
+      "require": "./lib/index.cjs",
       "default": "./lib/index.js"
     },
     "./package.json": "./package.json"

playground/default-export/package.json

@@ -7,6 +7,7 @@
   "exports": {
     ".": {
       "source": "./src/index.js",
+      "module": "./dist/index.js",
       "require": "./dist/index.cjs",
       "node": {
         "import": "./dist/index.cjs.js"

playground/dummy-commonjs/package.json

@@ -14,11 +14,11 @@
         "import": "./dist/index.browser.mjs"
       },
       "module": "./dist/index.mjs",
-      "require": "./dist/index.js",
       "node": {
         "import": "./node/index.mjs",
         "require": "./node/index.js"
       },
+      "require": "./dist/index.js",
       "import": "./dist/index.mjs",
       "default": "./dist/index.mjs"
     },

playground/dummy-module/package.json

@@ -14,6 +14,7 @@
         "import": "./dist/index.browser.js"
       },
       "require": "./dist/index.cjs",
+      "module": "./dist/index.js",
       "node": {
         "import": "./node/index.js",
         "require": "./node/index.cjs"
@@ -30,6 +31,7 @@
         "import": "./dist/extra.browser.js"
       },
       "require": "./dist/extra.cjs",
+      "module": "./dist/extra.js",
       "node": {
         "import": "./node/extra.js",
         "require": "./node/extra.cjs"

src/node/core/pkg/loadPkgWithReporting.ts

@@ -15,6 +15,7 @@ export async function loadPkgWithReporting(options: {
 
   try {
     const pkg = await loadPkg({cwd})
+    let shouldError = false
 
     // validate exports
     if (pkg.exports) {
@@ -28,33 +29,73 @@ export async function loadPkgWithReporting(options: {
         const keys = Object.keys(exp)
 
         if (!assertFirst('types', keys)) {
-          logger.warn(`exports["${expPath}"]: the \`types\` property should be the first property`)
+          shouldError = true
+          logger.error(`exports["${expPath}"]: the \`types\` property should be the first property`)
         }
 
-        if (!assertOrder('require', 'import', keys)) {
+        if (!exp.node && !assertOrder('import', 'require', keys)) {
           logger.warn(
-            `exports["${expPath}"]: the \`require\` property should come before the \`import\` property`,
+            `exports["${expPath}"]: the \`import\` property should come before the \`require\` property`,
           )
         }
 
-        if (!assertOrder('require', 'node', keys)) {
-          logger.warn(
-            `exports["${expPath}"]: the \`require\` property should come before the \`node\` property`,
+        if(exp.require && exp.node?.require && exp.require === exp.node.require) {
+          shouldError = true
+          logger.error(`exports["${expPath}"]: the \`node.require\` property isn't necessary as it's identical to \`require\``)
+        }
+
+        if (exp.require && exp.node?.require && !assertOrder('node', 'require', keys)) {
+          shouldError = true
+          logger.error(
+            `exports["${expPath}"]: the \`node\` property should come before the \`require\` property`,
           )
         }
 
         if (!assertOrder('node', 'import', keys)) {
-          logger.warn(
+          shouldError = true
+          logger.error(
             `exports["${expPath}"]: the \`node\` property should come before \`import\` property`,
           )
         }
 
+        if (!assertOrder('module', 'require', keys)) {
+          logger.warn(
+            `exports["${expPath}"]: the \`module\` property should come before \`require\` property`,
+          )
+        }
+
+        if(exp.node?.import && exp.import && !exp.module) {
+          shouldError = true
+          logger.error(
+            `exports["${expPath}"]: the \`module\` property should be added so bundlers don't unintentionally try to bundle \`node.import\``,
+          )
+        }
+
+        if (!assertOrder('module', 'node', keys)) {
+          shouldError = true
+          logger.error(
+            `exports["${expPath}"]: the \`module\` property should come before \`node\` property`,
+          )
+        }
+
+        if(exp.module && exp.import && exp.node?.import && exp.module !== exp.import) {
+          shouldError = true
+          logger.error(`exports["${expPath}"]: the \`module\` property shouold be identical to \`import\``)
+        }
+
         if (!assertLast('default', keys)) {
-          logger.warn(`exports["${expPath}"]: the \`default\` property should be the last property`)
+          shouldError = true
+          logger.error(
+            `exports["${expPath}"]: the \`default\` property should be the last property`,
+          )
         }
       }
     }
 
+    if(shouldError) {
+      process.exit(1)
+    }
+
     return pkg
   } catch (err) {
     if (err instanceof ZodError) {

src/node/core/pkg/types.ts

@@ -19,13 +19,14 @@ export interface PackageJSON {
         types?: string
         browser?: {
           source: string
-          require?: string
           import?: string
+          require?: string
         }
+        module?: string
         node?: {
           source?: string
-          require?: string
           import?: string
+          require?: string
         }
         import?: string
         require?: string

src/node/core/pkg/validatePkg.ts

@@ -1,6 +1,7 @@
 import {z} from 'zod'
 
 import {PackageJSON} from './types'
+import { assertFirst } from './helpers';
 
 const pkgSchema = z.object({
   type: z.optional(z.enum(['commonjs', 'module'])),
@@ -23,23 +24,50 @@ const pkgSchema = z.object({
         z.object({
           types: z.optional(z.string()),
           source: z.string(),
-          require: z.optional(z.string()),
           browser: z.optional(
             z.object({
               source: z.string(),
-              require: z.optional(z.string()),
               import: z.optional(z.string()),
+              require: z.optional(z.string()),
             }),
           ),
+          module: z.optional(z.string()),
           node: z.optional(
             z.object({
               source: z.optional(z.string()),
-              require: z.optional(z.string()),
               import: z.optional(z.string()),
+              require: z.optional(z.string()),
             }),
           ),
           import: z.optional(z.string()),
+          require: z.optional(z.string()),
           default: z.string(),
+        }).superRefine((val, ctx) => {
+          const keys = Object.keys(val)
+
+          if (!assertFirst('types', keys)) {
+            ctx.addIssue({
+                  code: z.ZodIssueCode.custom,
+                  message:`the \`types\` property should be the first property`,
+                });
+          }
+
+          // if (val.length > 3) {
+          //   ctx.addIssue({
+          //     code: z.ZodIssueCode.too_big,
+          //     maximum: 3,
+          //     type: "array",
+          //     inclusive: true,
+          //     message: "Too many items 😡",
+          //   });
+          // }
+
+          // if (val.length !== new Set(val).size) {
+          //   ctx.addIssue({
+          //     code: z.ZodIssueCode.custom,
+          //     message: `No duplicates allowed.`,
+          //   });
+          // }
         }),
       ]),
     ),