diff --git a/packages/uni-components/style/audio.css b/packages/uni-h5/style/audio.css similarity index 100% rename from packages/uni-components/style/audio.css rename to packages/uni-h5/style/audio.css diff --git a/packages/uni-h5/style/checkbox.css b/packages/uni-h5/style/checkbox.css index bf22a508dca5211a6d38e00e46a758d4ce4b3dfd..3075a916b5dfc9228525628cea03c002aa8dd712 100644 --- a/packages/uni-h5/style/checkbox.css +++ b/packages/uni-h5/style/checkbox.css @@ -1,4 +1,6 @@ -@import './base.css'; +uni-checkbox-group { + display: block; +} uni-checkbox { -webkit-tap-highlight-color: transparent; @@ -14,7 +16,7 @@ uni-checkbox[disabled] { cursor: not-allowed; } -uni-checkbox .uni-checkbox-wrapper { +.uni-checkbox-wrapper { display: -webkit-inline-flex; display: inline-flex; -webkit-align-items: center; @@ -22,7 +24,7 @@ uni-checkbox .uni-checkbox-wrapper { vertical-align: middle; } -uni-checkbox .uni-checkbox-input { +.uni-checkbox-input { margin-right: 5px; -webkit-appearance: none; appearance: none; @@ -39,11 +41,11 @@ uni-checkbox:not([disabled]) .uni-checkbox-input:hover { border-color: #007aff; } -uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked { +.uni-checkbox-input.uni-checkbox-input-checked { color: #007aff; } -uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked:before { +.uni-checkbox-input.uni-checkbox-input-checked:before { font: normal normal normal 14px/1 'uni'; content: '\EA08'; font-size: 22px; @@ -54,14 +56,10 @@ uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked:before { -webkit-transform: translate(-50%, -48%) scale(0.73); } -uni-checkbox .uni-checkbox-input.uni-checkbox-input-disabled { +.uni-checkbox-input.uni-checkbox-input-disabled { background-color: #e1e1e1; } -uni-checkbox .uni-checkbox-input.uni-checkbox-input-disabled:before { +.uni-checkbox-input.uni-checkbox-input-disabled:before { color: #adadad; } - -uni-checkbox-group { - display: block; -} diff --git a/packages/uni-h5/style/slider.css b/packages/uni-h5/style/slider.css index d8d3d69abbe4cfbe205e64ad527929e16b0f7cad..a4c7cb7ca66dc17ea39edb301e747b61f16a482e 100644 --- a/packages/uni-h5/style/slider.css +++ b/packages/uni-h5/style/slider.css @@ -8,7 +8,7 @@ uni-slider[hidden] { display: none; } -uni-slider .uni-slider-wrapper { +.uni-slider-wrapper { display: -webkit-flex; display: flex; -webkit-align-items: center; @@ -16,13 +16,13 @@ uni-slider .uni-slider-wrapper { min-height: 16px; } -uni-slider .uni-slider-tap-area { +.uni-slider-tap-area { -webkit-flex: 1; flex: 1; padding: 8px 0; } -uni-slider .uni-slider-handle-wrapper { +.uni-slider-handle-wrapper { position: relative; height: 2px; border-radius: 5px; @@ -32,15 +32,15 @@ uni-slider .uni-slider-handle-wrapper { -webkit-tap-highlight-color: transparent; } -uni-slider .uni-slider-track { +.uni-slider-track { height: 100%; border-radius: 6px; background-color: #007aff; transition: background-color 0.3s ease; } -uni-slider .uni-slider-handle, -uni-slider .uni-slider-thumb { +.uni-slider-handle, +.uni-slider-thumb { position: absolute; left: 50%; top: 50%; @@ -49,7 +49,7 @@ uni-slider .uni-slider-thumb { transition: border-color 0.3s ease; } -uni-slider .uni-slider-handle { +.uni-slider-handle { width: 28px; height: 28px; margin-top: -14px; @@ -59,12 +59,12 @@ uni-slider .uni-slider-handle { cursor: grab; } -uni-slider .uni-slider-thumb { +.uni-slider-thumb { z-index: 2; box-shadow: 0 0 4px rgba(0, 0, 0, 0.2); } -uni-slider .uni-slider-step { +.uni-slider-step { position: absolute; width: 100%; height: 2px; @@ -72,17 +72,17 @@ uni-slider .uni-slider-step { z-index: 1; } -uni-slider .uni-slider-value { +.uni-slider-value { color: #888; font-size: 14px; margin-left: 1em; } -uni-slider .uni-slider-disabled .uni-slider-track { +.uni-slider-disabled .uni-slider-track { background-color: #ccc; } -uni-slider .uni-slider-disabled .uni-slider-thumb { +.uni-slider-disabled .uni-slider-thumb { background-color: #fff; border-color: #ccc; } diff --git a/packages/vite-plugin-uni/src/config/css.ts b/packages/vite-plugin-uni/src/config/css.ts index 2d8fc8cfb8c08340ac30fc9f4a59c8b5669896c5..7220b36af1107ce1d2f01b50b327dbea81f2c903 100644 --- a/packages/vite-plugin-uni/src/config/css.ts +++ b/packages/vite-plugin-uni/src/config/css.ts @@ -1,7 +1,7 @@ import { UserConfig } from 'vite' import autoprefixer from 'autoprefixer' import { VitePluginUniResolvedOptions } from '..' -import { uniapp } from '../utils/postcss' +import { uniapp } from '../utils' export function createCss( _options: VitePluginUniResolvedOptions diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/easycom.ts b/packages/vite-plugin-uni/src/configResolved/plugins/easycom.ts index ef46461fe45d6d21b75b3426bede266401c22245..368a05efe0a5acac1a1503d292a0a5d83a0a6235 100644 --- a/packages/vite-plugin-uni/src/configResolved/plugins/easycom.ts +++ b/packages/vite-plugin-uni/src/configResolved/plugins/easycom.ts @@ -7,7 +7,7 @@ import { isBuiltInComponent } from '@dcloudio/uni-shared' import { EXTNAME_VUE, parseVueRequest } from '@dcloudio/uni-cli-shared' import { UniPluginFilterOptions } from '.' -import { debugEasycom, matchEasycom } from '../../easycom' +import { debugEasycom, matchEasycom } from '../../utils' const COMPONENTS_PATH = '@dcloudio/uni-h5/dist/uni-h5.esm.js' const COMPONENTS_STYLE_PATH = '@dcloudio/uni-h5/style/' @@ -30,7 +30,7 @@ export function uniEasycomPlugin(options: UniPluginFilterOptions): Plugin { code = code.replace(/_resolveComponent\("(.+?)"\)/g, (str, name) => { if (name && !name.startsWith('_')) { if (isBuiltInComponent(name)) { - return addSystemImportDeclaration( + return addBuiltInImportDeclaration( importDeclarations, `__syscom_${i++}`, name @@ -55,7 +55,7 @@ export function uniEasycomPlugin(options: UniPluginFilterOptions): Plugin { } } -function addSystemImportDeclaration( +function addBuiltInImportDeclaration( importDeclarations: string[], local: string, name: string diff --git a/packages/vite-plugin-uni/src/configureServer/easycom.ts b/packages/vite-plugin-uni/src/configureServer/easycom.ts index c7e6e16c379cd02adc4e53f01b9a28d4f0ee3eac..5033c621af5b955b1fd4c961b286704f7076f60f 100644 --- a/packages/vite-plugin-uni/src/configureServer/easycom.ts +++ b/packages/vite-plugin-uni/src/configureServer/easycom.ts @@ -2,7 +2,7 @@ import path from 'path' import { ViteDevServer } from 'vite' import { VitePluginUniResolvedOptions } from '..' -import { debugEasycom, initEasycom } from '../easycom' +import { debugEasycom, initEasycom } from '../utils' function initEasycoms(inputDir: string) { const dirs = ['components'].map((dir) => path.resolve(inputDir, dir)) diff --git a/packages/vite-plugin-uni/src/easycom/index.ts b/packages/vite-plugin-uni/src/utils/easycom.ts similarity index 100% rename from packages/vite-plugin-uni/src/easycom/index.ts rename to packages/vite-plugin-uni/src/utils/easycom.ts diff --git a/packages/vite-plugin-uni/src/utils/index.ts b/packages/vite-plugin-uni/src/utils/index.ts index 75f77d24d7402e19e06a95797cf2a3f19e765abe..6ea1c4ccf8f95cbb2838b22ab663462610dd6e86 100644 --- a/packages/vite-plugin-uni/src/utils/index.ts +++ b/packages/vite-plugin-uni/src/utils/index.ts @@ -1,3 +1,5 @@ export * from './filter' export * from './define' +export * from './easycom' +export * from './postcss' export * from './pagesJson'