Merge pull request #246 from Comandeer/t/228

Closes #228

CHANGELOG.md

@@ -6,10 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## [0.18.0]
+## [0.18.0] – 2023-02-05
 ### Changed
 * [#209]: **BREAKING CHANGE**: parsing the project's `package.json` is no longer blocking as all file operations were rewritten to be asynchronous.
 
+### Removed
+* [#228]: **BREAKING CHANGE**: support for non-`exports` entrypoints.
+
 ### Fixed
 * [#240]: bundling types incorrectly removes bundled types definitions right after creating them.
 * [#242]: bundling of types creates incorrect file structure in `dist/` if source files are inside subdirectories.
@@ -234,6 +237,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [#220]: https://github.com/Comandeer/rollup-lib-bundler/issues/220
 [#222]: https://github.com/Comandeer/rollup-lib-bundler/issues/222
 [#225]: https://github.com/Comandeer/rollup-lib-bundler/issues/225
+[#228]: https://github.com/Comandeer/rollup-lib-bundler/issues/228
 [#240]: https://github.com/Comandeer/rollup-lib-bundler/issues/240
 [#242]: https://github.com/Comandeer/rollup-lib-bundler/issues/242
 

README.md

@@ -29,8 +29,8 @@ No configuration. Consider it a feature.
 It gets `package.json` from the current working directory, parses it and get neeeded info:
 
 * `name`, `author`, `version` and `license` to create beautiful banner comment,
-* `exports.import`, `module` or `jsnext:main` for saving ESM bundle,
-* `exports.require` or `main` to get path for saving CJS bundle (optional).
+* `exports.import` for saving ESM bundle,
+* `exports.require` to get path for saving CJS bundle (optional).
 
 Then the bundling happens. The default entry point for Rollup is `src/index.js`. Please note that **`dist/` directory is purged before bundling**! So if anything should be there alongside the bundle, it should be added there _after_ the bundling.
 

src/packageParser.js

@@ -38,82 +38,29 @@ async function loadAndParsePackageJSONFile( dirPath ) {
 }
 
 function lintObject( obj ) {
-	checkProperty( 'name' );
-	checkProperty( 'version' );
-	checkProperties( 'exports/./import', 'exports/import', 'module', 'jsnext:main' );
-	checkProperty( 'author' );
-	checkProperty( 'license' );
-
-	function checkProperty( name ) {
-		if ( typeof obj[ name ] === 'undefined' ) {
-			throw new ReferenceError( `Package metadata must contain "${ name }" property.` );
-		}
+	if ( typeof obj.name === 'undefined' ) {
+		throw new ReferenceError( 'Package metadata must contain "name" property.' );
 	}
 
-	function checkProperties( ...properties ) {
-		const isAtLeastOnePresent = properties.some( ( property ) => {
-			const propertyPath = property.split( '/' );
-
-			return checkPropertyExistence( obj, propertyPath );
-		} );
-
-		if ( !isAtLeastOnePresent ) {
-			throw new ReferenceError( `Package metadata must contain one of ${ prepareNamesForError( properties ) } properties or all of them.` );
-		}
+	if ( typeof obj.version === 'undefined' ) {
+		throw new ReferenceError( 'Package metadata must contain "version" property.' );
 	}
 
-	function checkPropertyExistence( obj, propertyPath ) {
-		const currentProperty = propertyPath.shift();
-
-		if ( typeof obj[ currentProperty ] === 'undefined' ) {
-			return false;
-		}
-
-		if ( propertyPath.length === 0 ) {
-			return true;
-		}
+	const isESMEntryPointPresent = typeof obj.exports?.import !== 'undefined' ||
+		typeof obj.exports?.[ '.' ]?.import !== 'undefined';
 
-		return checkPropertyExistence( obj[ currentProperty ], propertyPath );
+	if ( !isESMEntryPointPresent ) {
+		throw new ReferenceError(
+			'Package metadata must contain one of "exports[ \'.\' ].import" or "exports.import" properties or all of them.'
+		);
 	}
 
-	function prepareNamesForError( names ) {
-		return names.map( ( name, i ) => {
-			const formattedName = formatName( name );
-			const quotedName = `"${ formattedName }"`;
-
-			if ( i === 0 ) {
-				return quotedName;
-			}
-
-			const conjuction = ( i === names.length - 1 ) ? ' or ' : ', ';
-
-			return `${ conjuction}${ quotedName }`;
-		} ).join( '' );
-
-		function formatName( name ) {
-			// Thanks to using capturing groups, the separator will be preserved
-			// in the splitted string.
-			const separatorRegex = /(\/)/g;
-			const nameParts = name.split( separatorRegex );
-
-			return nameParts.reduce( ( parts, part ) => {
-				const lastPart = parts[ parts.length - 1 ];
-
-				if ( part.startsWith( '.' ) && lastPart === '.' ) {
-					return [ ...parts.slice( 0, -1 ), '[ \'', part ];
-				}
-
-				if ( part === '/' && lastPart.startsWith( '.' ) ) {
-					return [ ...parts, '\' ].' ];
-				}
-
-				if ( part === '/' ) {
-					return [ ...parts, '.' ];
-				}
+	if ( typeof obj.author === 'undefined' ) {
+		throw new ReferenceError( 'Package metadata must contain "author" property.' );
+	}
 
-				return [ ...parts, part ];
-			}, [] ).join( '' );
-		}
+	if ( typeof obj.license === 'undefined' ) {
+		throw new ReferenceError( 'Package metadata must contain "license" property.' );
 	}
 }
 
@@ -150,12 +97,6 @@ async function prepareDistMetadata( packageDir, metadata ) {
 function getSubPaths( metadata ) {
 	const exports = metadata.exports;
 
-	if ( !exports ) {
-		return [
-			'.'
-		];
-	}
-
 	const subpaths = Object.keys( exports ).filter( ( subpath ) => {
 		return subpath.startsWith( '.' );
 	} );
@@ -246,38 +187,22 @@ function getEntryPointType( srcPath ) {
 function getESMTarget( metadata, subPath ) {
 	const exportsTarget = getExportsTarget( metadata, subPath, 'import' );
 
-	if ( subPath === '.' ) {
-		return exportsTarget || metadata.module || metadata[ 'jsnext:main' ];
-	}
-
 	return exportsTarget;
 }
 
 function getCJSTarget( metadata, subPath ) {
 	const exportsTarget = getExportsTarget( metadata, subPath, 'require' );
 
-	if ( subPath === '.' ) {
-		return exportsTarget || metadata.main;
-	}
-
 	return exportsTarget;
 }
 
 function getTypesTarget( metadata, subPath ) {
 	const exportsTarget = getExportsTarget( metadata, subPath, 'types' );
 
-	if ( subPath === '.' ) {
-		return exportsTarget || metadata.types;
-	}
-
 	return exportsTarget;
 }
 
 function getExportsTarget( metadata, subPath, type ) {
-	if ( !metadata.exports ) {
-		return null;
-	}
-
 	const exports = metadata.exports;
 
 	if ( exports[ subPath ] ) {

tests/__fixtures__/dynamicExternalImport/package.json

@@ -3,8 +3,12 @@
   "private": true,
   "version": "1.0.0",
   "description": "Test package",
-  "main": "dist/es5.js",
-  "module": "dist/es2015.js",
+  "exports": {
+    ".": {
+      "import": "./dist/es2015.js",
+      "require": "./dist/es5.js"
+    }
+  },
   "author": "Comandeer",
   "license": "ISC"
 }

tests/__fixtures__/errorPackage/package.json

@@ -3,8 +3,12 @@
   "private": true,
   "version": "1.0.0",
   "description": "Test package",
-  "main": "dist/es5.js",
-  "module": "dist/es2015.js",
+  "exports": {
+    ".": {
+      "import": "./dist/es2015.js",
+      "require": "./dist/es5.js"
+    }
+  },
   "author": "Comandeer",
   "license": "ISC"
 }

tests/__fixtures__/externalDepPackage/package.json

@@ -3,8 +3,12 @@
   "private": true,
   "version": "1.0.0",
   "description": "Test package",
-  "main": "dist/es5.js",
-  "module": "dist/es2015.js",
+  "exports": {
+    ".": {
+      "import": "./dist/es2015.js",
+      "require": "./dist/es5.js"
+    }
+  },
   "author": "Comandeer",
   "license": "ISC"
 }

tests/__fixtures__/jsonPackage/package.json

@@ -3,8 +3,12 @@
   "private": true,
   "version": "1.0.0",
   "description": "Test package",
-  "main": "dist/es5.js",
-  "module": "dist/es2015.js",
+  "exports": {
+    ".": {
+      "import": "./dist/es2015.js",
+      "require": "./dist/es5.js"
+    }
+  },
   "author": {
     "name": "Piotr Kowalski",
     "email": "piecioshka@gmail.com",

tests/__fixtures__/testPackage/package.json

@@ -3,8 +3,12 @@
   "private": true,
   "version": "1.0.0",
   "description": "Test package",
-  "main": "dist/es5.js",
-  "module": "dist/es2015.js",
+  "exports": {
+    ".": {
+      "import": "./dist/es2015.js",
+      "require": "./dist/es5.js"
+    }
+  },
   "author": "Comandeer",
   "license": "ISC"
 }