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.

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

fix: build (like 1.5.4) #224

Merged
merged 4 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"dependencies": {
"@pnpm/find-workspace-packages": "^6.0.5",
"@pnpm/logger": "^5.0.0",
"@rollup/plugin-commonjs": "^25.0.2",
"@rollup/plugin-commonjs": "^24.1.0",
"@rollup/plugin-node-resolve": "^15.0.2",
"@vitejs/plugin-vue": "^4.1.0",
"chalk": "^5.2.0",
"components-helper": "^2.1.4",
"consola": "^3.2.3",
"consola": "^2.15.3",
"esbuild": "^0.17.16",
"fast-glob": "^3.2.12",
"fs-extra": "^11.1.1",
Expand All @@ -37,8 +37,6 @@
"@esbuild-kit/cjs-loader": "^2.4.2",
"@pnpm/types": "^9.0.0",
"@types/rollup-plugin-css-only": "^3.1.0",
"rollup-plugin-postcss": "^4.0.2",
"sass": "^1.67.0",
"unbuild": "^1.2.0",
"vue": "^3.2.47"
}
Expand Down
25 changes: 8 additions & 17 deletions build/src/tasks/full-bundle.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import path from 'path'
import { rollup } from 'rollup'
import { nodeResolve } from '@rollup/plugin-node-resolve'
import { rollup } from 'rollup'
import commonjs from '@rollup/plugin-commonjs'
import esbuild from 'rollup-plugin-esbuild'
import vue from '@vitejs/plugin-vue'
import DefineOptions from 'unplugin-vue-define-options/rollup'
import esbuild from 'rollup-plugin-esbuild'
import { parallel } from 'gulp'
import glob from 'fast-glob'
import postcss from 'rollup-plugin-postcss'
import { camelCase, upperFirst } from 'lodash-unified'
import { version } from '../../../packages/puik/version'
import { PuikAlias } from '../plugins/puik-alias'
import {
themeRoot,
puikRoot,
puikOutput,
localeRoot,
Expand All @@ -19,8 +19,6 @@ import {
writeBundles,
withTaskName,
} from '../utils'
import { version } from '../../../packages/puik/version'
import { PuikAlias } from '../plugins/puik-alias'
import { target } from '../build-info'

const banner = `/*! Puik v${version} */\n`
Expand All @@ -29,22 +27,15 @@ async function buildFullEntry(minify: boolean) {
const bundle = await rollup({
input: path.resolve(puikRoot, 'index.ts'),
plugins: [
nodeResolve({
extensions: ['.mjs', '.js', '.json', '.ts', '.scss'],
}),
commonjs(),
PuikAlias(),
vue({
isProduction: true,
customElement: true,
}),
postcss({
config: {
path: `${themeRoot}/postcss.config.js`,
ctx: {},
},
}),
DefineOptions(),
nodeResolve({
extensions: ['.mjs', '.js', '.json', '.ts'],
}),
commonjs(),
esbuild({
exclude: [],
minify,
Expand Down
19 changes: 5 additions & 14 deletions build/src/tasks/modules.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
import { rollup } from 'rollup'
import vue from '@vitejs/plugin-vue'
import DefineOptions from 'unplugin-vue-define-options/rollup'
import { nodeResolve } from '@rollup/plugin-node-resolve'
import commonjs from '@rollup/plugin-commonjs'
import esbuild from 'rollup-plugin-esbuild'
import vue from '@vitejs/plugin-vue'
import DefineOptions from 'unplugin-vue-define-options/rollup'
import postcss from 'rollup-plugin-postcss'
import glob from 'fast-glob'
import {
puikRoot,
pkgRoot,
generateExternal,
writeBundles,
excludeFiles,
themeRoot,
} from '../utils'
import { PuikAlias } from '../plugins/puik-alias'
import { buildConfigEntries, target } from '../build-info'
Expand All @@ -30,22 +28,15 @@ export const buildModules = async () => {
const bundle = await rollup({
input,
plugins: [
commonjs(),
nodeResolve({
extensions: ['.mjs', '.js', '.json', '.ts', '.scss'],
}),
PuikAlias(),
DefineOptions(),
vue({
isProduction: false,
customElement: true,
}),
postcss({
config: {
path: `${themeRoot}/postcss.config.js`,
ctx: {},
},
nodeResolve({
extensions: ['.mjs', '.js', '.json', '.ts'],
}),
commonjs(),
esbuild({
sourceMap: true,
target,
Expand Down
68 changes: 34 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
"vue": "^3.2.0"
},
"dependencies": {
"@headlessui/vue": "^1.7.16",
"@popperjs/core": "^2.11.8",
"@headlessui/vue": "^1.7.13",
"@popperjs/core": "^2.11.7",
"@puik/components": "workspace:*",
"@puik/hooks": "workspace:*",
"@puik/locale": "workspace:*",
Expand All @@ -63,53 +63,53 @@
"lodash-unified": "^1.0.3"
},
"devDependencies": {
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"@esbuild-kit/cjs-loader": "^2.4.4",
"@faker-js/faker": "^8.1.0",
"@pnpm/find-workspace-packages": "^6.0.9",
"@commitlint/cli": "^17.5.1",
"@commitlint/config-conventional": "^17.4.4",
"@esbuild-kit/cjs-loader": "^2.4.2",
"@faker-js/faker": "^8.0.2",
"@pnpm/find-workspace-packages": "^6.0.5",
"@pnpm/logger": "5.0.0",
"@pnpm/types": "^9.2.0",
"@puik/build": "workspace:^",
"@types/fs-extra": "^11.0.2",
"@types/gulp": "^4.0.14",
"@types/lodash": "^4.14.198",
"@types/lodash-es": "^4.17.9",
"@types/node": "^18.17.18",
"@types/sass": "^1.45.0",
"@pnpm/types": "^9.0.0",
"@puik/build": "workspace:^0.0.1",
"@types/fs-extra": "^11.0.1",
"@types/gulp": "^4.0.10",
"@types/lodash": "^4.14.192",
"@types/lodash-es": "^4.17.7",
"@types/node": "^18.15.11",
"@types/sass": "^1.43.1",
"@typescript-eslint/eslint-plugin": "5.58.0",
"@typescript-eslint/parser": "5.58.0",
"@vitejs/plugin-vue": "^4.3.4",
"@vitejs/plugin-vue": "^4.1.0",
"@vitest/coverage-v8": "^0.32.4",
"@vue/test-utils": "^2.4.1",
"@vue/test-utils": "^2.3.2",
"@vue/tsconfig": "^0.1.3",
"chalk": "^5.3.0",
"chromatic": "^6.24.1",
"consola": "^3.2.3",
"chalk": "^5.2.0",
"chromatic": "^6.17.3",
"consola": "^2.15.3",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^8.49.0",
"eslint": "^8.38.0",
"eslint-config-prettier": "8.8.0",
"eslint-define-config": "^1.23.0",
"eslint-define-config": "^1.17.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-vue": "9.10.0",
"fast-glob": "^3.3.1",
"fast-glob": "^3.2.12",
"husky": "^8.0.3",
"hygen": "^6.2.11",
"jsdom": "^21.1.2",
"lint-staged": "^13.3.0",
"prettier": "^2.8.8",
"jsdom": "^21.1.1",
"lint-staged": "^13.2.1",
"prettier": "^2.8.7",
"pretty-quick": "^3.1.3",
"rimraf": "^5.0.1",
"sass": "^1.68.0",
"rimraf": "^5.0.0",
"sass": "^1.62.0",
"ts-morph": "^14.0.0",
"tsx": "^3.12.10",
"tsx": "^3.12.6",
"type-fest": "^2.19.0",
"typescript": "^5.2.2",
"unplugin-vue-define-options": "^1.3.18",
"typescript": "^5.0.4",
"unplugin-vue-define-options": "^1.3.3",
"vitest": "^0.32.4",
"vue": "^3.3.4",
"vue-router": "^4.2.5",
"vue-tsc": "^1.8.13"
"vue": "^3.2.47",
"vue-router": "^4.1.6",
"vue-tsc": "^1.2.0"
}
}
5 changes: 0 additions & 5 deletions packages/components/icon/src/icon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,3 @@ const style = {
color: props.color,
}
</script>

<style lang="scss">
@import '../../../theme/src/base';
@import '../../../theme/src/icon';
</style>
5 changes: 0 additions & 5 deletions packages/components/tooltip/src/tooltip.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,3 @@ onMounted(() => {
}
})
</script>

<style lang="scss">
@use '../../../theme/src/base';
@use '../../../theme/src/tooltip.scss';
</style>
4 changes: 2 additions & 2 deletions packages/theme/src/chip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
&--small {
@apply px-1 py-0;
.puik-chip__close {
@apply p-[1px];
@apply p-1 py-[2px];
}
}
&--disabled {
Expand All @@ -20,7 +20,7 @@
}
}
&__close {
@apply p-[3px] ml-auto cursor-pointer rounded-[50%] hover:bg-primary-400;
@apply p-1 py-[2px] ml-auto cursor-pointer rounded-[50%] hover:bg-primary-400;
}
&__icon {
@apply mr-1;
Expand Down
1 change: 0 additions & 1 deletion playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
},
"devDependencies": {
"@vitejs/plugin-vue": "^4.1.0",
"sass": "^1.67.0",
"typescript": "^5.0.4",
"vite": "^4.2.1",
"vue-tsc": "^1.2.0"
Expand Down
Loading
Loading