outsource jsonConfig into reusable module (#2249)

**TODO**: - final test of release after merge
ioBroker · Dec 20, 2023 · 13a2c9a · 13a2c9a
1 parent 43b7c4d
commit 13a2c9a
Show file tree

Hide file tree

Showing 808 changed files with 75,259 additions and 1,785 deletions.
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -31,20 +31,30 @@ jobs:
           node-version: 18.x
 
       - name: 'Install'
-        run: npm i
+        run: |
+          npm i -f
+
+      - name: 'Install Adapter'
+        run: |
+          cd packages/admin
+          npm i -f
 
       - name: 'Install FE'
         run: | 
-          cd src
+          cd packages/admin/src
           npm i --force
 
+      - name: 'Build JsonConfig'
+        run: npm run build -w packages/jsonConfig/
+
       - name: Check TypeScript files
         run: |
-          cd src
+          cd packages/admin/src
           npm run check-ts
 
       - name: 'Build'
-        run: NODE_OPTIONS=--max_old_space_size=4096 npm run build
+        run: |
+          NODE_OPTIONS=--max_old_space_size=4096 npm run build
 
   # Runs adapter tests on all supported node versions and OSes
   adapter-tests:
@@ -66,18 +76,10 @@ jobs:
           node-version: ${{ matrix.node-version }}
 
       - name: Install Dependencies
-        run: npm install
+        run: npm i -f
 
       - name: Run local tests
-        run: npm test
-#      - name: Run unit tests
-#        run: npm run test:unit
-#      - name: Run integration tests # (linux/osx)
-#        if: startsWith(runner.OS, 'windows') == false
-#        run: DEBUG=testing:* npm run test:integration
-#      - name: Run integration tests # (windows)
-#        if: startsWith(runner.OS, 'windows')
-#        run: set DEBUG=testing:* & npm run test:integration
+        run: npm test -w packages/admin/
 
   adapter-tests-gui:
     if: contains(github.event.head_commit.message, '[skip ci]') == false
@@ -94,13 +96,18 @@ jobs:
           node-version: 18.x
 
       - name: Install Dependencies
-        run: npm install
+        run: |
+          npm i -f
+          npm i -f -w packages/jsonConfig
+          npm i -f -w packages/admin
+          cd packages/admin/src
+          npm i -f
 
       - name: Build
         run: NODE_OPTIONS=--max_old_space_size=8192 npm run build
 
       - name: Run GUI tests
-        run: npm run test:gui
+        run: npm run test:gui -w packages/admin/
 
       - name: Archive screenshots
         if: always()
@@ -145,13 +152,19 @@ jobs:
           echo "::set-output name=BODY::$BODY"
 
       - name: Install Dependencies
-        run: npm install
+        run: |
+          npm i -f
+          npm i -f -w packages/jsonConfig
+          npm i -f -w packages/admin
+          cd packages/admin/src
+          npm i -f
 
       - name: Publish package to npm
         run: |
           npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
           npm whoami
-          npm publish
+          npm publish -w packages/admin
+          npm publish -w packages/jsonConfig
 
       - name: Create Github Release
         uses: actions/create-release@v1

diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
 node_modules
 .idea
-/src/.eslintcache
-/src/.cache
-www
+.nx
+**/src/.eslintcache
+**/src/.cache
 tmp/
 *.tgz
 .i18n-editor-metadata
@@ -17,15 +17,13 @@ admin/words.js
 /lib/socketAdmin.js
 /lib/socketCommandsAdmin.js
 /lib/passportSocket.js
-/src/build
-/src/package-lock.json
-/package-lock.json
-/src/.eslintcache
-/src-admin/package-lock.json
-/src/public_aes
-/src/public/js/adapter-settings-aes.js
+**/build
+package-lock.json
+**/src-admin/package-lock.json
+**/src/public_aes
+**/src/public/js/adapter-settings-aes.js
 testSentry.bat
-/adminWww/
+**/adminWww/
 
 # ioBroker dev-server
 .dev-server/
diff --git a/.releaseconfig.json b/.releaseconfig.json
@@ -1,5 +1,6 @@
 {
-  "plugins": ["iobroker", "license"],
+  "plugins": ["iobroker", "license", "lerna"],
+  "ioPackage": "packages/admin",
   "exec": {
     "before_commit": "npm run build"
   }

diff --git a/LICENSE b/LICENSE
@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2014-2023 bluefox <[email protected]>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2014-2023 bluefox <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![Logo](admin/admin.png)
+![Logo](packages/admin/admin/admin.png)
 # ioBroker.admin
 
 ![Number of Installations](http://iobroker.live/badges/admin-installed.svg)