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

update nextcloud-vue v8 #2861

Merged
merged 1 commit into from
Nov 9, 2024
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
6,383 changes: 4,379 additions & 2,004 deletions package-lock.json

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
"@nextcloud/initial-state": "^2.2.0",
"@nextcloud/l10n": "^3.1.0",
"@nextcloud/moment": "^1.3.1",
"@nextcloud/password-confirmation": "^4.1.0",
"@nextcloud/password-confirmation": "^5.0.1",
"@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^7.8.0",
"@nextcloud/vue": "^8.11.0",
"@vue/vue2-jest": "^29.2.6",
"lodash": "^4.17.21",
"vue": "^2.7.16",
Expand All @@ -72,7 +72,6 @@
"@nextcloud/browserslist-config": "^3.0.1",
"@nextcloud/eslint-config": "^8.0.0",
"@nextcloud/eslint-plugin": "^2.2.1",
"@nextcloud/password-confirmation": "^4.1.0",
"@nextcloud/stylelint-config": "^2.1.2",
"@nextcloud/webpack-vue-config": "^5.1.0",
"@types/jest": "^29.5.11",
Expand Down Expand Up @@ -146,7 +145,9 @@
"moduleNameMapper": {
"^@/(.*)$": "<rootDir>/src/$1",
"^Components/(.*)$": "<rootDir>/src/components/$1",
"^.+\\.(css|less|svg)$": "<rootDir>/tests/javascript/helpers/CSSStub.js"
"^.+\\.(css|less|svg)$": "<rootDir>/tests/javascript/helpers/CSSStub.js",
"^unist-util-visit$": "<rootDir>/tests/javascript/helpers/unist-stub.js",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems like the easiest solution to me, good fix!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems like the easiest solution to me, good fix!

@devlinjunker thanks for the review

"^unist-builder$": "<rootDir>/tests/javascript/helpers/unist-stub.js"
},
"testEnvironment": "jsdom",
"transform": {
Expand Down
2 changes: 1 addition & 1 deletion src/components/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SPDX-Licence-Identifier: AGPL-3.0-or-later
-->

<template>
<NcSettingsSection :title="t('news', 'News')"
<NcSettingsSection :name="t('news', 'News')"
class="news-settings"
doc-url="https://nextcloud.github.io/news/admin/">
<template v-if="lastCron !== 0">
Expand Down
11 changes: 6 additions & 5 deletions src/components/ContentTemplate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
<div ref="contentElement" class="feed-item-content-wrapper">
<FeedItemDisplay v-if="selectedFeedItem" :item="selectedFeedItem" />
<NcEmptyContent v-else
:title="t('news', 'No article selected')"
style="margin-top: 20vh"
:name="t('news', 'No article selected')"
:description="t('news', 'Please select an article from the list...')">
<template #icon>
<TextIcon />
Expand All @@ -40,10 +41,10 @@

import itemStore from '../store/item'

import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent'
import NcAppContentList from '@nextcloud/vue/dist/Components/NcAppContentList'
import NcAppContentDetails from '@nextcloud/vue/dist/Components/NcAppContentDetails'
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent'
import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
import NcAppContentList from '@nextcloud/vue/dist/Components/NcAppContentList.js'
import NcAppContentDetails from '@nextcloud/vue/dist/Components/NcAppContentDetails.js'
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'

import TextIcon from 'vue-material-design-icons/Text.vue'

Expand All @@ -61,7 +62,7 @@
type: String,
required: true,
},
config: {

Check warning on line 65 in src/components/ContentTemplate.vue

View workflow job for this annotation

GitHub Actions / eslint node

Prop 'config' requires default value to be set

Check warning on line 65 in src/components/ContentTemplate.vue

View workflow job for this annotation

GitHub Actions / NPM lint

Prop 'config' requires default value to be set
type: Object as PropType<Config>,
},
})
Expand Down
2 changes: 1 addition & 1 deletion src/components/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</template>
</NcAppNavigationNew>
<template #list>
<NcAppNavigationNewItem :title="t('news', 'New folder')"
<NcAppNavigationNewItem :name="t('news', 'New folder')"
:icon="''"
@new-item="newFolder">
<template #icon>
Expand Down
2 changes: 1 addition & 1 deletion src/components/SidebarFeedLinkActions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
@click="deleteFeed()">
{{ t("news", "Delete") }}
</NcActionButton>
<NcAppNavigationItem :title="t('news', 'Open Feed URL')"
<NcAppNavigationItem :name="t('news', 'Open Feed URL')"
:href="feed.location">
<template #icon>
<RssIcon />
Expand Down
102 changes: 102 additions & 0 deletions tests/javascript/helpers/unist-stub.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
// Unit tests failed after upgrading nextcloud-vue v7 to v8
// jest uses commonjs, but the app esm
// use this stub to ignore these errors for the included unist-util-visit and unist-builder

