From 8922b51dcf15889a51e95d29981900e219d01235 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 23 May 2022 19:16:47 +0200 Subject: [PATCH 1/2] devops: Update License in all package.json --- admin/package.json | 2 +- backend/package.json | 2 +- database/package.json | 2 +- frontend/#package.json# | 105 ++++++++++++++++++++++++++++++++++++++++ frontend/package.json | 1 + package.json | 2 +- 6 files changed, 110 insertions(+), 4 deletions(-) create mode 100755 frontend/#package.json# diff --git a/admin/package.json b/admin/package.json index 57711b8be..771e7991e 100644 --- a/admin/package.json +++ b/admin/package.json @@ -4,7 +4,7 @@ "main": "index.js", "author": "Moriz Wahl", "version": "1.8.3", - "license": "MIT", + "license": "Apache License 2.0", "private": false, "scripts": { "start": "node run/server.js", diff --git a/backend/package.json b/backend/package.json index 678e3578a..7bb404520 100644 --- a/backend/package.json +++ b/backend/package.json @@ -5,7 +5,7 @@ "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/backend", "author": "Ulf Gebhardt", - "license": "MIT", + "license": "Apache License 2.0", "private": false, "scripts": { "build": "tsc --build", diff --git a/database/package.json b/database/package.json index f5a16fd31..19d21dd5b 100644 --- a/database/package.json +++ b/database/package.json @@ -5,7 +5,7 @@ "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/database", "author": "Ulf Gebhardt", - "license": "MIT", + "license": "Apache License 2.0", "private": false, "scripts": { "build": "mkdir -p build/src/config/ && cp src/config/*.txt build/src/config/ && tsc --build", diff --git a/frontend/#package.json# b/frontend/#package.json# new file mode 100755 index 000000000..9c862d2a8 --- /dev/null +++ b/frontend/#package.json# @@ -0,0 +1,105 @@ +{ + "name": "bootstrap-vue-gradido-wallet", + "version": "1.8.3", + "private": true, + "scripts": { + "start": "node run/server.js", + "serve": "vue-cli-service serve --open", + "build": "vue-cli-service build", + "dev": "yarn run serve", + "analyse-bundle": "yarn build && webpack-bundle-analyzer dist/webpack.stats.json", + "lint": "eslint --max-warnings=0 --ext .js,.vue,.json .", + "stylelint": "stylelint --max-warnings=0 '**/*.{scss,vue}'", + "test": "cross-env TZ=UTC jest --coverage", + "locales": "scripts/sort.sh" + }, + "dependencies": { + "@babel/core": "^7.13.13", + "@babel/node": "^7.13.13", + "@babel/preset-env": "^7.13.12", + "@vue/cli-plugin-unit-jest": "^4.5.12", + "@vue/test-utils": "^1.1.3", + "apollo-boost": "^0.4.9", + "babel-core": "^7.0.0-bridge.0", + "babel-jest": "^27.3.1", + "babel-preset-vue": "^2.0.2", + "bootstrap": "^4.5.3", + "bootstrap-vue": "^2.21.2", + "clipboard-polyfill": "^4.0.0-rc1", + "es6-promise": "^4.1.1", + "eslint": "^7.25.0", + "eslint-config-prettier": "^8.1.0", + "eslint-config-standard": "^16.0.2", + "eslint-loader": "^4.0.2", + "eslint-plugin-import": "^2.22.1", + "eslint-plugin-jest": "^24.3.2", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-promise": "^4.3.1", + "eslint-plugin-vue": "^7.8.0", + "express": "^4.17.1", + "flatpickr": "^4.5.7", + "flush-promises": "^1.0.2", + "graphql": "^15.5.1", + "identity-obj-proxy": "^3.0.0", + "jest": "^26.6.3", + "jest-canvas-mock": "^2.3.1", + "jest-environment-jsdom-sixteen": "^2.0.0", + "particles-bg-vue": "1.2.3", + "portal-vue": "^2.1.7", + "prettier": "^2.2.1", + "qrcanvas-vue": "2.1.1", + "regenerator-runtime": "^0.13.7", + "vee-validate": "^3.4.5", + "vue": "2.6.12", + "vue-apollo": "^3.0.7", + "vue-flatpickr-component": "^8.1.2", + "vue-focus": "^2.1.0", + "vue-i18n": "^8.22.4", + "vue-jest": "^3.0.7", + "vue-loading-overlay": "^3.4.2", + "vue-moment": "^4.1.0", + "vue-router": "^3.0.6", + "vue2-transitions": "^0.2.3", + "vuex": "^3.6.0", + "vuex-persistedstate": "^4.0.0-beta.3" + }, + "devDependencies": { + "@intlify/eslint-plugin-vue-i18n": "^1.4.0", + "@vue/cli-plugin-babel": "^3.7.0", + "@vue/cli-plugin-eslint": "^3.7.0", + "@vue/cli-service": "^3.7.0", + "@vue/eslint-config-prettier": "^4.0.1", + "babel-eslint": "^10.1.0", + "babel-plugin-component": "^1.1.0", + "babel-plugin-transform-require-context": "^0.1.1", + "cross-env": "^7.0.3", + "dotenv-webpack": "^7.0.3", + "postcss": "^8.4.8", + "postcss-html": "^1.3.0", + "postcss-scss": "^4.0.3", + "sass": "1.32.13", + "sass-loader": "^10", + "stats-webpack-plugin": "^0.7.0", + "stylelint": "^14.5.3", + "stylelint-config-recommended-vue": "^1.3.0", + "stylelint-config-standard-scss": "^3.0.0", + "vue-cli-plugin-i18n": "^1.0.1", + "vue-html-webpack-plugin": "^3.2.2", + "vue-template-compiler": "^2.6.11", + "webpack-bundle-analyzer": "^4.5.0" + }, + "postcss": { + "plugins": { + "autoprefixer": {} + } + }, + "browserslist": [ + "> 1%", + "last 2 versions", + "not ie <= 10" + ], + "author": "Gradido-Akademie - https://www.gradido.net/", + "license": "Apache License 2.0", + "description": "Gradido, the Natural Economy of Life, is a way to worldwide prosperity and peace in harmony with nature. - Gradido, die Natürliche Ökonomie des lebens, ist ein Weg zu weltweitem Wohlstand und Frieden in Harmonie mit der Natur." +} diff --git a/frontend/package.json b/frontend/package.json index 9d70ace58..9c862d2a8 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -100,5 +100,6 @@ "not ie <= 10" ], "author": "Gradido-Akademie - https://www.gradido.net/", + "license": "Apache License 2.0", "description": "Gradido, the Natural Economy of Life, is a way to worldwide prosperity and peace in harmony with nature. - Gradido, die Natürliche Ökonomie des lebens, ist ein Weg zu weltweitem Wohlstand und Frieden in Harmonie mit der Natur." } diff --git a/package.json b/package.json index 20ab8dd35..4baa9c48f 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "repository": "git@github.com:gradido/gradido.git", "author": "Ulf Gebhardt ", - "license": "MIT", + "license": "Apache License 2.0", "scripts": { "release": "scripts/release.sh" }, From d0a119ade9d62c4a865274220968dbdab24ecf1f Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 23 May 2022 19:18:48 +0200 Subject: [PATCH 2/2] Delete #package.json# --- frontend/#package.json# | 105 ---------------------------------------- 1 file changed, 105 deletions(-) delete mode 100755 frontend/#package.json# diff --git a/frontend/#package.json# b/frontend/#package.json# deleted file mode 100755 index 9c862d2a8..000000000 --- a/frontend/#package.json# +++ /dev/null @@ -1,105 +0,0 @@ -{ - "name": "bootstrap-vue-gradido-wallet", - "version": "1.8.3", - "private": true, - "scripts": { - "start": "node run/server.js", - "serve": "vue-cli-service serve --open", - "build": "vue-cli-service build", - "dev": "yarn run serve", - "analyse-bundle": "yarn build && webpack-bundle-analyzer dist/webpack.stats.json", - "lint": "eslint --max-warnings=0 --ext .js,.vue,.json .", - "stylelint": "stylelint --max-warnings=0 '**/*.{scss,vue}'", - "test": "cross-env TZ=UTC jest --coverage", - "locales": "scripts/sort.sh" - }, - "dependencies": { - "@babel/core": "^7.13.13", - "@babel/node": "^7.13.13", - "@babel/preset-env": "^7.13.12", - "@vue/cli-plugin-unit-jest": "^4.5.12", - "@vue/test-utils": "^1.1.3", - "apollo-boost": "^0.4.9", - "babel-core": "^7.0.0-bridge.0", - "babel-jest": "^27.3.1", - "babel-preset-vue": "^2.0.2", - "bootstrap": "^4.5.3", - "bootstrap-vue": "^2.21.2", - "clipboard-polyfill": "^4.0.0-rc1", - "es6-promise": "^4.1.1", - "eslint": "^7.25.0", - "eslint-config-prettier": "^8.1.0", - "eslint-config-standard": "^16.0.2", - "eslint-loader": "^4.0.2", - "eslint-plugin-import": "^2.22.1", - "eslint-plugin-jest": "^24.3.2", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-promise": "^4.3.1", - "eslint-plugin-vue": "^7.8.0", - "express": "^4.17.1", - "flatpickr": "^4.5.7", - "flush-promises": "^1.0.2", - "graphql": "^15.5.1", - "identity-obj-proxy": "^3.0.0", - "jest": "^26.6.3", - "jest-canvas-mock": "^2.3.1", - "jest-environment-jsdom-sixteen": "^2.0.0", - "particles-bg-vue": "1.2.3", - "portal-vue": "^2.1.7", - "prettier": "^2.2.1", - "qrcanvas-vue": "2.1.1", - "regenerator-runtime": "^0.13.7", - "vee-validate": "^3.4.5", - "vue": "2.6.12", - "vue-apollo": "^3.0.7", - "vue-flatpickr-component": "^8.1.2", - "vue-focus": "^2.1.0", - "vue-i18n": "^8.22.4", - "vue-jest": "^3.0.7", - "vue-loading-overlay": "^3.4.2", - "vue-moment": "^4.1.0", - "vue-router": "^3.0.6", - "vue2-transitions": "^0.2.3", - "vuex": "^3.6.0", - "vuex-persistedstate": "^4.0.0-beta.3" - }, - "devDependencies": { - "@intlify/eslint-plugin-vue-i18n": "^1.4.0", - "@vue/cli-plugin-babel": "^3.7.0", - "@vue/cli-plugin-eslint": "^3.7.0", - "@vue/cli-service": "^3.7.0", - "@vue/eslint-config-prettier": "^4.0.1", - "babel-eslint": "^10.1.0", - "babel-plugin-component": "^1.1.0", - "babel-plugin-transform-require-context": "^0.1.1", - "cross-env": "^7.0.3", - "dotenv-webpack": "^7.0.3", - "postcss": "^8.4.8", - "postcss-html": "^1.3.0", - "postcss-scss": "^4.0.3", - "sass": "1.32.13", - "sass-loader": "^10", - "stats-webpack-plugin": "^0.7.0", - "stylelint": "^14.5.3", - "stylelint-config-recommended-vue": "^1.3.0", - "stylelint-config-standard-scss": "^3.0.0", - "vue-cli-plugin-i18n": "^1.0.1", - "vue-html-webpack-plugin": "^3.2.2", - "vue-template-compiler": "^2.6.11", - "webpack-bundle-analyzer": "^4.5.0" - }, - "postcss": { - "plugins": { - "autoprefixer": {} - } - }, - "browserslist": [ - "> 1%", - "last 2 versions", - "not ie <= 10" - ], - "author": "Gradido-Akademie - https://www.gradido.net/", - "license": "Apache License 2.0", - "description": "Gradido, the Natural Economy of Life, is a way to worldwide prosperity and peace in harmony with nature. - Gradido, die Natürliche Ökonomie des lebens, ist ein Weg zu weltweitem Wohlstand und Frieden in Harmonie mit der Natur." -}