8000 Merge branch 'dev' into fix-b-form-group-id-handling · bootstrap-vue/bootstrap-vue@dd8cd07 · GitHub
[go: up one dir, main page]
Skip to content

Commit dd8cd07

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into fix-b-form-group-id-handling
2 parents 8a9677f + 41305c1 commit dd8cd07

File tree

3 files changed

+29
-11
lines changed

3 files changed

+29
-11
lines changed

‎docs/markdown/intro/README.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,25 @@ BootstrapVue and PortalVue require access to the global `Vue` reference (via
214214
</p>
215215
</div>
216216

217-
**Example: Vue alias in webpack.config.js**
217+
**Example: Vue alias for [Vue CLI](https://cli.vuejs.org/) in `vue.config.js`**
218+
219+
```js
220+
const path = require('path')
221+
222+
module.exports = {
223+
chainWebpack: config => {
224+
config.resolve.alias.set(
225+
'vue$',
226+
// If using the runtime only build
227+
path.resolve(__dirname, 'node_modules/vue/dist/vue.runtime.esm.js')
228+
// Or if using full build of Vue (runtime + compiler)
229+
// path.resolve(__dirname, 'node_modules/vue/dist/vue.esm.js')
230+
)
231+
}
232+
}
233+
```
234+
235+
**Example: Vue alias in `webpack.config.js`**
218236

219237
```js
220238
module.exports = {

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
"core-js": "^3.6.5",
126126
"cross-env": "^7.0.2",
127127
"eslint": "^7.11.0",
128-
"eslint-config-prettier": "^6.13.0",
128+
"eslint-config-prettier": "^6.14.0",
129129
"eslint-config-standard": "^14.1.1",
130130
"eslint-config-vue": "^2.0.2",
131131
"eslint-plugin-import": "^2.22.1",
@@ -146,7 +146,7 @@
146146
"lint-staged": "^10.4.2",
147147
"loader-utils": "^2.0.0",
148148
"lodash": "^4.17.20",
149-
"marked": "^1.2.0",
149+
"marked": "^1.2.2",
150150
"node-sass": "^4.14.1",
151151
"nuxt": "^2.14.7",
152152
"postcss": "^8.1.2",

‎yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5518,10 +5518,10 @@ escodegen@^1.14.1:
55185518
optionalDependencies:
55195519
source-map "~0.6.1"
55205520

5521-
eslint-config-prettier@^6.13.0:
5522-
version "6.13.0"
5523-
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.13.0.tgz#207d88796b5624e5bb815bbbdfc5891ceb9ebffa"
5524-
integrity sha512-LcT0i0LSmnzqK2t764pyIt7kKH2AuuqKRTtJTdddWxOiUja9HdG5GXBVF2gmCTvVYWVsTu8J2MhJLVGRh+pj8w==
5521+
eslint-config-prettier@^6.14.0:
5522+
version "6.14.0"
5523+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.14.0.tgz#390e7863a8ae99970981933826476169285b3a27"
5524+
integrity sha512-DbVwh0qZhAC7CNDWcq8cBdK6FcVHiMTKmCypOPWeZkp9hJ8xYwTaWSa6bb6cjfi8KOeJy0e9a8Izxyx+O4+gCQ==
55255525
dependencies:
55265526
get-stdin "^6.0.0"
55275527

@@ -9067,10 +9067,10 @@ markdown-escapes@^1.0.0:
90679067
resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
90689068
integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
90699069

9070-
marked@^1.2.0:
9071-
version "1.2.0"
9072-
resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.0.tgz#7221ce2395fa6cf6d722e6f2871a32d3513c85ca"
9073-
integrity sha512-tiRxakgbNPBr301ihe/785NntvYyhxlqcL3YaC8CaxJQh7kiaEtrN9B/eK2I2943Yjkh5gw25chYFDQhOMCwMA==
9070+
marked@^1.2.2:
9071+
version "1.2.2"
9072+
resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.2.tgz#5d77ffb789c4cb0ae828bfe76250f7140b123f70"
9073+
integrity sha512-5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ==
90749074

90759075
md5.js@^1.3.4:
90769076
version "1.3.5"

0 commit comments

Comments
 (0)
0