python-package-folder 4.3.2__tar.gz → 4.3.4__tar.gz

{python_package_folder-4.3.2 → python_package_folder-4.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-package-folder
-Version: 4.3.2
+Version: 4.3.4
 Summary: Python package to automatically package and build a folder, fetching all relevant dependencies.
 Project-URL: Repository, https://github.com/alelom/python-package-folder
 Author-email: Alessio Lombardi <work@alelom.com>

{python_package_folder-4.3.2 → python_package_folder-4.3.4}/pyproject.toml

@@ -42,7 +42,7 @@ dependencies = [
 
 # ---- Dev dependencies ----
 
-version = "4.3.2"
+version = "4.3.4"
 [dependency-groups]
 dev = [
     "pytest>=8.3.5",

{python_package_folder-4.3.2 → python_package_folder-4.3.4}/python_package_folder/scripts/get-next-version.cjs

@@ -378,20 +378,32 @@ function getGlobalNpmPaths() {
     let semanticRelease;
     try {
       const semanticReleasePath = require.resolve('semantic-release', { paths: resolvePaths });
-      semanticRelease = require(semanticReleasePath);
+      const semanticReleaseModule = require(semanticReleasePath);
+      // Handle both CommonJS and ES module exports
+      semanticRelease = typeof semanticReleaseModule === 'function' 
+        ? semanticReleaseModule 
+        : semanticReleaseModule.default || semanticReleaseModule;
     } catch (resolveError) {
       try {
         // Try with just global paths
         if (globalNpmPaths.length > 0) {
           const semanticReleasePath = require.resolve('semantic-release', { paths: globalNpmPaths });
-          semanticRelease = require(semanticReleasePath);
+          const semanticReleaseModule = require(semanticReleasePath);
+          // Handle both CommonJS and ES module exports
+          semanticRelease = typeof semanticReleaseModule === 'function' 
+            ? semanticReleaseModule 
+            : semanticReleaseModule.default || semanticReleaseModule;
         } else {
           throw resolveError;
         }
       } catch (globalError) {
         try {
           // Final fallback: default require (should work if in NODE_PATH or default locations)
-          semanticRelease = require('semantic-release');
+          const semanticReleaseModule = require('semantic-release');
+          // Handle both CommonJS and ES module exports
+          semanticRelease = typeof semanticReleaseModule === 'function' 
+            ? semanticReleaseModule 
+            : semanticReleaseModule.default || semanticReleaseModule;
         } catch (e) {
           console.error('Error: semantic-release is not installed.');
           console.error('Please install it with: npm install -g semantic-release');
@@ -404,48 +416,21 @@ function getGlobalNpmPaths() {
         }
       }
     }
-
-    // For subfolder builds, require semantic-release-commit-filter
-    // (required only to verify it's installed; the plugin is used via options.plugins)
-    if (isSubfolderBuild) {
-      let commitFilterFound = false;
-      let lastError = null;
-      
-      // Try resolving from all paths
-      for (const tryPath of resolvePaths) {
-        try {
-          const commitFilterPath = require.resolve('semantic-release-commit-filter', { paths: [tryPath] });
-          require(commitFilterPath);
-          commitFilterFound = true;
-          break;
-        } catch (e) {
-          lastError = e;
-          continue;
-        }
-      }
-      
-      // If not found in any path, try default require
-      if (!commitFilterFound) {
-        try {
-          require('semantic-release-commit-filter');
-          commitFilterFound = true;
-        } catch (e) {
-          lastError = e;
-        }
-      }
-      
-      if (!commitFilterFound) {
-        console.error('Error: semantic-release-commit-filter is not installed.');
-        console.error('Please install it with: npm install -g semantic-release-commit-filter');
-        console.error('Or install it as a devDependency: npm install --save-dev semantic-release-commit-filter');
-        console.error(`Debug: Tried resolving from paths: ${resolvePaths.join(', ')}`);
-        if (lastError) {
-          console.error(`Debug: Last error: ${lastError.message}`);
-        }
-        process.exit(1);
+    
+    // Verify semanticRelease is a function
+    if (typeof semanticRelease !== 'function') {
+      console.error('Error: semantic-release module is not a function.');
+      console.error(`Debug: semanticRelease type: ${typeof semanticRelease}`);
+      if (semanticRelease && typeof semanticRelease === 'object') {
+        console.error(`Debug: semanticRelease keys: ${Object.keys(semanticRelease).join(', ')}`);
       }
+      process.exit(1);
     }
 
+    // For subfolder builds, semantic-release-commit-filter will be loaded by semantic-release
+    // We don't need to check for it upfront - semantic-release handles plugin resolution
+    // and will provide clear error messages if the plugin is missing
+
   // Query registry for latest version if repository info is provided
   let registryVersion = null;
   if (repository && packageName) {