Skip to content

Commit

Permalink
build(rollup): rollback to old working versions, setup config
Browse files Browse the repository at this point in the history
  • Loading branch information
iliyaZelenko committed Oct 6, 2019
1 parent e0a29ef commit e6b3456
Show file tree
Hide file tree
Showing 6 changed files with 145 additions and 477 deletions.
2 changes: 1 addition & 1 deletion .releaserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}],
["@semantic-release/github", {
"assets": [
{ "path": "dist/themes/main.css", "label": "CSS" },
{ "path": "dist/main.css", "label": "CSS" },
{ "path": "dist/bundle-cjs.js", "label": "CommonJS module" },
{ "path": "dist/bundle-umd.js", "label": "UMD module" },
{ "path": "dist/bundle-esm.js", "label": "ECMAScript 6 module" },
Expand Down
2 changes: 1 addition & 1 deletion demo/config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export const MAIN_MODULE = import('../dist/bundle-esm') // '../dist/bundle-cjs'
export const MAIN_MODULE = import('../dist/bundle-cjs') // '../dist/bundle-cjs'
// export const MAIN_MODULE = import('../dist/bundle-esm') // '../dist/bundle-cjs'
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"tiptap-extensions": "^1.14.0"
},
"devDependencies": {
"vue-eslint-parser": "^6.0.4",
"@babel/plugin-proposal-optional-chaining": "^7.2.0",
"@fortawesome/fontawesome-free": "^5.8.1",
"@mdi/font": "^4.4.95",
Expand All @@ -41,13 +40,14 @@
"eslint-plugin-vue": "^5.2.2",
"postcss-preset-env": "^6.6.0",
"rollup": "^1.7.0",
"rollup-plugin-alias": "^2.0.1",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-alias": "^1.5.1",
"rollup-plugin-commonjs": "^9.2.1",
"rollup-plugin-node-resolve": "^4.0.1",
"rollup-plugin-postcss": "^2.0.3",
"rollup-plugin-terser": "^5.1.2",
"rollup-plugin-typescript2": "^0.24.3",
"rollup-plugin-vue": "^5.0.1",
"rollup-plugin-terser": "^4.0.4",
"rollup-plugin-typescript2": "^0.20.1",
"rollup-plugin-vue": "^4.7.2",
"sass": "^1.23.0",
"sass-loader": "^7.0.0",
"semantic-release": "^15.13.3",
"stylus": "^0.54.5",
Expand All @@ -59,6 +59,7 @@
"ttypescript": "^1.5.6",
"typescript": "^3.4.2",
"vue": "^2.6.10",
"vue-eslint-parser": "^6.0.4",
"vue-property-decorator": "^8.1.0",
"vue-router": "^3.0.2",
"vue-template-compiler": "^2.6.10",
Expand Down
6 changes: 4 additions & 2 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ async function getConfig ({
tiptap: 'tiptap',
// Походу так и есть: https://github.com/scrumpy/tiptap/blob/master/build/packages/config.js#L44
'tiptap-extensions': 'tiptap', // TODO tiptapExtensions
vuetify: 'Vuetify'
vuetify: 'Vuetify',
'vuetify/lib': 'Vuetify'
}
},
// можно Object.keys(globals)
Expand All @@ -85,7 +86,8 @@ async function getConfig ({
// 'vue-property-decorator',
'tiptap',
'tiptap-extensions',
'vuetify'
'vuetify',
'vuetify/lib'
],
plugins: [
alias({
Expand Down
8 changes: 3 additions & 5 deletions src/components/ActionsRender.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Vue from 'vue'
import { Component, Prop } from 'vue-property-decorator'
import ExtensionActionInterface from '~/extensions/actions/ExtensionActionInterface'
import ExtensionActionRenderBtnComponent from '~/extensions/actions/renders/btn/ExtensionActionRenderBtn.vue'
// import ExtensionActionRenderBtn from '~/extensions/actions/renders/btn/ExtensionActionRenderBtn.ts'
import ExtensionActionRenderBtn from '~/extensions/actions/renders/btn/ExtensionActionRenderBtn.ts'
import { Editor } from 'tiptap'
export const PROPS = {
Expand Down Expand Up @@ -56,10 +56,8 @@ export default class ActionsRender extends Vue {
PROPS = PROPS
// action: ExtensionActionInterface
isBtn (): boolean {
// TODO action.render instanceof ExtensionActionRenderBtn не срабатывает, может из-за того, что это как prop
return true
isBtn (action: ExtensionActionInterface): boolean {
return action.render instanceof ExtensionActionRenderBtn
}
}
</script>
Expand Down
Loading

0 comments on commit e6b3456

Please sign in to comment.