Skip to content

Commit 46729f6

Browse files
adamcikadoadamcikado
committed
refactor: structure
1 parent 0f0797f commit 46729f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+11700
-8184
lines changed

‎.eslintrc

-5
This file was deleted.

‎.gitlab/docs.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,33 @@ stages:
99
- build
1010
- deploy
1111

12-
build_docs:
12+
build:docs:
1313
stage: build
14-
image: node:18-alpine
14+
image: node:22-alpine
1515
before_script:
1616
- corepack enable
1717
- corepack prepare pnpm@latest --activate
1818
- pnpm config set store-dir .pnpm-store
1919
- apk add --no-cache zip
2020
script:
21+
- pnpm i --loglevel error
22+
- pnpm build
2123
- cd docs
22-
- pnpm i --reporter=silent
23-
- pnpm run --reporter=silent generate
24+
- pnpm run --loglevel error generate
2425
- cd .output/public
2526
- zip -r $ARTIFACT_NAME ./*
2627
- mv $ARTIFACT_NAME ../../../
2728
artifacts:
2829
paths:
2930
- $ARTIFACT_NAME
3031

31-
deploy_docs:
32+
deploy:docs:
3233
stage: deploy
3334
dependencies:
3435
- build_docs
35-
resource_group: deploy_docs
36+
resource_group: docs
3637
before_script:
3738
- apk add --no-cache aws-cli
3839
script:
3940
- aws s3 cp $ARTIFACT_NAME s3://${AWS_S3_BUCKET}/${ARTIFACT_NAME}
40-
- aws amplify start-deployment --app-id $AWS_AMPLIFY_ID --branch-name $AWS_AMPLIFY_ENV --source-url s3://${AWS_S3_BUCKET}/${ARTIFACT_NAME}
41+
- aws amplify start-deployment --app-id $AWS_AMPLIFY_ID --branch-name $AWS_AMPLIFY_ENV --source-url s3://${AWS_S3_BUCKET}/${ARTIFACT_NAME}

‎.gitlab/library.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,16 @@ workflow:
55
stages:
66
- publish
77

8-
publish_library:
8+
publish:library:
99
stage: publish
10-
image: node:18-alpine
11-
resource_group: publish_library
10+
image: node:22-alpine
11+
resource_group: library
1212
before_script:
1313
- corepack enable
1414
- corepack prepare pnpm@latest --activate
1515
- pnpm config set store-dir .pnpm-store
1616
script:
17-
- cd packages/css
18-
- pnpm i --loglevel error --no-frozen-lockfile
19-
- pnpm run --loglevel error build
17+
- pnpm i --loglevel error
2018
- echo "@outloud:registry=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/npm/" >> .npmrc
2119
- echo "//${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken=${CI_JOB_TOKEN}" >> .npmrc
2220
- pnpm publish

‎.npmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1+
ignore-workspace-root-check=true
12
shamefully-hoist=true
2-
strict-peer-dependencies=false

‎.prettierignore

-9
This file was deleted.

‎.prettierrc

-10
This file was deleted.

‎packages/css/.release-it.json ‎.release-it.json

File renamed without changes.

‎packages/css/CHANGELOG.md ‎CHANGELOG.md

File renamed without changes.

‎packages/css/build.config.ts ‎build.config.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
import fs from 'node:fs'
2-
import sass from 'sass'
2+
import { compile } from 'sass-embedded'
33
import { defineBuildConfig } from 'unbuild'
44

55
export default defineBuildConfig({
66
entries: ['src/index'],
77
declaration: true,
88
clean: true,
9-
rollup: {
10-
emitCJS: true,
11-
},
129
hooks: {
1310
'mkdist:done': () => {
14-
const reset = sass.compile('./src/reset.css', { style: 'compressed' })
11+
const reset = compile('./src/reset.css', { style: 'compressed' })
1512

1613
fs.writeFileSync(
1714
'dist/reset.css',

‎docs.md

-1
This file was deleted.

‎docs/.data/content/contents.sqlite

184 KB
Binary file not shown.

‎docs/content/8.typography/5.text-color.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Utilities for controlling an element's text color.
1010

1111
## Basic usage
1212

13-
Control the background color of an element using the `text-{$colors}` utilities.
13+
Control the background color of an element using the `color-{$colors}` or `text-{$colors}` utilities.
1414

1515
## Customization
1616

‎docs/nuxt.config.ts

+8-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ export default defineNuxtConfig({
1414
svgo: false,
1515
}),
1616
],
17+
css: {
18+
preprocessorOptions: {
19+
scss: {
20+
api: 'modern-compiler',
21+
},
22+
},
23+
},
1724
},
1825

1926
css: ['@outloud/css/reset.css', '~/styles/app.scss'],
@@ -23,7 +30,7 @@ export default defineNuxtConfig({
2330
],
2431

2532
alias: {
26-
'@outloud/css/src': path.resolve(__dirname, '../packages/css/src'),
33+
'@outloud/css/src': path.resolve(__dirname, '../src'),
2734
},
2835

2936
unocss: {

‎docs/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
{
22
"name": "docs",
3+
"type": "module",
34
"version": "1.0.1",
45
"private": true,
5-
"type": "module",
66
"scripts": {
77
"dev": "nuxi dev",
88
"build": "nuxi build",
99
"generate": "nuxi generate",
1010
"preview": "nuxi preview"
1111
},
1212
"devDependencies": {
13-
"@nuxt-themes/docus": "^1.14.3",
13+
"@nuxt-themes/docus": "1.14.3",
1414
"@outloud/css": "workspace:*",
15-
"@unocss/nuxt": "^0.53.5",
16-
"nuxt": "^3.6.3",
15+
"@unocss/core": "^65.5.0",
16+
"@unocss/nuxt": "^65.5.0",
17+
"nuxt": "3.6.3",
18+
"sass": "1.85.0",
1719
"vite-svg-loader": "^4.0.0"
1820
}
1921
}

‎docs/renovate.json

-8
This file was deleted.

‎docs/rules.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
export * from '@outloud/css/src/rules/layout'
1+
export * from '@outloud/css/src/rules/background'
2+
export * from '@outloud/css/src/rules/border'
23
export * from '@outloud/css/src/rules/flex'
3-
export * from '@outloud/css/src/rules/grid'
44
export * from '@outloud/css/src/rules/gap'
5+
export * from '@outloud/css/src/rules/grid'
6+
export * from '@outloud/css/src/rules/interactivity'
7+
export * from '@outloud/css/src/rules/layout'
8+
export * from '@outloud/css/src/rules/other'
59
export * from '@outloud/css/src/rules/position'
6-
export * from '@outloud/css/src/rules/background'
7-
export * from '@outloud/css/src/rules/border'
810
export * from '@outloud/css/src/rules/size'
911
export * from '@outloud/css/src/rules/spacing'
1012
export * from '@outloud/css/src/rules/typography'
11-
export * from '@outloud/css/src/rules/interactivity'
12-
export * from '@outloud/css/src/rules/other'

‎docs/utils/unocss.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export function generateRuleClassNames(rule: Rule): ClassName[] {
8383
const autocomplete = Array.isArray(rule[2].autocomplete) ? rule[2].autocomplete : [rule[2].autocomplete]
8484

8585
return autocomplete.map((name) => {
86-
const parts = name.match(/(\([^)]*\)|<(?:[^>]+)>|(?:\$\w+))/g)
86+
const parts = name.match(/(\([^)]*\)|<[^>]+>|\$\w+)/g)
8787

8888
if (!parts)
8989
return []

‎eslint.config.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// @ts-check
2+
import { antfu } from '@antfu/eslint-config'
3+
4+
export default antfu({
5+
formatters: true,
6+
})

‎package.json

+64-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,70 @@
11
{
2+
"name": "@outloud/css",
3+
"type": "module",
4+
"version": "1.0.10",
5+
"description": "CSS preset for UnoCSS by Outloud.",
6+
"author": "Outloud <[email protected]> (https://outloud.co)",
7+
"contributors": [
8+
"Andrej Adamcik <[email protected]>"
9+
],
10+
"keywords": [
11+
"unocss",
12+
"outloud",
13+
"css"
14+
],
15+
"exports": {
16+
".": {
17+
"types": "./dist/index.d.ts",
18+
"default": "./dist/index.mjs"
19+
},
20+
"./*": "./dist/*"
21+
},
22+
"main": "./dist/index.mjs",
23+
"module": "./dist/index.mjs",
24+
"types": "./dist/index.d.ts",
25+
"files": [
26+
"dist"
27+
],
28+
"engines": {
29+
"node": ">=20"
30+
},
231
"scripts": {
3-
"build:library": "pnpm --filter @outloud/css build",
4-
"postinstall": "pnpm build:library"
32+
"prepack": "pnpm build",
33+
"build": "unbuild && rm -f dist/*.d.mts",
34+
"dev": "unbuild --stub",
35+
"play": "pnpm --filter ./playground run dev",
36+
"lint": "eslint .",
37+
"format": "prettier --write .",
38+
"release": "pnpm prepack && release-it",
39+
"typecheck": "tsc --noEmit",
40+
"test": "vitest"
41+
},
42+
"peerDependencies": {
43+
"@unocss/core": "^65"
44+
},
45+
"dependencies": {
46+
"@unocss/rule-utils": "^65"
547
},
648
"devDependencies": {
7-
"@antfu/eslint-config": "^0.39.5",
8-
"@types/node": "^20.3.1",
9-
"eslint": "^8.43.0",
10-
"prettier": "^2.8.8",
11-
"typescript": "^5.0.2"
49+
"@antfu/eslint-config": "^4.2.1",
50+
"@types/node": "^22.13.4",
51+
"@unocss/core": "^65.5.0",
52+
"eslint": "^9.20.1",
53+
"eslint-plugin-format": "^1.0.1",
54+
"release-it": "^18.1.2",
55+
"sass-embedded": "^1.85.0",
56+
"typescript": "^5.7.3",
57+
"unbuild": "^3.3.1",
58+
"vitest": "^3.0.5"
59+
},
60+
"pnpm": {
61+
"ignoredBuiltDependencies": [
62+
"@parcel/watcher",
63+
"esbuild",
64+
"vue-demi"
65+
],
66+
"onlyBuiltDependencies": [
67+
"better-sqlite3"
68+
]
1269
}
1370
}

‎packages/css/package.json

-55
This file was deleted.

‎packages/css/tsconfig.json

-6
This file was deleted.

0 commit comments

Comments
 (0)