Skip to content

Commit

Permalink
Merge branch 'main' into phone-number-input
Browse files Browse the repository at this point in the history
  • Loading branch information
JeffreyNijs committed Nov 24, 2023
2 parents 6fdfff4 + 31a403c commit 67f9aa3
Show file tree
Hide file tree
Showing 110 changed files with 3,500 additions and 2,721 deletions.
8 changes: 8 additions & 0 deletions .changeset/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changesets

Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
with multi-package repos, or single-package repos to help you version and publish your code. You can
find the full documentation for it [in our repository](https://github.com/changesets/changesets)

We have a quick list of common questions to get you started engaging with this project in
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
11 changes: 11 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",
"changelog": "@changesets/cli/changelog",
"commit": false,
"fixed": [],
"linked": [],
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": []
}
14 changes: 14 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@
],
"rules": {
"antfu/top-level-function": "off",
"vue/no-undef-components": [
"error",
{
"ignorePatterns": [
"HstText",
"HstButton",
"HstInput",
"HstSelect",
"HstCheckbox",
"Story",
"Variant"
]
}
],
"@typescript-eslint/explicit-function-return-type": "error",
"tailwindcss/migration-from-tailwind-2": "off",
"vue/custom-event-name-casing": [
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This is a comment.
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @Robbe95 @JeffreyNijs @maltsavkiryl @Tanya-Amber-L @wouterlms
54 changes: 0 additions & 54 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,55 +1 @@
name: Deploy

on:
push:
branches:
- main

jobs:
build:
name: Build
runs-on: ubuntu-latest

steps:
- name: Checkout repo
uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v3

- name: Setup pnpm
uses: pnpm/action-setup@v2.2.4
with:
version: latest
run_install: true

- name: Build project
run: pnpm run build

- name: Build histoire
run: pnpm run story:build

- name: Upload production-ready build files
uses: actions/upload-artifact@v3
with:
name: production-files
path: ./.histoire/dist

deploy:
name: Deploy
needs: build
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/main'

steps:
- name: Download artifact
uses: actions/download-artifact@v3
with:
name: production-files
path: ./.histoire/dist

- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./.histoire/dist
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ node_modules
dist
dist-ssr
*.local
/histoire
.histoire
public
17 changes: 13 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,17 @@
],
"i18n-ally.keystyle": "nested",
"tailwindCSS.experimental.classRegex": [
"cva\\(([^)]*)\\)",
// "Options = {([^}]*?)}",
// "{([^}]+?)}"
]
[
"cva\\(([^)]*)\\)",
"[\"'`]([^\"'`]*).*?[\"'`]"
],
[
"cx\\(([^)]*)\\)",
"(?:'|\"|`)([^']*)(?:'|\"|`)"
],
[
"Options\\s*=\\s*\\{([^}]*)\\}",
"[\"'`]([^\"'`]*).*?[\"'`]"
]
],
}
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# wisemen-components

## 0.0.1

### Patch Changes

- Implemented changeset
- Updated tailwind config to TS file
96 changes: 0 additions & 96 deletions auto-imports.d.ts

This file was deleted.

29 changes: 0 additions & 29 deletions components.d.ts

This file was deleted.

28 changes: 0 additions & 28 deletions histoire.config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// histoire.config.js
import { defineConfig } from 'histoire'
import { HstVue } from '@histoire/plugin-vue'
import Components from 'unplugin-vue-components/vite'
import AutoImport from 'unplugin-auto-import/vite'

export default defineConfig({
tree: {
Expand All @@ -26,32 +24,6 @@ export default defineConfig({
},
plugins: [
HstVue(),
Components({
dts: true,
}),
AutoImport({
dts: true,
include: [
/\.[tj]sx?$/, // .ts, .tsx, .js, .jsx
/\.vue$/, /\.vue\?vue/, // .vue
/\.md$/, // .md
],
imports: [
'vue',
'vue-router',
'pinia',
'vue-i18n',
{
axios: [
['default', 'axios'],
],
},
],
resolvers: [
/* ... */
],
}),

],
setupFile: './histoire.setup.ts',
theme: {
Expand Down
16 changes: 11 additions & 5 deletions histoire.setup.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
import './src/assets/styles/globals.css'

// Import global CSS
import './src/assets/styles/transitions.scss' // Import global CSS
import process from 'node:process'
import { createPinia } from 'pinia'
import { defineSetupVue3 } from '@histoire/plugin-vue'
import { createI18n } from 'vue-i18n'

import en from './src/locales/en.json'
import nl from './src/locales/nl.json'

export const setupVue3 = defineSetupVue3(({ app }) => {
export const setupVue3 = defineSetupVue3(async ({ app }) => {
const isIframe = window.self !== window.top

if (isIframe || process.env.NODE_ENV === 'development') {
// @ts-expect-error - this is a hack to make the iframe work
await import('./src/assets/styles/globals.css')
// @ts-expect-error - this is a hack to make the iframe work
await import('./src/assets/styles/transitions.scss')
}

const pinia = createPinia()
const i18n = createI18n({
legacy: false,
Expand Down
Loading

0 comments on commit 67f9aa3

Please sign in to comment.