Merge pull request #2331 from nextcloud/techdebt/noid/move-admin-sett…

…ings-to-src-folder

Move admin settings to src/ folder

.drone.yml

@@ -12,11 +12,6 @@
 #    commands:
 #      - make npm-init
 #      - ./check-vuejs-builds.sh
-#  - name: check-handlebars-templates
-#    image: node:lts
-#    commands:
-#      - make npm-init
-#      - ./check-handlebars-templates.sh
 #
 #trigger:
 #  branch:

.eslintrc.js

@@ -1,99 +1,5 @@
 module.exports = {
-	root: true,
-	env: {
-		browser: true,
-		es6: true,
-		node: true,
-		jest: true
-	},
-	globals: {
-		t: true,
-		n: true,
-		OC: true,
-		OCA: true,
-		Vue: true,
-		VueRouter: true
-	},
-	parserOptions: {
-		parser: 'babel-eslint',
-		ecmaVersion: 6
-	},
 	extends: [
-		'eslint:recommended',
-		'plugin:import/errors',
-		'plugin:import/warnings',
-		'plugin:node/recommended',
-		'plugin:vue/essential',
-		'plugin:vue/recommended',
-		'plugin:nextcloud/recommended',
-		'standard'
-	],
-	settings: {
-		'import/resolver': {
-			webpack: {
-				config: 'webpack.common.js'
-			},
-			node: {
-				paths: ['src'],
-				extensions: ['.js', '.vue']
-			}
-		}
-	},
-	plugins: ['vue', 'node'],
-	rules: {
-		// space before function ()
-		'space-before-function-paren': ['error', 'never'],
-		// curly braces always space
-		'object-curly-spacing': ['error', 'always'],
-		// stay consistent with array brackets
-		'array-bracket-newline': ['error', 'consistent'],
-		// 1tbs brace style
-		'brace-style': 'error',
-		// tabs only
-		indent: ['error', 'tab'],
-		'no-tabs': ['off'],
-		'vue/html-indent': ['error', 'tab'],
-		// only debug console
-		'no-console': ['error', { allow: ['error', 'warn', 'info', 'debug'] }],
-		// classes blocks
-		'padded-blocks': ['error', { classes: 'always' }],
-		// always have the operator in front
-		'operator-linebreak': ['error', 'before'],
-		// ternary on multiline
-		'multiline-ternary': ['error', 'always-multiline'],
-		// force proper JSDocs
-		'valid-jsdoc': [2, {
-			'prefer': {
-				'return': 'returns'
-			},
-			'requireReturn': false,
-			'requireReturnDescription': false
-		}],
-		// es6 import/export and require
-		'node/no-unpublished-require': ['off'],
-		'node/no-unsupported-features/es-syntax': ['off'],
-		// PascalCase components names for vuejs
-		// https://vuejs.org/v2/style-guide/#Single-file-component-filename-casing-strongly-recommended
-		'vue/component-name-in-template-casing': ['error', 'PascalCase'],
-		// force name
-		'vue/match-component-file-name': ['error', {
-			'extensions': ['jsx', 'vue', 'js'],
-			'shouldMatchCase': true
-		 }],
-		// space before self-closing elements
-		'vue/html-closing-bracket-spacing': 'error',
-		// no ending html tag on a new line
-		'vue/html-closing-bracket-newline': ['error', { multiline: 'never' }],
-		// code spacing with attributes
-		'vue/max-attributes-per-line': [
-			'error',
-			{
-				singleline: 3,
-				multiline: {
-					max: 3,
-					allowFirstLine: true
-				}
-			}
-		]
-	}
+		'nextcloud'
+	]
 }

Makefile

@@ -15,57 +15,37 @@ all: dev-setup build-js-production
 
 dev-setup: clean-dev npm-init
 
-dependabot: dev-setup npm-update build-js-production compile-handlebars-templates bundle-simplewebrtc
+dependabot: dev-setup npm-update build-js-production bundle-simplewebrtc
 
 release: appstore create-tag
 
 build-js:
 	npm run dev
-	cd vue/ && npm run dev
 
 build-js-production:
 	npm run build
-	cd vue/ && npm run build
 
 watch-js:
 	npm run watch
-	cd vue/ && npm run watch
 
 lint:
 	npm run lint
-	cd vue/ && npm run lint
 
 lint-fix:
 	npm run lint:fix
-	cd vue/ && npm run lint:fix
 
-npm-init: npm-init-root npm-init-vue
-
-npm-init-root:
+npm-init:
 	npm install
 
-npm-init-vue:
-	cd vue/ && npm install
-
 npm-update:
 	npm update
-	cd vue/ && npm update
 
 clean:
-	rm -f js/admin/*.js
-	rm -f js/admin/*.js.map
-	rm -f js/collections.js
-	rm -f js/collections.js.map
-	rm -f js/collectionsintegration.js
-	rm -f js/collectionsintegration.js.map
+	rm -rf js/*
 	rm -rf $(build_dir)
 
 clean-dev: clean
 	rm -rf node_modules
-	cd vue/ && rm -rf node_modules
-
-compile-handlebars-templates:
-	bash compile-handlebars-templates.sh
 
 bundle-simplewebrtc:
 	# webrtc-adapter uses JavaScript features not supported by browserify,
@@ -87,8 +67,6 @@ appstore:
 	--exclude=bower.json \
 	--exclude=.bowerrc \
 	--exclude=/build \
-	--exclude=check-handlebars-templates.sh \
-	--exclude=compile-handlebars-templates.sh \
 	--exclude=docs \
 	--exclude=.drone.yml \
 	--exclude=.eslintignore \
@@ -99,7 +77,6 @@ appstore:
 	--exclude=.gitignore \
 	--exclude=.jscsrc \
 	--exclude=.jshintignore \
-	--exclude=js/views/templates \
 	--exclude=js/**.js.map \
 	--include=js/simplewebrtc/bundled.js \
 	--exclude=js/simplewebrtc/*.js \
@@ -114,11 +91,11 @@ appstore:
 	--exclude=README.md \
 	--exclude=run-*lint.sh \
 	--exclude=.scrutinizer.yml \
+	--exclude=src \
 	--exclude=.stylelintrc \
 	--exclude=tests \
 	--exclude=.travis.yml \
 	--exclude=.tx \
-	--exclude=vue \
 	$(project_dir)/  $(sign_dir)/$(app_name)
 	@if [ -f $(cert_dir)/$(app_name).key ]; then \
 		echo "Signing app files…"; \

check-vuejs-builds.sh

@@ -9,5 +9,3 @@ git status
 bash -c "[[ ! \"`git status --porcelain js`\" ]] || ( echo 'Uncommitted changes in built Vue files' && exit 1 )"
 
 bash -c "[[ ! \"`git status --porcelain package-lock.json`\" ]] || ( git diff package-lock.json && echo 'Uncommitted changes in package-lock.json' && exit 1 )"
-
-bash -c "[[ ! \"`git status --porcelain vue/package-lock.json`\" ]] || ( git diff vue/package-lock.json && echo 'Uncommitted changes in vue/package-lock.json' && exit 1 )"