8000 Merge remote-tracking branch 'upstream/main' · xvaara/bootstrap-vue-next@7dccd61 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7dccd61

Browse files
xvaaraxvaara
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: (49 commits) fix: rename ref to avoid Vue warnings (Fix bootstrap-vue-next#2337) (bootstrap-vue-next#2353) Fix show/hide events and emits (bootstrap-vue-next#1821) add some classes and ids for components (bootstrap-vue-next#2344) feat: add __usedComponents __usedDirectives property to the BootstrapVueNextResolver function (bootstrap-vue-next#2351) doc(BNavbar): Parity pass (bootstrap-vue-next#2347) docs: fix lint error (bootstrap-vue-next#2349) fix(BNavbarToggle): toggle default slot doesnt have a scoped argument 'expanded' fixes bootstrap-vue-next#2348 feat!: remove html props -- use equivalent slots fixes bootstrap-vue-next#1930 (bootstrap-vue-next#2311) chore: release main (bootstrap-vue-next#2343) fix(BDropdown): fix infinite loop on keyboard navigation (bootstrap-vue-next#2342) chore: release main (bootstrap-vue-next#2336) feat(BPagination): add keyboard shortcuts fixes bootstrap-vue-next#2153 doc(BNav): Parity pass (bootstrap-vue-next#2332) chore: release main (bootstrap-vue-next#2327) fix(BTable): dynamic slots not rendering fixes bootstrap-vue-next#2328 (bootstrap-vue-next#2329) feat(BTable): make it possible to style custom footers (bootstrap-vue-next#2314) chore: release main (bootstrap-vue-next#2323) fix(BFormGroup): fix layout problem when label-for is not used (bootstrap-vue-next#2321) chore: release main (bootstrap-vue-next#2320) feat(BPagination): add small screen support (bootstrap-vue-next#2308) ...
2 parents b88d260 + f505fe9 commit 7dccd61

File tree

248 files changed

+6896
-5086
lines changed

Some content is hidden

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

248 files changed

+6896
-5086
lines changed

‎.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Install Node.js
2424
uses: actions/setup-node@v3
2525
with:
26-
node-version: 20.x.x
26+
node-version: 22.x.x
2727

2828
- name: Install PNPM
2929
uses: pnpm/action-setup@v4
@@ -61,7 +61,7 @@ jobs:
6161
- name: Install Node.js
6262
uses: actions/setup-node@v3
6363
with:
64-
node-version: 20.x.x
64+
node-version: 22.x.x
6565

6666
- name: Install PNPM
6767
uses: pnpm/action-setup@v4
@@ -97,7 +97,7 @@ jobs:
9797
- name: Install Node.js
9898
uses: actions/setup-node@v3
9999
with:
100-
node-version: 20.x.x
100+
node-version: 22.x.x
101101

102102
- name: Install PNPM
103103
uses: pnpm/action-setup@v4

‎.github/workflows/docs-deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Install Node.js
3636
uses: actions/setup-node@v3
3737
with:
38-
node-version: 20.x.x
38+
node-version: 22.x.x
3939

4040
- name: Install PNPM
4141
uses: pnpm/action-setup@v4

‎.github/workflows/npm-publish-main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install Node.js
2525
uses: actions/setup-node@v3
2626
with:
27-
node-version: 20.x.x
27+
node-version: 22.x.x
2828
registry-url: 'https://registry.npmjs.org'
2929

3030
- name: Install PNPM

‎.github/workflows/npm-publish-nuxt.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install Node.js
2525
uses: actions/setup-node@v3
2626
with:
27-
node-version: 20.x.x
27+
node-version: 22.x.x
2828
registry-url: 'https://registry.npmjs.org'
2929

3030
- name: Install PNPM

‎.github/workflows/release-main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Install Node.js
3636
uses: actions/setup-node@v3
3737
with:
38-
node-version: 20.x.x
38+
node-version: 22.x.x
3939
registry-url: 'https://registry.npmjs.org'
4040
if: ${{ steps.release.outputs.releases_created }}
4141

‎.markdownlint.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"MD013": false,
3+
"MD033":false
4+
}

‎.release-please-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"packages/bootstrap-vue-next": "0.25.3",
3-
"packages/nuxt": "0.25.3"
2+
"packages/bootstrap-vue-next": "0.25.15",
3+
"packages/nuxt": "0.25.15"
44
}

‎apps/docs/.eslintrc.cjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ module.exports = defineConfig({
1111
'@vue/eslint-config-typescript/recommended',
1212
'@vue/eslint-config-prettier',
1313
],
14+
ignorePatterns: ['**/demo/*.js'],
1415
parserOptions: {
1516
ecmaVersion: 'latest',
1617
},

‎apps/docs/.vitepress/theme/Layout.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,7 @@ watch(
279279
</script>
280280

281281
<style lang="scss">
282-
@import 'vitepress/dist/client/theme-default/styles/vars.css';
283-
@import 'vitepress/dist/client/theme-default/styles/base.css';
284-
@import 'vitepress/dist/client/theme-default/styles/utils.css';
285-
@import 'vitepress/dist/client/theme-default/styles/components/custom-block.css';
286-
@import 'vitepress/dist/client/theme-default/styles/components/vp-code.css';
287-
@import 'vitepress/dist/client/theme-default/styles/components/vp-code-group.css';
288-
@import 'vitepress/dist/client/theme-default/styles/components/vp-doc.css';
282+
@use 'bootstrap/dist/css/bootstrap.css';
289283
290284
:root {
291285
--vp-c-brand-1: hsla(237, 31%, 35%, 1);
@@ -355,6 +349,12 @@ watch(
355349
ul {
356350
list-style-type: disc;
357351
}
352+
353+
// alternative solution until https://github.com/vuejs/vitepress/pull/4082 is released
354+
table {
355+
@extend .table;
356+
@extend .table-striped;
357+
}
358358
}
359359
360360
.alert {

‎apps/docs/.vitepress/theme/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
// https://vitepress.dev/guide/custom-theme
22
import Layout from './Layout.vue'
33
import type {Theme} from 'vitepress'
4+
import DefaultTheme from 'vitepress/theme-without-fonts'
45
import {appInfoKey} from './keys'
56

67
import 'bootstrap/dist/css/bootstrap.css'
78
import 'bootstrap-vue-next/dist/bootstrap-vue-next.css'
89
import {createBootstrap} from 'bootstrap-vue-next'
910

1011
export default {
12+
extends: DefaultTheme,
1113
Layout,
1214
enhanceApp(ctx) {
1315
const githubUrl = 'https://github.com/bootstrap-vue-next/bootstrap-vue-next'

0 commit comments

Comments
 (0)
0