@common-stack/rollup-vite-utils 4.0.1-alpha.52 → 4.0.1-alpha.54

package/lib/rollup/rollupPluginAddJsExtension.d.ts

@@ -1,9 +1,13 @@
-import { Plugin } from 'rollup';
 interface AddJsExtensionOptions {
-    include?: string | string[];
-    exclude?: string | string[];
     packages: string[] | '*';
     needToAddIndexJs: string[];
+    excludeImports?: string[];
 }
-declare const addJsExtensionToImportsPlugin: (options: AddJsExtensionOptions) => Plugin;
+declare const addJsExtensionToImportsPlugin: (options: AddJsExtensionOptions) => {
+    name: string;
+    transform(code: string, id: string): {
+        code: any;
+        map: any;
+    };
+};
 export default addJsExtensionToImportsPlugin;

package/lib/rollup/rollupPluginAddJsExtension.js

@@ -1,48 +1,69 @@
-import {createFilter}from'@rollup/pluginutils';const addJsExtensionToImportsPlugin = (options) => {
-    const filter = createFilter(options.include, options.exclude, { resolve: false });
+import {parse}from'@babel/parser';import generateSource from'@babel/generator';import traverseSource from'@babel/traverse';// to support esm default
+// https://github.com/babel/babel/issues/15269#issuecomment-1505804243
+const traverse = traverseSource.default ?? traverseSource;
+const generate = generateSource.default ?? generateSource;
+const nonJsExtensions = ['.css', '.scss', '.less', '.svg', '.png', '.jpg', '.jpeg', '.gif', '.json'];
+const addJsExtensionToImportsPlugin = (options) => {
     // Add known packages that need `/index.js` if they are not already included
     const knownNeedToAddIndexJs = ['@apollo/client'];
     const needToAddIndexJs = Array.from(new Set([...options.needToAddIndexJs, ...knownNeedToAddIndexJs]));
     return {
-        name: 'rollup-plugin-add-js-extension',
+        name: 'add-js-extension-to-imports',
         transform(code, id) {
-            if (!filter(id))
+            // Only apply the transformation to .ts, .tsx, .js, and .jsx files
+            if (!/\.(tsx?|jsx?)$/.test(id))
                 return null;
-            const packageNameRegex = (importPath) => {
-                if (importPath.startsWith('@')) {
-                    // Scoped package
-                    const match = importPath.match(/^(@[^/]+\/[^/]+)/);
-                    return match ? match[1] : null;
-                }
-                else {
-                    // Normal package
-                    const match = importPath.match(/^([^/]+)/);
-                    return match ? match[1] : null;
-                }
-            };
-            const transformedCode = code.replace(/import\s+(['"])([^'"]+)\1/g, (match, quote, importPath) => {
-                const packageName = packageNameRegex(importPath);
-                !importPath.startsWith('@');
-                const isInExceptionList = packageName && needToAddIndexJs.includes(packageName);
-                const isModularPackage = importPath.startsWith('@');
-                const hasAdditionalSlashes = isModularPackage && importPath.split('/').length > 2;
-                const shouldTransform = (options.packages === '*' && importPath.includes('/') && !isModularPackage) ||
-                    (options.packages === '*' && isModularPackage && hasAdditionalSlashes) ||
-                    (isModularPackage && isInExceptionList) ||
-                    (packageName && options.packages.includes(packageName));
-                if (shouldTransform && !importPath.endsWith('.js')) {
-                    if (isInExceptionList) {
-                        return `import ${quote}${importPath}/index.js${quote}`;
-                    }
-                    else {
-                        return `import ${quote}${importPath}.js${quote}`;
+            const ast = parse(code, {
+                sourceType: 'module',
+                plugins: ['typescript', 'jsx'], // Adjusted to 'typescript' for .tsx files
+            });
+            traverse(ast, {
+                ImportDeclaration(path) {
+                    const source = path.node.source.value;
+                    // Ignore paths that start with './', '../', end with non-JS extensions, or are in excluded imports
+                    if (source.startsWith('./') ||
+                        source.startsWith('../') ||
+                        nonJsExtensions.some(ext => source.endsWith(ext)) ||
+                        (options.excludeImports && options.excludeImports.includes(source)))
+                        return;
+                    // Function to extract package name from the import source
+                    const getPackageName = (importPath) => {
+                        if (importPath.startsWith('@')) {
+                            // Scoped package
+                            const match = importPath.match(/^(@[^/]+\/[^/]+)/);
+                            return match ? match[1] : null;
+                        }
+                        else {
+                            // Normal package
+                            const match = importPath.match(/^([^/]+)/);
+                            return match ? match[1] : null;
+                        }
+                    };
+                    const packageName = getPackageName(source);
+                    // Determine if we should transform the import based on the package patterns
+                    !source.startsWith('@');
+                    const isInExceptionList = packageName && needToAddIndexJs.includes(packageName);
+                    const isModularPackage = source.startsWith('@');
+                    const hasAdditionalSlashes = isModularPackage && source.split('/').length > 2;
+                    const shouldTransform = (options.packages === '*' && source.includes('/') && !isModularPackage) ||
+                        (options.packages === '*' && isModularPackage && hasAdditionalSlashes) ||
+                        (isModularPackage && isInExceptionList) ||
+                        (packageName && options.packages.includes(packageName));
+                    // Append ".js" or "/index.js" to imports if they match the criteria and don't already end with ".js"
+                    if (shouldTransform && !source.endsWith('.js')) {
+                        if (isInExceptionList) {
+                            path.node.source.value = `${source}/index.js`;
+                        }
+                        else {
+                            path.node.source.value = `${source}.js`;
+                        }
                     }
-                }
-                return match;
+                },
             });
+            const output = generate(ast, {}, code);
             return {
-                code: transformedCode,
-                map: null,
+                code: output.code,
+                map: output.map,
             };
         },
     };

package/lib/rollup/rollupPluginAddJsExtension.js.map

@@ -1 +1 @@
-{"version":3,"file":"rollupPluginAddJsExtension.js","sources":["../../src/rollup/rollupPluginAddJsExtension.ts"],"sourcesContent":[null],"names":[],"mappings":"+CAUA,MAAM,6BAA6B,GAAG,CAAC,OAA8B,KAAY;AAC7E,IAAA,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;;AAGlF,IAAA,MAAM,qBAAqB,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACjD,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,gBAAgB,EAAE,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAEtG,OAAO;AACH,QAAA,IAAI,EAAE,gCAAgC;QACtC,SAAS,CAAC,IAAY,EAAE,EAAU,EAAA;AAC9B,YAAA,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;AAAE,gBAAA,OAAO,IAAI,CAAC;AAE7B,YAAA,MAAM,gBAAgB,GAAG,CAAC,UAAkB,KAAmB;AAC3D,gBAAA,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;;oBAE5B,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;AACnD,oBAAA,OAAO,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;iBAClC;qBAAM;;oBAEH,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;AAC3C,oBAAA,OAAO,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;iBAClC;AACL,aAAC,CAAC;AAEF,YAAA,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,4BAA4B,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,KAAI;AAC5F,gBAAA,MAAM,WAAW,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;gBAEzB,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,EAAE;gBACpD,MAAM,iBAAiB,GAAG,WAAW,IAAI,gBAAgB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAChF,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AACpD,gBAAA,MAAM,oBAAoB,GAAG,gBAAgB,IAAI,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAElF,gBAAA,MAAM,eAAe,GACjB,CAAC,OAAO,CAAC,QAAQ,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB;qBACzE,OAAO,CAAC,QAAQ,KAAK,GAAG,IAAI,gBAAgB,IAAI,oBAAoB,CAAC;qBACrE,gBAAgB,IAAI,iBAAiB,CAAC;qBACtC,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;gBAE5D,IAAI,eAAe,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBAChD,IAAI,iBAAiB,EAAE;AACnB,wBAAA,OAAO,UAAU,KAAK,CAAA,EAAG,UAAU,CAAY,SAAA,EAAA,KAAK,EAAE,CAAC;qBAC1D;yBAAM;AACH,wBAAA,OAAO,UAAU,KAAK,CAAA,EAAG,UAAU,CAAM,GAAA,EAAA,KAAK,EAAE,CAAC;qBACpD;iBACJ;AAED,gBAAA,OAAO,KAAK,CAAC;AACjB,aAAC,CAAC,CAAC;YAEH,OAAO;AACH,gBAAA,IAAI,EAAE,eAAe;AACrB,gBAAA,GAAG,EAAE,IAAI;aACZ,CAAC;SACL;KACJ,CAAC;AACN"}
+{"version":3,"file":"rollupPluginAddJsExtension.js","sources":["../../src/rollup/rollupPluginAddJsExtension.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/rollup-vite-utils",
-    "version": "4.0.1-alpha.52",
+    "version": "4.0.1-alpha.54",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -54,5 +54,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "14099d8395f365c088145a6834371efc6b28ce15"
+    "gitHead": "d50ab31d309df1e0eec3ea8ff07d2eeb566f0744"
 }