From b46927e510d93bc5020cad18240f63b05d4c8b0b Mon Sep 17 00:00:00 2001 From: Eric Fennis Date: Wed, 19 Feb 2025 11:33:08 +0100 Subject: [PATCH] fix(lucide-react): Revert exports property package.json, fixing edge worker environments. (#2814) * Revert exports prop * Adjust export * Adjust export path * Add to gitignore * Adjust build process * Update .gitignore and add dynamicIconImports module * Formatting --- .gitignore | 6 ++ packages/lucide-react/dynamicIconImports.mjs | 1 + packages/lucide-react/package.json | 62 +++++--------------- packages/lucide-react/rollup.config.mjs | 44 ++++---------- 4 files changed, 35 insertions(+), 78 deletions(-) create mode 100644 packages/lucide-react/dynamicIconImports.mjs diff --git a/.gitignore b/.gitignore index 733b45c18..e2098e23e 100644 --- a/.gitignore +++ b/.gitignore @@ -20,9 +20,13 @@ packages/**/src/aliases/*.ts packages/**/src/aliases.ts !packages/**/src/aliases/index.ts packages/**/src/dynamicIconImports.ts +packages/**/DynamicIcon.d.ts packages/**/dynamicIconImports.js packages/**/dynamicIconImports.d.ts packages/**/dynamicIconImports.js.map +packages/**/dynamic.d.ts +packages/**/dynamic.mjs.map +packages/**/dynamic.mjs packages/**/LICENSE categories.json tags.json @@ -41,3 +45,5 @@ docs/.vitepress/data/iconDetails docs/.vitepress/data/relatedIcons.json docs/.vercel docs/.nitro +.gitignore + diff --git a/packages/lucide-react/dynamicIconImports.mjs b/packages/lucide-react/dynamicIconImports.mjs new file mode 100644 index 000000000..7a725d5b5 --- /dev/null +++ b/packages/lucide-react/dynamicIconImports.mjs @@ -0,0 +1 @@ +export { default } from './dist/esm/dynamicIconImports.js'; diff --git a/packages/lucide-react/package.json b/packages/lucide-react/package.json index 97d6cffd2..04848a118 100644 --- a/packages/lucide-react/package.json +++ b/packages/lucide-react/package.json @@ -23,57 +23,25 @@ ], "author": "Eric Fennis", "amdName": "lucide-react", - "source": "src/lucide-react.ts", - "main": "dist/esm/lucide-react.js", - "types": "dist/lucide-react.d.ts", - "type": "module", - "files": [ - "dist" - ], - "exports": { - ".": { - "types": "./dist/lucide-react.d.ts", - "import": "./dist/esm/lucide-react.js", - "browser": "./dist/esm/lucide-react.js", - "require": "./dist/cjs/lucide-react.js", - "node": "./dist/cjs/lucide-react.js" - }, - "./icons": { - "types": "./dist/lucide-react.d.ts", - "import": "./dist/esm/lucide-react.js", - "browser": "./dist/esm/lucide-react.js", - "require": "./dist/cjs/lucide-react.js", - "node": "./dist/cjs/lucide-react.js" - }, - "./icons/*": { - "types": "./dist/icons/*.d.ts", - "import": "./dist/esm/icons/*.js", - "browser": "./dist/esm/icons/*.js", - "require": "./dist/cjs/icons/*.js", - "node": "./dist/cjs/icons/*.js" - }, - "./dynamic": { - "types": "./dist/dynamic.d.ts", - "import": "./dist/esm/dynamic.js", - "browser": "./dist/esm/dynamic.js", - "require": "./dist/cjs/dynamic.js", - "node": "./dist/cjs/dynamic.js" - }, - "./dynamicIconImports": { - "types": "./dist/dynamicIconImports.d.ts", - "import": "./dist/esm/dynamicIconImports.js", - "browser": "./dist/esm/dynamicIconImports.js", - "require": "./dist/cjs/dynamicIconImports.js", - "node": "./dist/cjs/dynamicIconImports.js" - }, - "./src/*": "./src/*.ts", - "./package.json": "./package.json" - }, + "main": "dist/cjs/lucide-react.js", + "main:umd": "dist/umd/lucide-react.js", + "module": "dist/esm/lucide-react.js", + "unpkg": "dist/umd/lucide-react.min.js", + "typings": "dist/lucide-react.d.ts", "sideEffects": false, + "files": [ + "dist", + "dynamic.mjs", + "dynamic.js.map", + "dynamic.d.ts", + "dynamicIconImports.mjs", + "dynamicIconImports.js.map", + "dynamicIconImports.d.ts" + ], "scripts": { "build": "pnpm clean && pnpm copy:license && pnpm build:icons && pnpm typecheck && pnpm build:bundles", "copy:license": "cp ../../LICENSE ./LICENSE", - "clean": "rm -rf dist && rm -rf stats && rm -rf ./src/icons/*.ts && rm -f dynamicIconImports.*", + "clean": "rm -rf dist && rm -rf stats && rm -rf ./src/icons/*.ts && rm -f dynamic.* && rm -f dynamicIconImports.d.ts", "build:icons": "build-icons --output=./src --templateSrc=./scripts/exportTemplate.mjs --renderUniqueKey --withAliases --withDynamicImports --separateAliasesFile --aliasesFileExtension=.ts --iconFileExtension=.ts --exportFileName=index.ts", "build:bundles": "rollup -c ./rollup.config.mjs", "typecheck": "tsc", diff --git a/packages/lucide-react/rollup.config.mjs b/packages/lucide-react/rollup.config.mjs index a980b4fde..dab5a4f6c 100644 --- a/packages/lucide-react/rollup.config.mjs +++ b/packages/lucide-react/rollup.config.mjs @@ -8,42 +8,40 @@ const aliasesEntries = await getAliasesEntryNames(); const packageName = 'LucideReact'; const outputFileName = 'lucide-react'; -const outputDir = `dist`; const inputs = [`src/lucide-react.ts`]; const bundles = [ { format: 'umd', inputs, - outputDir, + outputDir: 'dist/umd', minify: true, }, { format: 'umd', inputs, - outputDir, + outputDir: 'dist/umd', }, { format: 'cjs', inputs, - outputDir, + outputDir: 'dist/cjs', }, { format: 'esm', - inputs: [...inputs, ...aliasesEntries], - outputDir, + inputs: [...inputs, , 'src/dynamicIconImports.ts', 'src/DynamicIcon.ts', ...aliasesEntries], + outputDir: 'dist/esm', preserveModules: true, }, { format: 'esm', - inputs: ['src/dynamic.ts', 'src/dynamicIconImports.ts', 'src/DynamicIcon.ts'], - outputDir, - preserveModules: true, + inputs: ['src/dynamic.ts'], + outputFile: 'dynamic.mjs', external: [/src/], paths: (id) => { if (id.match(/src/)) { const [, modulePath] = id.match(/src\/(.*)\.ts/); - return `${modulePath}.js`; + return `dist/esm/${modulePath}.js`; } }, }, @@ -77,12 +75,10 @@ const configs = bundles name: packageName, ...(preserveModules ? { - dir: `${outputDir}/${format}`, + dir: outputDir, } : { - file: - outputFile ?? - `${outputDir}/${format}/${outputFileName}${minify ? '.min' : ''}.js`, + file: outputFile ?? `${outputDir}/${outputFileName}${minify ? '.min' : ''}.js`, }), paths, entryFileNames, @@ -104,31 +100,17 @@ export default [ input: 'src/dynamicIconImports.ts', output: [ { - file: `dist/dynamicIconImports.d.ts`, - format: 'es', - }, - ], - plugins: [ - dts({ - exclude: ['./src/icons'], - }), - ], - }, - { - input: 'src/dynamic.ts', - output: [ - { - file: `dist/dynamic.d.ts`, + file: `dynamicIconImports.d.ts`, format: 'es', }, ], plugins: [dts()], }, { - input: 'src/DynamicIcon.ts', + input: 'src/dynamic.ts', output: [ { - file: `dist/DynamicIcon.d.ts`, + file: `dynamic.d.ts`, format: 'es', }, ],