Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(element-plus): support nightly option #685

Merged
merged 2 commits into from
Aug 30, 2023
Merged

feat(element-plus): support nightly option #685

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d76577c
feat(element-plus): support nightly option
btea Aug 29, 2023
534c325
chore: fix lint
btea Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/core/resolvers/element-plus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ export interface ElementPlusResolverOptions {
* a list of component names that have no styles, so resolving their styles file should be prevented
*/
noStylesComponents?: string[]

/**
* nightly version
*/
nightly?: boolean
}

type ElementPlusResolverOptionsResolved = Required<Omit<ElementPlusResolverOptions, 'exclude'>> &
Expand Down Expand Up @@ -73,9 +78,9 @@ function getSideEffectsLegacy(
}

function getSideEffects(dirName: string, options: ElementPlusResolverOptionsResolved): SideEffectsInfo | undefined {
const { importStyle, ssr } = options
const themeFolder = 'element-plus/theme-chalk'
const esComponentsFolder = 'element-plus/es/components'
const { importStyle, ssr, nightly } = options
const themeFolder = nightly ? '@element-plus/nightly/theme-chalk' : 'element-plus/theme-chalk'
const esComponentsFolder = nightly ? '@element-plus/nightly/es/components' : 'element-plus/es/components'

if (importStyle === 'sass') {
return ssr
Expand Down Expand Up @@ -104,13 +109,13 @@ function resolveComponent(name: string, options: ElementPlusResolverOptionsResol
}

const partialName = kebabCase(name.slice(2))// ElTableColumn -> table-column
const { version, ssr } = options
const { version, ssr, nightly } = options

// >=1.1.0-beta.1
if (compare(version, '1.1.0-beta.1', '>=')) {
if (compare(version, '1.1.0-beta.1', '>=') || nightly) {
return {
name,
from: `element-plus/${ssr ? 'lib' : 'es'}`,
from: `${nightly ? '@element-plus/nightly' : 'element-plus'}/${ssr ? 'lib' : 'es'}`,
sideEffects: getSideEffects(partialName, options),
}
}
Expand Down Expand Up @@ -144,13 +149,13 @@ function resolveDirective(name: string, options: ElementPlusResolverOptionsResol
if (!directive)
return

const { version, ssr } = options
const { version, ssr, nightly } = options

// >=1.1.0-beta.1
if (compare(version, '1.1.0-beta.1', '>=')) {
if (compare(version, '1.1.0-beta.1', '>=') || nightly) {
return {
name: directive.importName,
from: `element-plus/${ssr ? 'lib' : 'es'}`,
from: `${nightly ? '@element-plus/nightly' : 'element-plus'}/${ssr ? 'lib' : 'es'}`,
sideEffects: getSideEffects(directive.styleName, options),
}
}
Expand Down Expand Up @@ -183,6 +188,7 @@ export function ElementPlusResolver(
directives: true,
exclude: undefined,
noStylesComponents: options.noStylesComponents || [],
nightly: false,
...options,
}
return optionsResolved
Expand Down
Loading