Skip to content
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
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@Library('jenkins-library' ) _

def pipeline = new org.js.LibPipeline(steps: this,
buildDockerImage: 'build-tools/node:14-ubuntu',
buildDockerImage: 'build-tools/node:16-ubuntu',
dockerImageName: 'soramitsu/soramitsu-js-ui-library',
libExamplesBuildCmds: ['yarn storybook:build'],
sonarProjectName: 'soramitsu-js-ui-library',
Expand Down
31 changes: 16 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@soramitsu/soramitsu-js-ui",
"version": "1.0.45",
"version": "1.0.46",
"private": false,
"publishConfig": {
"registry": "https://nexus.iroha.tech/repository/npm-soramitsu/"
Expand Down Expand Up @@ -32,7 +32,7 @@
"lodash": "^4.17.21",
"throttle-debounce": "^1.0.1",
"v-jsoneditor": "^1.4.5",
"vue": "2.6.14",
"vue": "^2.6.14",
"vue-class-component": "^7.2.6",
"vue-i18n": "^8.28.2",
"vue-property-decorator": "^9.1.2",
Expand All @@ -42,22 +42,23 @@
"@rollup/plugin-commonjs": "^23.0.3",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-terser": "^0.1.0",
"@storybook/addon-a11y": "^6.5.13",
"@storybook/addon-essentials": "^6.5.13",
"@storybook/addon-storysource": "^6.5.13",
"@storybook/builder-webpack5": "^6.5.13",
"@storybook/manager-webpack5": "^6.5.13",
"@storybook/theming": "^6.5.13",
"@storybook/vue": ">=6.5.13",
"@storybook/addon-a11y": "6.5.16",
"@storybook/addon-essentials": "6.5.16",
"@storybook/addon-storysource": "6.5.16",
"@storybook/builder-webpack5": "6.5.16",
"@storybook/core-server": "6.5.16",
"@storybook/manager-webpack5": "6.5.16",
"@storybook/theming": "6.5.16",
"@storybook/vue": "6.5.16",
"@types/jest": "^29.2.3",
"@types/lodash": "^4.14.190",
"@typescript-eslint/eslint-plugin": "^5.45.0",
"@typescript-eslint/parser": "^5.45.0",
"@vue/cli-plugin-babel": "5.0.0-beta.4",
"@vue/cli-plugin-eslint": "5.0.0-beta.4",
"@vue/cli-plugin-typescript": "5.0.0-beta.4",
"@vue/cli-plugin-unit-jest": "5.0.0-beta.4",
"@vue/cli-service": "5.0.0-beta.4",
"@vue/cli-plugin-babel": "5.0.8",
"@vue/cli-plugin-eslint": "5.0.8",
"@vue/cli-plugin-typescript": "5.0.8",
"@vue/cli-plugin-unit-jest": "5.0.8",
"@vue/cli-service": "5.0.8",
"@vue/eslint-config-standard": "^5.1.2",
"@vue/eslint-config-typescript": "^5.0.2",
"@vue/test-utils": "^1.2.2",
Expand Down Expand Up @@ -85,7 +86,7 @@
"typescript": "~4.4.4",
"vue-cli-plugin-storybook": "~1.2.2",
"vue-router": "^3.3.4",
"vue-template-compiler": "2.6.14"
"vue-template-compiler": "^2.6.14"
},
"postcss": {
"plugins": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export default class SScrollSections extends Vue {
}

get scrollableParent (): any {
return this.parent ? this.$parent.$el : window
return this.parent && this.$parent ? this.$parent.$el : window
}

private setState (): void {
Expand Down
2 changes: 1 addition & 1 deletion src/stories/SButton.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export const configurable: Story = (args, { argTypes }) => ({
},
computed: {
isAction () {
return this.type === ButtonTypes.ACTION
return (this as any).type === ButtonTypes.ACTION
}
}
})
Expand Down
Loading