Skip to content

Commit

Permalink
fix(ui): update ui output (gitbutlerapp#4649)
Browse files Browse the repository at this point in the history
  • Loading branch information
ndom91 committed Aug 8, 2024
1 parent 99eac84 commit 7d1b7b9
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 38 deletions.
1 change: 1 addition & 0 deletions apps/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"@types/git-url-parse": "^9.0.3",
"@types/lscache": "^1.3.4",
"@types/marked": "^5.0.2",
"@types/postcss-pxtorem": "^6.0.3",
"@wdio/cli": "^8.39.1",
"@wdio/globals": "^8.39.1",
"@wdio/local-runner": "^8.39.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const autoprefixer = require('autoprefixer');
const pxToRem = require('postcss-pxtorem');
const postcssNesting = require('postcss-nesting');
import autoprefixer from 'autoprefixer';
import postcssNesting from 'postcss-nesting';
import pxToRem from 'postcss-pxtorem';

const config = {
export default {
plugins: [
//But others, like autoprefixer, need to run after,
autoprefixer,
Expand All @@ -18,5 +18,3 @@ const config = {
postcssNesting()
]
};

module.exports = config;
1 change: 1 addition & 0 deletions apps/desktop/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
".svelte-kit/types/**/$types.d.ts",
"vite.config.js",
"vite.config.ts",
"postcss.config.js",
"src/**/*.js",
"src/**/*.ts",
"src/**/*.svelte",
Expand Down
1 change: 0 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export default tsEslint.config(
'**/eslint.config.js',
'**/eslint.config.mjs',
'**/svelte.config.js',
'**/postcss.config.cjs',
'**/.pnpm-store',
'**/vite.config.ts.timestamp-*',
'!.storybook',
Expand Down
10 changes: 4 additions & 6 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"package": "pnpm run --sequential \"/^package:.*/\"",
"package:svelte": "svelte-kit sync && svelte-package",
"package:styles": "postcss ./src/styles/main.css -o ./dist/styles/main.css && pnpm run copy-fonts",
"copy-fonts": "postcss ./src/styles/fonts.css -o ./dist/fonts.css && cpy './src/styles/fonts/**/*.woff2' './dist/fonts' --parents",
"copy-fonts": "postcss ./src/styles/fonts.css -o ./dist/styles/fonts.css && cpy './src/styles/fonts/**/*.woff2' './dist/fonts' --parents",
"design-tokens:build": "npx tz build && prettier --write ./src/lib/design-tokens.json ./src/styles/core/design-tokens.css",
"prepublishOnly": "pnpm run package",
"prepare": "svelte-kit sync",
Expand All @@ -37,6 +37,7 @@
"@sveltejs/vite-plugin-svelte": "catalog:svelte",
"@terrazzo/cli": "^0.0.11",
"@terrazzo/plugin-css": "^0.0.9",
"@types/postcss-pxtorem": "^6.0.3",
"autoprefixer": "^10.4.19",
"cpy-cli": "^5.0.0",
"date-fns": "^2.30.0",
Expand Down Expand Up @@ -64,11 +65,8 @@
"import": "./dist/*.js",
"types": "./dist/*.d.ts"
},
"./main.css": {
"import": "./dist/styles/main.css"
},
"./fonts.css": {
"import": "./dist/fonts.css"
"./*.css": {
"import": "./dist/styles/*.css"
},
"./*.json": {
"import": "./dist/*.json",
Expand Down
25 changes: 0 additions & 25 deletions packages/ui/postcss.config.cjs

This file was deleted.

23 changes: 23 additions & 0 deletions packages/ui/postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import postcssBundler from '@csstools/postcss-bundler';
import autoprefixer from 'autoprefixer';
import postcssMinify from 'postcss-minify';
import postcssNesting from 'postcss-nesting';
import pxToRem from 'postcss-pxtorem';

export default {
plugins: [
pxToRem({
rootValue: 16,
unitPrecision: 5,
propList: ['*'],
selectorBlackList: [],
replace: true,
mediaQuery: false,
minPixelValue: 0
}),
autoprefixer(),
postcssNesting(),
postcssBundler(),
postcssMinify()
]
};
1 change: 1 addition & 0 deletions packages/ui/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
".svelte-kit/non-ambient.d.ts",
".svelte-kit/types/**/$types.d.ts",
"terrazzo.config.js",
"postcss.config.js",
"vite.config.js",
"vite.config.ts",
"src/**/*.js",
Expand Down
13 changes: 13 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7d1b7b9

Please sign in to comment.