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

feat: Migrate to build the frontend using vite #673

Merged
merged 1 commit into from
Mar 7, 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
5 changes: 0 additions & 5 deletions .eslintrc.js

This file was deleted.

8 changes: 8 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": [
"@nextcloud"
],
"globals": {
"__dirname": "readonly"
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
css/
js/
node_modules/

Expand Down
File renamed without changes.
5 changes: 0 additions & 5 deletions babel.config.js

This file was deleted.

4 changes: 4 additions & 0 deletions lib/Settings/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ public function getForm() {
'newUserGenerateUserID' => $this->config->isGenerateUserId(),
]
);

\OCP\Util::addScript(Application::APP_ID, 'ldap_write_suppport-admin-settings');
\OCP\Util::addStyle(Application::APP_ID, 'ldap_write_suppport-admin-settings');

return new TemplateResponse(Application::APP_ID, 'settings-admin');
}

Expand Down
15,385 changes: 4,769 additions & 10,616 deletions package-lock.json

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
"private": true,
"author": "Arthur Schiwon",
"license": "AGPL-3.0",
"type": "module",
"scripts": {
"build": "NODE_ENV=production webpack --progress --config webpack.js",
"dev": "NODE_ENV=development webpack --config webpack.js",
"build": "vite --mode production build",
"dev": "vite --mode development build",
"lint": "eslint --ext .js,.vue src",
"lint:fix": "eslint --ext .js,.vue src --fix",
"stylelint": "stylelint src css",
Expand All @@ -20,22 +21,20 @@
"esversion": 6
},
"dependencies": {
"@nextcloud/dialogs": "^4.2.5",
"@nextcloud/dialogs": "^5.2.0",
"@nextcloud/initial-state": "^2.1.0",
"@nextcloud/vue": "^8.6.2",
"@nextcloud/vue": "^8.9.1",
"vue": "^2.7.16"
},
"engines": {
"node": "^20.0.0",
"npm": "^10.0.0"
},
"devDependencies": {
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^3.0.0",
"@nextcloud/eslint-config": "^8.3.0",
"@nextcloud/stylelint-config": "^2.4.0",
"@nextcloud/webpack-vue-config": "^6.0.1",
"file-loader": "^6.2.0",
"url-loader": "^4.1.1"
"@nextcloud/vite-config": "^1.2.2",
"vite": "^5.1.5"
}
}
2 changes: 1 addition & 1 deletion src/components/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox.js
import { showError } from '@nextcloud/dialogs'
import i10n from '../mixins/i10n.js'

import '@nextcloud/dialogs/dist/index.css'
import '@nextcloud/dialogs/style.css'

export default {
name: 'AdminSettings',
Expand Down
5 changes: 4 additions & 1 deletion src/main-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import Vue from 'vue'
import { loadState } from '@nextcloud/initial-state'
import Vue from 'vue'

import AdminSettings from './components/AdminSettings.vue'

// eslint-disable-next-line import/no-unresolved, n/no-missing-import
import 'vite/modulepreload-polyfill'

const View = Vue.extend(AdminSettings)
const AppID = 'ldap_write_support'

Expand Down
4 changes: 0 additions & 4 deletions templates/settings-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

use OCA\LdapWriteSupport\AppInfo\Application;

script(Application::APP_ID, 'ldap_write_suppport-admin-settings');
?>
<div id="ldap-write-support-admin-settings">
</div>
6 changes: 6 additions & 0 deletions vite.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { createAppConfig } from '@nextcloud/vite-config'
import { join } from 'node:path'

export default createAppConfig({
'admin-settings': join(__dirname, 'src/main-settings.js'),
})
35 changes: 0 additions & 35 deletions webpack.js

This file was deleted.

Loading