// ● Test suite failed to run
//
// Jest encountered an unexpected token
//
// Jest failed to parse a file. This happens e.g. when your code or its dependencies use non-standard JavaScript syntax, or when Jest is not configured to support such syntax.
//
// Out of the box Jest supports Babel, which will be used to transform your files into valid JS based on your Babel configuration.
//
// By default "node_modules" folder is ignored by transformers.
//
// Here's what you can do:
// • If you are trying to use ECMAScript Modules, see https://jestjs.io/docs/ecmascript-modules for how to enable it.
// • If you are trying to use TypeScript, see https://jestjs.io/docs/getting-started#using-typescript
// • To have some of your "node_modules" files transformed, you can specify a custom "transformIgnorePatterns" in your config.
// • If you need a custom transformation specify a "transform" option in your config.
// • If you simply want to mock your non-JS modules (e.g. binary assets) you can stub them out with the "moduleNameMapper" config option.
//
// You'll find more details and examples of these config options in the docs:
// https://jestjs.io/docs/configuration
// For information about custom transformations, see:
// https://jestjs.io/docs/code-transformation
//
// Details:
//
// /home/build/nextcloud/apps/news/node_modules/@nextcloud/vue/node_modules/unist-util-visit/index.js:2
// export {CONTINUE, EXIT, SKIP, visit} from './lib/index.js'
// ^^^^^^
//
// SyntaxError: Unexpected token 'export'
//
// 28 | import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
// 29 | import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
// > 30 | import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
// | ^
// 31 |
// 32 | import { Folder } from '../types/Folder'
// 33 | import { ACTIONS } from '../store'
//
// at Runtime.createScriptFromCode (node_modules/jest-runtime/build/index.js:1505:14)
// at Object.<anonymous> (node_modules/@nextcloud/vue/dist/chunks/autolink-BAgL31EZ.cjs:2:24)
// at Object.<anonymous> (node_modules/@nextcloud/vue/dist/chunks/NcAvatar-B238cv9d.cjs:27:18)
// at Object.<anonymous> (node_modules/@nextcloud/vue/dist/chunks/NcListItemIcon-Do_af_2v.cjs:4:18)
// at Object.<anonymous> (node_modules/@nextcloud/vue/dist/chunks/NcSelect-CKgkjF4m.cjs:10:24)
// at Object.<anonymous> (node_modules/@nextcloud/vue/dist/Components/NcSelect.cjs:2:18)
// at Object.<anonymous> (src/components/MoveFeed.vue:30:1)
// at Object.<anonymous> (src/components/SidebarFeedLinkActions.vue:118:1)
// at Object.<anonymous> (tests/javascript/unit/components/SidebarFeedLinkActions.spec.ts:4:1)

// ● Test suite failed to run
//
// Jest encountered an unexpected token
//
// Jest failed to parse a file. This happens e.g. when your code or its dependencies use non-standard JavaScript syntax, or when Jest is not configured to support such syntax.
//
// Out of the box Jest supports Babel, which will be used to transform your files into valid JS based on your Babel configuration.
//
// By default "node_modules" folder is ignored by transformers.
//
// Here's what you can do:
// • If you are trying to use ECMAScript Modules, see https://jestjs.io/docs/ecmascript-modules for how to enable it.
// • If you are trying to use TypeScript, see https://jestjs.io/docs/getting-started#using-typescript
// • To have some of your "node_modules" files transformed, you can specify a custom "transformIgnorePatterns" in your config.
// • If you need a custom transformation specify a "transform" option in your config.
// • If you simply want to mock your non-JS modules (e.g. binary assets) you can stub them out with the "moduleNameMapper" config option.
//
// You'll find more details and examples of these config options in the docs:
// https://jestjs.io/docs/configuration
// For information about custom transformations, see:
// https://jestjs.io/docs/code-transformation
//
// Details:
//
// /home/build/nextcloud/apps/news/node_modules/unist-builder/index.js:6
// export {u} from './lib/index.js'
// ^^^^^^
//
// SyntaxError: Unexpected token 'export'
//
// 103 | import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
// 104 | import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
// > 105 | import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
// | ^
// 106 |
// 107 | import { Folder } from '../types/Folder'
// 108 | import { ACTIONS } from '../store'
//
// at Runtime.createScriptFromCode (node_modules/jest-runtime/build/index.js:1505:14)
// at Object.<anonymous> (node_modules/@nextcloud/vue/dist/chunks/autolink-BAgL31EZ.cjs:3:22)
// at Object.<anonymous> (node_modules/@nextcloud/vue/dist/chunks/NcAvatar-B238cv9d.cjs:27:18)
// at Object.<anonymous> (node_modules/@nextcloud/vue/dist/chunks/NcListItemIcon-Do_af_2v.cjs:4:18)
// at Object.<anonymous> (node_modules/@nextcloud/vue/dist/chunks/NcSelect-CKgkjF4m.cjs:10:24)
// at Object.<anonymous> (node_modules/@nextcloud/vue/dist/Components/NcSelect.cjs:2:18)
// at Object.<anonymous> (src/components/AddFeed.vue:105:1)
// at Object.<anonymous> (src/components/routes/Explore.vue:47:1)
// at Object.<anonymous> (src/routes/index.ts:3:1)
// at Object.<anonymous> (src/components/Sidebar.vue:188:1)
// at Object.<anonymous> (src/App.vue:51:1)
// at Object.<anonymous> (tests/javascript/unit/components/App.spec.ts:3:1)
4 changes: 4 additions & 0 deletions tests/javascript/unit/components/AdminSettings.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ jest.mock('@nextcloud/axios')
jest.mock('@nextcloud/initial-state')
jest.mock('@nextcloud/router')
jest.mock('@nextcloud/dialogs')
jest.mock('@nextcloud/password-confirmation', () => ({
confirmPassword: jest.fn(),
password_policy: {},
}));

describe('AdminSettings.vue', () => {
'use strict'
Expand Down
Loading