Skip to content

Commit 9818511

Browse files
committed
remove remaining webpack stuff
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
1 parent a88673b commit 9818511

File tree

8 files changed

+28
-93
lines changed

8 files changed

+28
-93
lines changed

.github/workflows/node.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
npm ci
7373
npm run build --if-present
7474
75-
- name: Check webpack build changes
75+
- name: Check build changes
7676
run: |
7777
bash -c "[[ ! \"`git status --porcelain `\" ]] || (echo 'Please recompile and commit the assets, see the section \"Show changes on failure\" for details' && exit 1)"
7878

.nextcloudignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@
3232
/renovate.json
3333
/stylelint.config.js
3434
/webpack.config.js
35+
/vite.config.ts
3536
/webpack.js
3637
tests

makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ appstore: clean
8181
--exclude=/src \
8282
--exclude=translationfiles \
8383
--exclude=webpack.* \
84+
--exclude=/vite.* \
8485
--exclude=stylelint.config.js \
8586
--exclude=.eslintrc.js \
8687
--exclude=.github \

src/assistant.js

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import { TASK_STATUS_STRING } from './constants.js'
2-
// import { linkTo } from '@nextcloud/router'
3-
// import { getRequestToken } from '@nextcloud/auth'
42
import { showError } from '@nextcloud/dialogs'
53

6-
// __webpack_nonce__ = btoa(getRequestToken()) // eslint-disable-line
7-
// __webpack_public_path__ = linkTo('assistant', 'js/') // eslint-disable-line
84
window.assistantPollTimerId = null
95

