Skip to content

Commit

Permalink
Merge branch 'feat-rn-atomic-css' of github.com:didi/mpx into feat-rn…
Browse files Browse the repository at this point in the history
…-atomic-css
  • Loading branch information
CommanderXL committed Jan 3, 2025
2 parents f4132e9 + 3fc9efa commit b79ef77
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 44 deletions.
24 changes: 1 addition & 23 deletions docs-vuepress/.vuepress/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const { headerPlugin } = require('./headerMdPlugin')
const { presetUno } = require('unocss')
const UnoCSS = require('@unocss/webpack').default


const unocss = {
'/unocss': [
Expand Down Expand Up @@ -282,27 +281,6 @@ module.exports = {
chainWebpack: (config, isServer) => {
// 添加node_modules避免resolve错误
config.resolve.modules.add('node_modules')
config.module.rule('vue').uses.delete('cache-loader')
config.module.rule('tsx').uses.delete('cache-loader')
config.merge({
cache: false
})
config.plugin('extract-css').use(require('mini-css-extract-plugin'), [
{
filename: '[name].css',
chunkFilename: '[name].[hash:9].css'
}
])
},
configureWebpack: {
plugins: [
UnoCSS({
presets: [
presetUno()
],
configFile: false
})
]
},
markdown: {
// markdown-it-toc 的选项
Expand Down
5 changes: 0 additions & 5 deletions docs-vuepress/.vuepress/enhanceApp.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
import a from 'uno.css'

console.log(a);


export default ({ router }) => {
if (typeof process === 'undefined' || process.env.VUE_ENV !== 'server') {
router.onReady(() => {
Expand Down
19 changes: 3 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,23 @@
"@types/jest": "^27.0.1",
"@typescript-eslint/eslint-plugin": "^5.2.0",
"@typescript-eslint/parser": "^5.2.0",
"@unocss/webpack": "0.58.9",
"@vuepress/plugin-back-to-top": "^1.8.2",
"@vuepress/plugin-pwa": "^1.8.0",
"@vueuse/core": "^7.7.0",
"@windicss/shared-components": "^0.1.8",
"codemirror": "^5.65.2",
"codemirror-theme-vars": "^0.1.1",
"eslint": "^7.32.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-html": "^6.2.0",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-jest": "^27.0.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^5.1.1",
"eslint-plugin-react-hooks": "^5.1.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^27.2.0",
"json5": "^2.2.0",
"lerna": "^8.1.8",
"lz-string": "^1.4.4",
"mini-css-extract-plugin": "^1.6.2",
"mitt": "^3.0.0",
"preact": "^10.6.6",
"prism-theme-vars": "^0.2.2",
"prismjs": "^1.27.0",
"splitpanes": "^3.1.1",
"typescript": "^4.1.3",
"unocss": "0.58.9",
"vue": "^3.2.31",
"vuepress": "^1.9.7",
"windicss": "^3.5.1"
"vue-template-compiler": "^2.7.16",
"webpack": "^4.47.0"
},
"workspaces": [
"packages/*"
Expand Down
1 change: 1 addition & 0 deletions packages/webpack-plugin/lib/react/processStyles.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ module.exports = function (styles, {
};\n
let __unoClassMap
global.__getUnoClassMap = function () {
const formatValue = global.__formatValue
if (!__unoClassMap) {
__unoClassMap = __unoCssMapPlaceholder__
}
Expand Down

0 comments on commit b79ef77

Please sign in to comment.