diff --git a/docs/en/plugins/vite-plugin-separate-importer/usage.md b/docs/en/plugins/vite-plugin-separate-importer/usage.md index b59b89f..78112e2 100644 --- a/docs/en/plugins/vite-plugin-separate-importer/usage.md +++ b/docs/en/plugins/vite-plugin-separate-importer/usage.md @@ -3,7 +3,7 @@ Configure in `vite.config.mjs`: ```js import react from '@vitejs/plugin-react'; -import decamelize from 'decamelize'; +import { decamelize } from 'camel-kit'; import { defineConfig, Plugin } from 'vite'; import pluginExternal from 'vite-plugin-external'; import pluginSeparateImporter from 'vite-plugin-separate-importer'; diff --git a/docs/zh/plugins/vite-plugin-separate-importer/usage.md b/docs/zh/plugins/vite-plugin-separate-importer/usage.md index aea7b46..01b675a 100644 --- a/docs/zh/plugins/vite-plugin-separate-importer/usage.md +++ b/docs/zh/plugins/vite-plugin-separate-importer/usage.md @@ -3,7 +3,7 @@ 在 `vite.config.mjs` 中配置: ```js import react from '@vitejs/plugin-react'; -import decamelize from 'decamelize'; +import { decamelize } from 'camel-kit'; import { defineConfig, Plugin } from 'vite'; import pluginExternal from 'vite-plugin-external'; import pluginSeparateImporter from 'vite-plugin-separate-importer'; diff --git a/examples/config/vite.separate-importer.1.mts b/examples/config/vite.separate-importer.1.mts index bf58fee..716b697 100644 --- a/examples/config/vite.separate-importer.1.mts +++ b/examples/config/vite.separate-importer.1.mts @@ -1,5 +1,5 @@ import react from '@vitejs/plugin-react'; -import decamelize from 'decamelize'; +import { decamelize } from 'camel-kit'; import { defineConfig, Plugin } from 'vite'; import pluginExternal from 'vite-plugin-external'; import pluginSeparateImporter from 'vite-plugin-separate-importer'; diff --git a/examples/vite3-demo/package.json b/examples/vite3-demo/package.json index a56f1f7..f649c22 100644 --- a/examples/vite3-demo/package.json +++ b/examples/vite3-demo/package.json @@ -45,6 +45,7 @@ "devDependencies": { "@rollup/plugin-typescript": "^12.1.2", "@vitejs/plugin-react": "^2.2.0", + "camel-kit": "^1.0.0", "pug": "^3.0.3", "rollup-plugin-external-globals": "^0.13.0", "tinyglobby": "^0.2.12", diff --git a/examples/vite4-demo/package.json b/examples/vite4-demo/package.json index 2428750..efe38f7 100644 --- a/examples/vite4-demo/package.json +++ b/examples/vite4-demo/package.json @@ -44,6 +44,7 @@ "devDependencies": { "@rollup/plugin-typescript": "^12.1.2", "@vitejs/plugin-react": "^4.3.4", + "camel-kit": "^1.0.0", "pug": "^3.0.3", "rollup-plugin-external-globals": "^0.13.0", "vite": "^4.5.0", diff --git a/examples/vite5-demo/package.json b/examples/vite5-demo/package.json index 97b1ea2..711c73d 100644 --- a/examples/vite5-demo/package.json +++ b/examples/vite5-demo/package.json @@ -44,6 +44,7 @@ "devDependencies": { "@rollup/plugin-typescript": "^12.1.2", "@vitejs/plugin-react": "^4.3.4", + "camel-kit": "^1.0.0", "pug": "^3.0.3", "rollup-plugin-external-globals": "^0.13.0", "vite": "^5.0.0", diff --git a/examples/vite6-demo/package.json b/examples/vite6-demo/package.json index 3d01035..f10f9a3 100644 --- a/examples/vite6-demo/package.json +++ b/examples/vite6-demo/package.json @@ -46,6 +46,7 @@ "@rollup/plugin-typescript": "^12.1.2", "@vitejs/plugin-react": "^4.3.4", "@vitejs/plugin-vue": "^5.2.3", + "camel-kit": "^1.0.0", "pug": "^3.0.3", "rollup-plugin-external-globals": "^0.13.0", "vite": "^6.0.0", diff --git a/packages/create-vite-lib-starter/_husky/commit-msg b/packages/create-vite-lib-starter/_husky/commit-msg new file mode 100644 index 0000000..22c5538 --- /dev/null +++ b/packages/create-vite-lib-starter/_husky/commit-msg @@ -0,0 +1 @@ +npx --no-install -- commitlint --edit $1 \ No newline at end of file diff --git a/packages/create-vite-lib-starter/_husky/pre-commit b/packages/create-vite-lib-starter/_husky/pre-commit new file mode 100644 index 0000000..744920f --- /dev/null +++ b/packages/create-vite-lib-starter/_husky/pre-commit @@ -0,0 +1 @@ +npx --no-install -- lint-staged \ No newline at end of file diff --git a/packages/create-vite-lib-starter/commitlint.config.js b/packages/create-vite-lib-starter/commitlint.config.js index 422b194..c34aa79 100644 --- a/packages/create-vite-lib-starter/commitlint.config.js +++ b/packages/create-vite-lib-starter/commitlint.config.js @@ -1 +1,3 @@ -module.exports = { extends: ['@commitlint/config-conventional'] }; +module.exports = { + extends: ['@commitlint/config-conventional'] +}; diff --git a/packages/create-vite-lib-starter/package.json b/packages/create-vite-lib-starter/package.json index d4085fb..22a5495 100644 --- a/packages/create-vite-lib-starter/package.json +++ b/packages/create-vite-lib-starter/package.json @@ -1,6 +1,6 @@ { "name": "create-vite-lib-starter", - "version": "1.0.5", + "version": "1.0.6", "types": "dist/index.d.ts", "module": "dist/index.mjs", "main": "dist/index.js", diff --git a/packages/vite-plugin-separate-importer/src/index.ts b/packages/vite-plugin-separate-importer/src/index.ts index b1d228e..06b6b22 100644 --- a/packages/vite-plugin-separate-importer/src/index.ts +++ b/packages/vite-plugin-separate-importer/src/index.ts @@ -2,13 +2,13 @@ import { EOL } from 'node:os'; import type { Identifier, ImportDefaultSpecifier, ImportNamespaceSpecifier, ImportSpecifier, Program } from 'acorn'; import { init, parse } from 'es-module-lexer'; -import { Plugin } from 'vite'; +import type { Plugin } from 'vite'; import { banner } from 'vp-runtime-helper'; import { logger, PLUGIN_NAME } from './logger'; -import { ImportSource, libConfig, Options } from './typings'; +import type { ImportSource, libConfig, Options } from './types'; -export * from './typings'; +export * from './types'; interface LibInfo extends libConfig { @@ -76,16 +76,16 @@ function processLibs( break; case 'ImportSpecifier': { - const { name: importer } = specifier.imported as Identifier; - if (importer) { + const { name: importedName } = specifier.imported as Identifier; + if (importedName) { if (typeof importFrom === 'function') { - let source = importFrom(importer, libName); + let source = importFrom(importedName, libName); if (typeof source === 'string') { source = { es: source }; } const { es, cjs, name: newImporter } = source || {}; if (es) { - newImportDeclarationStr += `import ${newImporter || importer} from "${es}";${EOL}`; + newImportDeclarationStr += `import ${newImporter || importedName} from "${es}";${EOL}`; if (cjs) { cjsTransformers.push((code) => { return code.replace(es, cjs); @@ -94,7 +94,7 @@ function processLibs( } } } - insertSourceFn(importer, libName); + insertSourceFn(importedName, libName); break; } } @@ -112,7 +112,7 @@ function processLibs( import ts from '@rollup/plugin-typescript'; import createExternal from 'vite-plugin-external'; import separateImporter from 'vite-plugin-separate-importer'; - import decamelize from 'decamelize'; + import { decamelize } from 'camel-kit'; export default defineConfig({ plugins: [ diff --git a/packages/vite-plugin-separate-importer/src/typings.ts b/packages/vite-plugin-separate-importer/src/types.ts similarity index 100% rename from packages/vite-plugin-separate-importer/src/typings.ts rename to packages/vite-plugin-separate-importer/src/types.ts