Skip to content
This repository was archived by the owner on Oct 1, 2022. It is now read-only.
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 .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
extends: [
'nextcloud'
'@nextcloud'
]
};
10,196 changes: 4,638 additions & 5,558 deletions package-lock.json

Large diffs are not rendered by default.

27 changes: 13 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,17 @@
"license": "agpl",
"private": true,
"scripts": {
"build": "NODE_ENV=production webpack --progress --hide-modules --config webpack.prod.js",
"dev": "NODE_ENV=development webpack --progress --config webpack.dev.js",
"watch": "NODE_ENV=development webpack --progress --watch --config webpack.dev.js",
"build": "NODE_ENV=production webpack --progress --hide-modules --config webpack.js",
"dev": "NODE_ENV=development webpack --progress --config webpack.js",
"watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
"lint": "eslint --ext .js,.vue src",
"lint:fix": "eslint --ext .js,.vue src --fix",
"stylelint": "stylelint src",
"stylelint:fix": "stylelint src --fix"
},
"dependencies": {
"@bundle-analyzer/webpack-plugin": "^0.5.1",
"@nextcloud/l10n": "^1.3.0",
"@nextcloud/vue": "^2.2.1",
"nextcloud-l10n": "^0.1.1",
"vue": "^2.6.11"
},
"browserslist": [
Expand All @@ -49,32 +48,32 @@
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/preset-env": "^7.10.4",
"@nextcloud/browserslist-config": "^1.0.0",
"@nextcloud/eslint-config": "^2.2.0",
"@nextcloud/eslint-plugin": "^1.4.0",
"@vue/test-utils": "^1.0.3",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"css-loader": "^3.6.0",
"eslint": "^5.16.0",
"eslint-config-nextcloud": "0.1.1",
"eslint": "^6.8.0",
"eslint-config-standard": "^14.1.1",
"eslint-import-resolver-webpack": "^0.12.2",
"eslint-loader": "^4.0.2",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-nextcloud": "^0.3.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^6.2.2",
"node-sass": "^4.14.1",
"sass-loader": "^9.0.2",
"stylelint": "^10.1.0",
"stylelint-config-recommended-scss": "^3.3.0",
"sass-loader": "^8.0.2",
"stylelint": "^13.6.1",
"stylelint-config-recommended-scss": "^4.2.0",
"stylelint-scss": "^3.18.0",
"stylelint-webpack-plugin": "^1.2.3",
"stylelint-webpack-plugin": "^2.1.0",
"vue-loader": "^15.9.3",
"vue-template-compiler": "^2.6.11",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.0.8",
"webpack-node-externals": "^2.3.0"
"webpack-merge": "^4.2.2",
"webpack-vue-config": "git+https://github.com/skjnldsv/webpack-vue-config.git"
}
}
6 changes: 3 additions & 3 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
button-id="new-vueexample-button"
button-class="icon-add"
@click="newButtonAction" />
<ul id="app-vueexample-navigation">
<template id="app-vueexample-navigation" #list>
<AppNavigationItem icon="icon-user" title="This is a user">
<AppNavigationCounter slot="counter" :highlighted="true">
99+
Expand Down Expand Up @@ -92,7 +92,7 @@
<AppNavigationItem title="Third pinned item"
icon="icon-category-enabled"
:pinned="true" />
</ul>
</template>
<AppNavigationSettings>
Example settings
</AppNavigationSettings>
Expand Down Expand Up @@ -186,7 +186,7 @@ export default {
ActionText,
ActionTextEditable,
},
data: function() {
data() {
return {
loading: false,
date: Date.now() + 86400000 * 3,
Expand Down
2 changes: 1 addition & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*/
import Vue from 'vue'
import { translate, translatePlural } from 'nextcloud-l10n'
import { translate, translatePlural } from '@nextcloud/l10n'

import App from './App'

Expand Down
12 changes: 6 additions & 6 deletions .stylelintrc.js → stylelint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ module.exports = {
'rule-empty-line-before': [
'always',
{
ignore: ['after-comment', 'inside-block']
}
ignore: ['after-comment', 'inside-block'],
},
],
'declaration-empty-line-before': [
'never',
{
ignore: ['after-declaration']
}
ignore: ['after-declaration'],
},
],
'comment-empty-line-before': null,
'selector-type-case': null,
'selector-list-comma-newline-after': null,
'no-descending-specificity': null,
'string-quotes': 'single'
'string-quotes': 'single',
},
plugins: ['stylelint-scss']
plugins: ['stylelint-scss'],
}
56 changes: 0 additions & 56 deletions webpack.common.js

This file was deleted.

7 changes: 0 additions & 7 deletions webpack.dev.js

This file was deleted.

6 changes: 6 additions & 0 deletions webpack.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const webpackConfig = require('webpack-vue-config')

if (process.env.NODE_ENV === 'production') {
module.exports = webpackConfig.prod
}
module.exports = webpackConfig.dev
7 changes: 0 additions & 7 deletions webpack.prod.js

This file was deleted.