106
// TODO add param to lock on specific task type
@@ -50,8 +46,8 @@ export async function openAssistantForm({
5046
isInsideViewer = undefined, closeOnResult = false, actionButtons = undefined,
5147
customId = '', identifier = '',
5248
}) {
53-
const { default: Vue } = await import(/* webpackChunkName: "vue-lazy" */'vue')
54-
const { default: AssistantTextProcessingModal } = await import(/* webpackChunkName: "assistant-modal-lazy" */'./components/AssistantTextProcessingModal.vue')
49+
const { default: Vue } = await import('vue')
50+
const { default: AssistantTextProcessingModal } = await import('./components/AssistantTextProcessingModal.vue')
5551
Vue.mixin({ methods: { t, n } })
5652

5753
// fallback to the last used one
@@ -197,22 +193,22 @@ export async function cancelTaskPolling() {
197193

198194
export async function getTask(taskId) {
199195
window.assistantAbortController = new AbortController()
200-
const { default: axios } = await import(/* webpackChunkName: "axios-lazy" */'@nextcloud/axios')
201-
const { generateOcsUrl } = await import(/* webpackChunkName: "router-gen-lazy" */'@nextcloud/router')
196+
const { default: axios } = await import('@nextcloud/axios')
197+
const { generateOcsUrl } = await import('@nextcloud/router')
202198
const url = generateOcsUrl('taskprocessing/task/{taskId}', { taskId })
203199
return axios.get(url, { signal: window.assistantAbortController.signal })
204200
}
205201

206202
export async function setNotifyReady(taskId) {
207-
const { default: axios } = await import(/* webpackChunkName: "axios-lazy" */'@nextcloud/axios')
208-
const { generateOcsUrl } = await import(/* webpackChunkName: "router-gen-lazy" */'@nextcloud/router')
203+
const { default: axios } = await import('@nextcloud/axios')
204+
const { generateOcsUrl } = await import('@nextcloud/router')
209205
const url = generateOcsUrl('/apps/assistant/api/v1/task/{taskId}/notify', { taskId })
210206
return axios.post(url, {})
211207
}
212208

213209
export async function cancelTask(taskId) {
214-
const { default: axios } = await import(/* webpackChunkName: "axios-lazy" */'@nextcloud/axios')
215-
const { generateOcsUrl } = await import(/* webpackChunkName: "router-gen-lazy" */'@nextcloud/router')
210+
const { default: axios } = await import('@nextcloud/axios')
211+
const { generateOcsUrl } = await import('@nextcloud/router')
216212
const url = generateOcsUrl('taskprocessing/task/{taskId}', { taskId })
217213
return axios.delete(url, {})
218214
}
@@ -228,8 +224,8 @@ export async function cancelTask(taskId) {
228224
*/
229225
export async function scheduleTask(appId, customId, taskType, inputs) {
230226
window.assistantAbortController = new AbortController()
231-
const { default: axios } = await import(/* webpackChunkName: "axios-lazy" */'@nextcloud/axios')
232-
const { generateOcsUrl } = await import(/* webpackChunkName: "router-gen-lazy" */'@nextcloud/router')
227+
const { default: axios } = await import('@nextcloud/axios')
228+
const { generateOcsUrl } = await import('@nextcloud/router')
233229
saveLastSelectedTaskType(taskType)
234230
const url = generateOcsUrl('taskprocessing/schedule')
235231
const params = {
@@ -242,8 +238,8 @@ export async function scheduleTask(appId, customId, taskType, inputs) {
242238
}
243239

244240
async function saveLastSelectedTaskType(taskType) {
245-
const { default: axios } = await import(/* webpackChunkName: "axios-lazy" */'@nextcloud/axios')
246-
const { generateUrl } = await import(/* webpackChunkName: "router-gen-lazy" */'@nextcloud/router')
241+
const { default: axios } = await import('@nextcloud/axios')
242+
const { generateUrl } = await import('@nextcloud/router')
247243

248244
const req = {
249245
values: {
@@ -255,8 +251,8 @@ async function saveLastSelectedTaskType(taskType) {
255251
}
256252

257253
async function getLastSelectedTaskType() {
258-
const { default: axios } = await import(/* webpackChunkName: "axios-lazy" */'@nextcloud/axios')
259-
const { generateUrl } = await import(/* webpackChunkName: "router-gen-lazy" */'@nextcloud/router')
254+
const { default: axios } = await import('@nextcloud/axios')
255+
const { generateUrl } = await import('@nextcloud/router')
260256

261257
const req = {
262258
params: {
@@ -316,10 +312,10 @@ async function showAssistantTaskResult(taskId) {
316312
* @return {Promise<void>}
317313
*/
318314
export async function openAssistantTask(task, { isInsideViewer = undefined, actionButtons = undefined } = {}) {
319-
const { default: Vue } = await import(/* webpackChunkName: "vue-lazy" */'vue')
315+
const { default: Vue } = await import('vue')
320316
Vue.mixin({ methods: { t, n } })
321-
const { showError } = await import(/* webpackChunkName: "dialogs-lazy" */'@nextcloud/dialogs')
322-
const { default: AssistantTextProcessingModal } = await import(/* webpackChunkName: "assistant-modal-lazy" */'./components/AssistantTextProcessingModal.vue')
317+
const { showError } = await import('@nextcloud/dialogs')
318+
const { default: AssistantTextProcessingModal } = await import('./components/AssistantTextProcessingModal.vue')
323319

324320
const modalId = 'assistantTextProcessingModal'
325321
const modalElement = document.createElement('div')
@@ -432,8 +428,8 @@ export async function addAssistantMenuEntry() {
432428
menuEntry.id = 'assistant'
433429
headerRight.prepend(menuEntry)
434430

435-
const { default: Vue } = await import(/* webpackChunkName: "vue-lazy" */'vue')
436-
const { default: AssistantHeaderMenuEntry } = await import(/* webpackChunkName: "assistant-header-lazy" */'./components/AssistantHeaderMenuEntry.vue')
431+
const { default: Vue } = await import('vue')
432+
const { default: AssistantHeaderMenuEntry } = await import('./components/AssistantHeaderMenuEntry.vue')
437433
Vue.mixin({ methods: { t, n } })
438434

439435
const View = Vue.extend(AssistantHeaderMenuEntry)

src/imageGenerationReference.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,10 @@
33

44
import { registerCustomPickerElement, NcCustomPickerRenderResult } from '@nextcloud/vue/dist/Components/NcRichText.js'
55

6-
// import { linkTo } from '@nextcloud/router'
7-
// import { getRequestToken } from '@nextcloud/auth'
8-
9-
// __webpack_nonce__ = btoa(getRequestToken()) // eslint-disable-line
10-
// __webpack_public_path__ = linkTo('assistant', 'js/') // eslint-disable-line
11-
126
registerCustomPickerElement('assistant_image_generation', async (el, { providerId, accessible }) => {
13-
const { default: Vue } = await import(/* webpackChunkName: "vue-lazy" */'vue')
7+
const { default: Vue } = await import('vue')
148
Vue.mixin({ methods: { t, n } })
15-
const { default: ImageResultCustomPickerElement } = await import(/* webpackChunkName: "reference-picker-lazy" */'./views/ImageResultCustomPickerElement.vue')
9+
const { default: ImageResultCustomPickerElement } = await import('./views/ImageResultCustomPickerElement.vue')
1610
const Element = Vue.extend(ImageResultCustomPickerElement)
1711

1812
const vueElement = new Element({

src/speechToTextReference.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,11 @@
2222
*/
2323

2424
import { registerCustomPickerElement, NcCustomPickerRenderResult } from '@nextcloud/vue/dist/Components/NcRichText.js'
25-
// import { linkTo } from '@nextcloud/router'
26-
// import { getRequestToken } from '@nextcloud/auth'
27-
28-
// __webpack_nonce__ = btoa(getRequestToken()) // eslint-disable-line
29-
// __webpack_public_path__ = linkTo('assistant', 'js/') // eslint-disable-line
3025

3126
registerCustomPickerElement('assistant_speech_to_text', async (el, { providerId, accessible }) => {
32-
const { default: Vue } = await import(/* webpackChunkName: "vue-lazy" */'vue')
27+
const { default: Vue } = await import('vue')
3328
Vue.mixin({ methods: { t, n } })
34-
const { default: TextResultCustomPickerElement } = await import(/* webpackChunkName: "reference-picker-lazy" */'./views/TextResultCustomPickerElement.vue')
29+
const { default: TextResultCustomPickerElement } = await import('./views/TextResultCustomPickerElement.vue')
3530
const Element = Vue.extend(TextResultCustomPickerElement)
3631
const vueElement = new Element({
3732
propsData: {

src/textGenerationReference.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,10 @@
33

44
import { registerCustomPickerElement, NcCustomPickerRenderResult } from '@nextcloud/vue/dist/Components/NcRichText.js'
55

6-
// import { linkTo } from '@nextcloud/router'
7-
// import { getRequestToken } from '@nextcloud/auth'
8-
9-
// __webpack_nonce__ = btoa(getRequestToken()) // eslint-disable-line
10-
// __webpack_public_path__ = linkTo('assistant', 'js/') // eslint-disable-line
11-
126
registerCustomPickerElement('assistant_text', async (el, { providerId, accessible }) => {
13-
const { default: Vue } = await import(/* webpackChunkName: "vue-lazy" */'vue')
7+
const { default: Vue } = await import('vue')
148
Vue.mixin({ methods: { t, n } })
15-
const { default: TextResultCustomPickerElement } = await import(/* webpackChunkName: "reference-picker-lazy" */'./views/TextResultCustomPickerElement.vue')
9+
const { default: TextResultCustomPickerElement } = await import('./views/TextResultCustomPickerElement.vue')
1610
const Element = Vue.extend(TextResultCustomPickerElement)
1711
const vueElement = new Element({
1812
propsData: {

webpack.js

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)