Skip to content

Commit

Permalink
started working towards separate type package
Browse files Browse the repository at this point in the history
  • Loading branch information
foxriver76 committed Apr 5, 2024
1 parent 7563f7c commit 0ea3f77
Show file tree
Hide file tree
Showing 2,046 changed files with 47,288 additions and 1,482 deletions.
41 changes: 9 additions & 32 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/.idea/
/node_modules
node_modules
*.zip
**/*.zip
*.tgz
Expand All @@ -8,40 +8,17 @@
/lib/js
/lib/css
/www/_socket
/knx-uf-iconset
/cordova/www
/cordova/platforms/android/assets/www
/cordova/platforms/android/.gradle
/cordova/platforms/android/build
/cordova/platforms/android/CordovaLib/build
/www/edit.full.html
/www/index.full.html
/www/worker-css.js
/www/worker-html.js
/www/worker-javascript.js
/www/css/vis.min.css
/www/css/visEdit.min.css
/www/js/vis.min.js
/www/js/vis.mmin.js
/www/js/visEdit.min.js
/www/js/visEdit.mmin.js
/www/css/channel.png
/www/css/device.png
/www/css/icons.gif
/www/css/loading.gif
/www/css/state.png
/iob_npm.done
/package-lock.json
knx-uf-iconset
iob_npm.done
package-lock.json
admin/i18n/*/flat.txt
admin/i18n/flat.txt
*.vis.code-workspace
/beta
beta

/src/package-lock.json
/src/node_modules
src/build
/.vscode
/src/dist
/www
/runtime
/tmp
src/dist
**/www
**/runtime
**/tmp
25 changes: 25 additions & 0 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": "2.9.48",
"packages": [
"packages/*"
],
"command": {
"run": {
"stream": true
},
"version": {
"npmClientArgs": [
"-f"
],
"allowBranch": [
"master"
],
"ignoreChanges": [
"*.md"
],
"exact": true,
"forcePublish": true
}
},
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
139 changes: 72 additions & 67 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,75 +1,80 @@
{
"name": "iobroker.vis-2",
"description": "Next generation graphical user interface for ioBroker.",
"version": "2.9.48",
"author": {
"name": "bluefox",
"email": "[email protected]"
},
"contributors": [
"bluefox <[email protected]>",
"hobbyquaker <[email protected]>"
],
"homepage": "https://github.com/iobroker/iobroker.vis-2",
"repository": {
"type": "git",
"url": "git+https://github.com/ioBroker/ioBroker.vis-2.git"
},
"keywords": [
"iobroker",
"GUI",
"DashUI",
"web interface",
"home automation",
"SCADA",
"vis-2"
"name": "iobroker.admin-mono",
"private": true,
"workspaces": [
"packages/*"
],
"dependencies": {
"@iobroker/adapter-core": "^3.0.6",
"axios": "^1.6.8",
"jsonwebtoken": "^9.0.2",
"mime": "^3.0.0"
"@iobroker/types-vis-2": "file:packages/types-vis-2",
"iobroker.vis-2": "file:packages/vis-2"
},
"devDependencies": {
"@alcalzone/release-script": "^3.7.0",
"@alcalzone/release-script-plugin-iobroker": "^3.7.0",
"@alcalzone/release-script-plugin-license": "^3.7.0",
"@iobroker/vis-2-widgets-testing": "^1.0.0",
"@tsconfig/node18": "^18.2.4",
"@types/mocha": "^10.0.6",
"chai": "^5.1.0",
"gulp": "^4.0.2",
"iobroker.web": "*",
"mocha": "^10.4.0",
"typescript": "^5.4.3",
"unzipper": "^0.10.14"
"lerna": "^8.1.2",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@craco/craco": "^7.1.0",
"@devbookhq/splitter": "^1.4.2",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@iobroker/adapter-react-v5": "^4.13.4",
"@iobroker/type-detector": "^3.0.5",
"@iobroker/types": "^5.0.19",
"@iobroker/vis-2-widgets-react-dev": "^1.0.5",
"@material-icons/svg": "^1.0.33",
"@mui/icons-material": "^5.15.14",
"@mui/material": "5.14.14",
"@mui/styles": "5.14.14",
"@mui/x-date-pickers": "^7.1.0",
"@reduxjs/toolkit": "^2.2.3",
"@sentry/browser": "^7.109.0",
"@sentry/integrations": "^7.109.0",
"@types/dom-speech-recognition": "^0.0.4",
"@types/react-beautiful-dnd": "^13.1.8",
"@types/uuid": "^9.0.8",
"ace-builds": "^1.32.9",
"craco-module-federation": "^1.1.0",
"dayjs": "^1.11.10",
"echarts": "^5.5.0",
"echarts-for-react": "^3.0.2",
"eslint": "^8.57.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-eqeqeq-fix": "^1.0.3",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-only-warn": "^1.1.0",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.0",
"html-to-image": "^1.11.11",
"jquery-ui": "^1.13.2",
"mime": "^4.0.1",
"moment": "^2.30.1",
"mui-nested-menu": "^3.3.0",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-ace": "^11.0.1",
"react-beautiful-dnd": "^13.1.1",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dnd-preview": "^8.0.3",
"react-dnd-touch-backend": "^16.0.1",
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.3",
"react-icons": "^5.0.1",
"react-scripts": "^5.0.1",
"redux": "^5.0.1",
"sass": "^1.72.0",
"uuid": "^9.0.1"
},
"bugs": {
"url": "https://github.com/iobroker/iobroker.vis/issues"
},
"main": "main.js",
"files": [
"admin/",
"img/",
"lib/",
"www/",
"io-package.json",
"LICENSE",
"main.js"
],
"scripts": {
"check-ts": "tsc --project src/tsconfig.json",
"start": "cd src && npm run start",
"test": "mocha ./test/*.engine.js --exit",
"test-gui": "mocha ./test/*.gui.js --exit",
"prepublishOnly": "gulp",
"build": "gulp",
"build": "npm run clean && lerna run build",
"clean": "lerna run clean",
"install-monorepo": "npm i -f && npm i -w packages/vis-2 -f",
"npm": "npm run install-monorepo",
"start": "npm run start -w packages/vis-2",
"fix-release": "node fixRelease.js",
"release": "release-script",
"release-patch": "release-script patch --yes --no-update-lockfile",
"release-minor": "release-script minor --yes --no-update-lockfile",
"release-major": "release-script major --yes --no-update-lockfile",
"update-packages": "ncu --upgrade && cd src && ncu --upgrade && cd ..",
"npm": "npm i && cd src && npm i -f"
},
"license": "CC-BY-NC-4.0"
}
"release-patch": "release-script patch --yes --no-update-lockfile --publishAll",
"release-minor": "release-script minor --yes --no-update-lockfile --publishAll",
"release-major": "release-script major --yes --no-update-lockfile --publishAll"
}
}
22 changes: 22 additions & 0 deletions packages/fixRelease.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/**
* Release script adds a version entry to private packages, which introduces conflicts in following releases
*/
const fs = require('fs');
const path = require('path');

function removePackEntry() {
const packPath = path.join(__dirname, 'packages', 'vis-2', 'src', 'package.json');
const packString = fs.readFileSync(packPath, {
encoding: 'utf-8',
});

const packJson = JSON.parse(packString);

delete packJson.version;

fs.writeFileSync(packPath, JSON.stringify(packJson, null, 2), { encoding: 'utf-8' });
}

if (require.main === module) {
removePackEntry();
}
Loading

0 comments on commit 0ea3f77

Please sign in to comment.