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

remove plugin-container #1462

Merged
merged 6 commits into from
Mar 30, 2019
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
4 changes: 2 additions & 2 deletions packages/@vuepress/core/lib/node/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,12 @@ module.exports = class App {
.use(require('./internal-plugins/transformModule'))
.use(require('./internal-plugins/dataBlock'))
.use(require('./internal-plugins/frontmatterBlock'))
.use('@vuepress/container', {
.use('container', {
type: 'slot',
before: info => `<template slot="${info}">`,
after: '</template>'
})
.use('@vuepress/container', {
.use('container', {
type: 'v-pre',
before: '<div v-pre>',
after: '</div>'
Expand Down
2 changes: 1 addition & 1 deletion packages/@vuepress/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"@vue/babel-preset-app": "^3.1.1",
"@vuepress/markdown": "^1.0.0-alpha.44",
"@vuepress/markdown-loader": "^1.0.0-alpha.44",
"@vuepress/plugin-container": "^1.0.0-alpha.44",
"@vuepress/plugin-last-updated": "^1.0.0-alpha.44",
"@vuepress/plugin-register-components": "^1.0.0-alpha.44",
"@vuepress/shared-utils": "^1.0.0-alpha.44",
Expand All @@ -60,6 +59,7 @@
"vue-server-renderer": "^2.5.16",
"vue-template-compiler": "^2.5.16",
"vuepress-html-webpack-plugin": "^3.2.0",
"vuepress-plugin-container": "^2.0.0",
"webpack": "^4.8.1",
"webpack-chain": "^4.6.0",
"webpack-dev-server": "^3.1.14",
Expand Down
3 changes: 0 additions & 3 deletions packages/@vuepress/plugin-container/.npmignore

This file was deleted.

5 changes: 0 additions & 5 deletions packages/@vuepress/plugin-container/README.md

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

36 changes: 0 additions & 36 deletions packages/@vuepress/plugin-container/__tests__/index.spec.js

This file was deleted.

50 changes: 0 additions & 50 deletions packages/@vuepress/plugin-container/index.js

This file was deleted.

32 changes: 0 additions & 32 deletions packages/@vuepress/plugin-container/package.json

This file was deleted.

21 changes: 18 additions & 3 deletions packages/@vuepress/theme-default/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,23 @@ module.exports = (options, ctx) => ({
'@vuepress/active-header-links',
'@vuepress/search',
'@vuepress/plugin-nprogress',
['@vuepress/container', { type: 'tip' }],
['@vuepress/container', { type: 'warning' }],
['@vuepress/container', { type: 'danger' }]
['container', {
type: 'tip',
defaultTitle: {
'/zh/': '提示'
}
}],
['container', {
type: 'warning',
defaultTitle: {
'/zh/': '注意'
}
}],
['container', {
type: 'danger',
defaultTitle: {
'/zh/': '警告'
}
}]
]
})
4 changes: 2 additions & 2 deletions packages/@vuepress/theme-default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
"homepage": "https://github.com/vuejs/vuepress/packages/@vuepress/theme-default#readme",
"dependencies": {
"@vuepress/plugin-active-header-links": "^1.0.0-alpha.44",
"@vuepress/plugin-container": "^1.0.0-alpha.44",
"@vuepress/plugin-nprogress": "^1.0.0-alpha.44",
"@vuepress/plugin-search": "^1.0.0-alpha.44",
"docsearch.js": "^2.5.2",
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2"
"stylus-loader": "^3.0.2",
"vuepress-plugin-container": "^2.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/docs/docs/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ module.exports = ctx => ({
['@vuepress/google-analytics', {
ga: 'UA-128189152-1'
}],
['@vuepress/container', {
['container', {
type: 'vue',
before: '<pre class="vue-container"><code>',
after: '</code></pre>',
}],
['@vuepress/container', {
['container', {
type: 'upgrade',
before: info => `<UpgradePath title="${info}">`,
after: '</UpgradePath>',
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/docs/guide/markdown.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Danger zone, do not proceed

**Also see:**

- [@vuepress/plugin-container](../plugin/official/plugin-container.md)
- [vuepress-plugin-container](https://vuepress.github.io/plugins/container/)

## Syntax Highlighting in Code Blocks

Expand Down
80 changes: 0 additions & 80 deletions packages/docs/docs/plugin/official/plugin-container.md

This file was deleted.

2 changes: 1 addition & 1 deletion packages/docs/docs/zh/guide/markdown.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ Danger zone, do not proceed

**参考:**

- [@vuepress/plugin-container](../plugin/official/plugin-container.md)
- [vuepress-plugin-container](https://vuepress.github.io/plugins/container/)

## 代码块中的语法高亮

Expand Down
Loading