Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/upstream'
Browse files Browse the repository at this point in the history
  • Loading branch information
mostafa-nematpour committed May 21, 2024
2 parents aa79bb8 + 11a07af commit 58c61fd
Show file tree
Hide file tree
Showing 23 changed files with 475 additions and 400 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.vue
6 changes: 6 additions & 0 deletions .vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,11 @@ export default defineConfigWithTheme<ThemeConfig>({
text: 'Čeština',
repo: 'https://github.com/vuejs-translations/docs-cs'
},
{
link: 'https://zh-hk.vuejs.org',
text: '繁體中文',
repo: 'https://github.com/vuejs-translations/docs-zh-hk'
},
{
link: '/translations/',
text: 'به ما در ترجمه کمک کنید!',
Expand Down Expand Up @@ -767,6 +772,7 @@ export default defineConfigWithTheme<ThemeConfig>({
markdown: {
theme: 'github-dark',
config(md) {
// @ts-expect-error - broken type output in vitepress
md.use(headerPlugin)
// .use(textAdPlugin)
}
Expand Down
2 changes: 1 addition & 1 deletion .vitepress/theme/components/Home.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { ref, onMounted } from 'vue'
import { onMounted } from 'vue'
import SiteMap from './SiteMap.vue'
// import NewsLetter from './NewsLetter.vue'
import { load, data, base } from './sponsors'
Expand Down
14 changes: 9 additions & 5 deletions .vitepress/theme/components/VueMasteryBanner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
></div>
<a
id="vm-banner"
href="https://www.vuemastery.com/free-weekend"
href="https://www.vuemastery.com/pricing/?coupon=FREEWEEKEND2024"
target="_blank"
>
<img
Expand All @@ -23,11 +23,12 @@
<div class="vm-banner-wrapper">
<div class="vm-banner-content">
<h1 class="vm-banner-title">
FREE WEEKEND <span>MAY 10-12</span>
Get
<span> 60% </span>
off a year of Vue Mastery courses
</h1>
<p class="vm-banner-sub">Watch all Vue Mastery courses free</p>
</div>
<button id="vm-banner-cta">Get Access</button>
<button id="vm-banner-cta">Get discount</button>
</div>
<button id="vm-banner-close" @click.prevent="closeBanner">
<VTIconPlus class="close" />
Expand Down Expand Up @@ -154,6 +155,9 @@ onMounted(() => {
font-weight: bold;
font-size: 24px;
text-align: center;
}
.vm-banner-title span{
background: linear-gradient(145deg, #c3ffac, #86ec87, #38a56a);
background-clip: text;
-webkit-background-clip: text;
Expand Down Expand Up @@ -240,7 +244,7 @@ onMounted(() => {
width: 40px;
}
.vm-banner-title {
font-size: 14px;
font-size: 12px;
}
.vm-banner-sub {
font-size: 12px;
Expand Down
2 changes: 1 addition & 1 deletion .vitepress/theme/styles/inline-demo.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
content: '▶';
width: 20px;
height: 20px;
display: inline-block;
display: inline-flex;
border-radius: 10px;
vertical-align: middle;
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<li>📦 برای توسعه به صورت local، استفاده از <a href="https://pnpm.io/" target="_blank">pnpm</a> به عنوان Package Manager توصیه می‌شه.</li>

<li>🌿 این پروژه نیاز به Node.js نسخه <code>v14.0.0</code> یا بالاتر داره، چون ما از ویژگی‌های جدیدی مثل optional chaining داخل کدها استفاده می‌کنیم.</li>
<li>🌿 این پروژه نیاز به Node.js نسخه <code>v18.0.0</code> یا بالاتر داره، چون ما از ویژگی‌های جدیدی مثل optional chaining داخل کدها استفاده می‌کنیم.</li>

<li>🌻 ترجیحا فقط روی ترجمه مشارکت کنید و مشکلات مربوط به RTL یا از این قبیل رو توی issue اطلاع بدید.</li>

Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build.environment]
NODE_VERSION = "16"
NODE_VERSION = "20"

[build]
publish = ".vitepress/dist"
Expand Down
39 changes: 15 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,24 @@
"dev": "vitepress",
"build": "vitepress build",
"preview": "vitepress preview",
"preinstall": "npx only-allow pnpm"
"preinstall": "npx only-allow pnpm",
"type": "vue-tsc --noEmit"
},
"dependencies": {
"@vue/repl": "^4.0.1",
"@vue/theme": "^2.2.5",
"@vue/repl": "^4.1.2",
"@vue/theme": "^2.2.11",
"dynamics.js": "^1.1.5",
"gsap": "^3.9.0",
"vitepress": "^1.1.0",
"vue": "^3.4.0"
"gsap": "^3.12.5",
"vitepress": "^1.2.2",
"vue": "^3.4.27"
},
"devDependencies": {
"@types/markdown-it": "^12.2.3",
"@types/node": "^20.10.1",
"terser": "^5.14.2"
"@types/body-scroll-lock": "^3.1.2",
"@types/markdown-it": "^14.1.1",
"@types/node": "^20.12.12",
"terser": "^5.31.0",
"typescript": "^5.4.5",
"vue-tsc": "^2.0.19"
},
"pnpm": {
"overrides": {
"@vitejs/plugin-vue": "5.0.0-beta.1"
},
"peerDependencyRules": {
"ignoreMissing": [
"@algolia/client-search",
"react",
"react-dom",
"@types/react",
"search-insights"
]
}
}
}
"packageManager": "[email protected]"
}
Loading

0 comments on commit 58c61fd

Please sign in to comment.