diff --git a/.changeset/config.json b/.changeset/config.json index 7fcf9733..a9d1f9d8 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -1,11 +1,15 @@ { "$schema": "https://unpkg.com/@changesets/config@2.2.0/schema.json", - "changelog": "@changesets/cli/changelog", + "changelog": ["@svitejs/changesets-changelog-github-compact", {"repo": "@metalizzsas/NusterKit"}], "commit": false, "fixed": [], "linked": [], "access": "restricted", "baseBranch": "main", "updateInternalDependencies": "patch", - "ignore": [] + "ignore": [], + "privatePackages": { + "version": true, + "tag": true + } } diff --git a/.changeset/late-bulldogs-act.md b/.changeset/late-bulldogs-act.md new file mode 100644 index 00000000..64fa792b --- /dev/null +++ b/.changeset/late-bulldogs-act.md @@ -0,0 +1,5 @@ +--- +"@metalizzsas/nuster-turbine-machines": patch +--- + +Next diff --git a/.changeset/mighty-experts-stare.md b/.changeset/mighty-experts-stare.md new file mode 100644 index 00000000..b5499d15 --- /dev/null +++ b/.changeset/mighty-experts-stare.md @@ -0,0 +1,5 @@ +--- +"@metalizzsas/nuster-typings": patch +--- + +Added linting diff --git a/.changeset/three-bears-deliver.md b/.changeset/three-bears-deliver.md new file mode 100644 index 00000000..a7186bc5 --- /dev/null +++ b/.changeset/three-bears-deliver.md @@ -0,0 +1,5 @@ +--- +"@metalizzsas/nuster-turbine": patch +--- + +Removed Schema scripts diff --git a/.changeset/yellow-kangaroos-occur.md b/.changeset/yellow-kangaroos-occur.md new file mode 100644 index 00000000..0316c726 --- /dev/null +++ b/.changeset/yellow-kangaroos-occur.md @@ -0,0 +1,8 @@ +--- +"@metalizzsas/nuster-turbine-machines": minor +"@metalizzsas/nuster-typings": minor +"@metalizzsas/nuster-desktop": minor +"@metalizzsas/nuster-turbine": minor +--- + +First Changeset release diff --git a/.github/workflows.disabled2/build.yaml b/.github/workflows.disabled2/build.yaml new file mode 100644 index 00000000..b1bca2af --- /dev/null +++ b/.github/workflows.disabled2/build.yaml @@ -0,0 +1,107 @@ +on: + push: + branches: + - next + - main + +jobs: + libs_next: + name: Publish libs next version + runs-on: ubuntu-latest + steps: + - name: Checkout Repo + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - uses: pnpm/action-setup@v2.2.2 + - name: Setup Node.js + uses: actions/setup-node@v3 + with: + node-version: 18.x + registry-url: 'https://npm.pkg.github.com' + scope: '@metalizzsas' + + - run: pnpm --filter="./libs/*" install + - run: pnpm --filter="./libs/*" run build + - run: pnpm --filter="./libs/*" publish -r --no-git-checks + env: + NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + packages_next: + needs: + - libs_next + strategy: + matrix: + package: ["turbine", "desktop"] + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - name: 🗂️ Checkout repo + uses: actions/checkout@v3 + + - name: 🐳 Set up QEMU + id: qemu + uses: docker/setup-qemu-action@v1 + with: + image: tonistiigi/binfmt:latest + platforms: all + + - name: 🐳 Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + with: + version: latest + install: true + + - name: 👷‍♂️ Login to container registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: ⛏️ Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v2 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + images: ghcr.io/${{ matrix.package }} + + - name: 👷‍♂️ Create .npmrc + run: printf "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}\n@metalizzsas:registry=http://npm.pkg.github.com/" > .npmrc + + - name: 🧱 Build and push Docker image + uses: docker/build-push-action@v3 + with: + context: ./packages/${{ matrix.package }}/ + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + platforms: arm64 + push: true + cache-from: type=gha + cache-to: type=gha,mode=max + secret-files: | + "NPMRC=.npmrc" + + # - name: Create Release Pull Request or Publish to npm + # id: changesets + # uses: changesets/action@v1 + # with: + # # This expects you to have a script called release which does a build for your packages and calls changeset publish + # publish: pnpm release + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # - name: Update latest tag on published packages # only needed until we release 1.0.0 and exit pre-release mode + # if: steps.changesets.outputs.published == 'true' + # # wait a bit and then run "npm dist-tag add package@version latest" for all published packages + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # published_packages: ${{steps.changesets.outputs.publishedPackages}} + # run: | + # sleep 20 + # cat << EOF > "$HOME/.npmrc" + # //npm.pkg.github.com/:_authToken=$GITHUB_TOKEN + # EOF + # echo $published_packages | jq -r 'map((.name + "@" + .version)) | .[]' | while read pkgver; do npm dist-tag add $pkgver latest || continue;done \ No newline at end of file diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 00000000..18d495ba --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,42 @@ +name: 🚀 CI + +on: + push: + branches: + - master + pull_request: + +# cancel in-progress runs on new commits to same PR (gitub.event.number) +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.sha }} + cancel-in-progress: true + +env: + NODE_ENV: development + +jobs: + ci: + runs-on: ubuntu-latest + steps: + - name: 📚 Checkout repository + uses: actions/checkout@v3 + + - name: ⛏️ Setup pnpm + uses: pnpm/action-setup@v2.2.2 + + - name: ⛏️ Setup node + uses: actions/setup-node@v3 + with: + node-version: '18.x' + + - name: 🗂️ Install packages + run: pnpm install + + - name: ✔️ Run linting + run: pnpm run lint + + - name: ✔️ Run tests + run: pnpm test + + - name: 🧱 Build packages + run: pnpm run build \ No newline at end of file diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 00000000..43e99273 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,68 @@ +name: 🚀 Release + +on: + push: + branches: + - master + +env: + NODE_ENV: development + +jobs: + release: + permissions: + contents: write # to create release (changesets/action) + pull-requests: write # to create pull request (changesets/action) + name: Release + runs-on: ubuntu-latest + steps: + - name: 📚 Checkout Repo + uses: actions/checkout@v3 + with: + # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits + fetch-depth: 0 + - uses: pnpm/action-setup@v2.2.2 + - name: Setup Node.js + uses: actions/setup-node@v3 + with: + node-version: 18.x + cache: pnpm + + - run: pnpm install + - run: pnpm --filter="./libs/*" run build + + - name: Creating .npmrc + run: | + cat << EOF > "$HOME/.npmrc" + //npm.pkg.github.com/:_authToken=$GITHUB_TOKEN + EOF + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: 📝 Create Release Pull Request or Publish to npm + id: changesets + uses: changesets/action@v1 + with: + # This expects you to have a script called release which does a build for your packages and calls changeset publish + publish: pnpm release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: 🗂️ Update latest tag on published packages # only needed until we release 1.0.0 and exit pre-release mode + if: steps.changesets.outputs.published == 'true' + # wait a bit and then run "npm dist-tag add package@version latest" for all published packages + env: + published_packages: ${{steps.changesets.outputs.publishedPackages}} + run: | + echo $published_packages | jq -r 'map((.name + "@" + .version)) | .[]' | while read pkgver; do npm dist-tag add $pkgver latest || continue;done + + - name: 🐳 Create BalenaCloud Release + uses: balena-io/deploy-to-balena-action@master + id: build + with: + balena_token: ${{ secrets.BALENA_TOKEN }} + fleet: romain_sapet/nusterturbine + finalize: false + + - name: 📝 Log release ID built + run: echo "Built release ID ${{ steps.build.outputs.release_id }}" \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..641b7905 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,25 @@ +{ + "eslint.packageManager": "npm", + "eslint.workingDirectories": [ + "./packages/turbine", + "./packages/desktop", + "./libs/typings", + "./libs/tubrine-machines" + ], + "eslint.quiet": false, + "eslint.probe": [ + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", + "html", + "vue", + "markdown", + "svelte" + ], + "eslint.validate": [ + "svelte", + "js", + "ts" + ] +} \ No newline at end of file diff --git a/packages/turbine-machines/.github/workflows/test.yaml b/libs/turbine-machines/.github/workflows/test.yaml similarity index 100% rename from packages/turbine-machines/.github/workflows/test.yaml rename to libs/turbine-machines/.github/workflows/test.yaml diff --git a/packages/turbine-machines/.gitignore b/libs/turbine-machines/.gitignore similarity index 100% rename from packages/turbine-machines/.gitignore rename to libs/turbine-machines/.gitignore diff --git a/packages/turbine-machines/README.md b/libs/turbine-machines/README.md similarity index 100% rename from packages/turbine-machines/README.md rename to libs/turbine-machines/README.md diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/cycle/act-fill.png b/libs/turbine-machines/data/metalfog/m/1/assets/cycle/act-fill.png similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/cycle/act-fill.png rename to libs/turbine-machines/data/metalfog/m/1/assets/cycle/act-fill.png diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/cycle/cem-retake.png b/libs/turbine-machines/data/metalfog/m/1/assets/cycle/cem-retake.png similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/cycle/cem-retake.png rename to libs/turbine-machines/data/metalfog/m/1/assets/cycle/cem-retake.png diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/cycle/cem.png b/libs/turbine-machines/data/metalfog/m/1/assets/cycle/cem.png similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/cycle/cem.png rename to libs/turbine-machines/data/metalfog/m/1/assets/cycle/cem.png diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/cycle/container-cleaning.png b/libs/turbine-machines/data/metalfog/m/1/assets/cycle/container-cleaning.png similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/cycle/container-cleaning.png rename to libs/turbine-machines/data/metalfog/m/1/assets/cycle/container-cleaning.png diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/cycle/emptying-activator.png b/libs/turbine-machines/data/metalfog/m/1/assets/cycle/emptying-activator.png similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/cycle/emptying-activator.png rename to libs/turbine-machines/data/metalfog/m/1/assets/cycle/emptying-activator.png diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/cycle/emptying-reactives.png b/libs/turbine-machines/data/metalfog/m/1/assets/cycle/emptying-reactives.png similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/cycle/emptying-reactives.png rename to libs/turbine-machines/data/metalfog/m/1/assets/cycle/emptying-reactives.png diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/cycle/llc.png b/libs/turbine-machines/data/metalfog/m/1/assets/cycle/llc.png similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/cycle/llc.png rename to libs/turbine-machines/data/metalfog/m/1/assets/cycle/llc.png diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/cycle/usl-activation-porous.png b/libs/turbine-machines/data/metalfog/m/1/assets/cycle/usl-activation-porous.png similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/cycle/usl-activation-porous.png rename to libs/turbine-machines/data/metalfog/m/1/assets/cycle/usl-activation-porous.png diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/cycle/usl-retake.png b/libs/turbine-machines/data/metalfog/m/1/assets/cycle/usl-retake.png similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/cycle/usl-retake.png rename to libs/turbine-machines/data/metalfog/m/1/assets/cycle/usl-retake.png diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/cycle/usl.png b/libs/turbine-machines/data/metalfog/m/1/assets/cycle/usl.png similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/cycle/usl.png rename to libs/turbine-machines/data/metalfog/m/1/assets/cycle/usl.png diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/lang/en.json b/libs/turbine-machines/data/metalfog/m/1/assets/lang/en.json similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/lang/en.json rename to libs/turbine-machines/data/metalfog/m/1/assets/lang/en.json diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/lang/fr.json b/libs/turbine-machines/data/metalfog/m/1/assets/lang/fr.json similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/lang/fr.json rename to libs/turbine-machines/data/metalfog/m/1/assets/lang/fr.json diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/maintenance/mfm-filter/0.jpg b/libs/turbine-machines/data/metalfog/m/1/assets/maintenance/mfm-filter/0.jpg similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/maintenance/mfm-filter/0.jpg rename to libs/turbine-machines/data/metalfog/m/1/assets/maintenance/mfm-filter/0.jpg diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/maintenance/mfm-filter/1.jpg b/libs/turbine-machines/data/metalfog/m/1/assets/maintenance/mfm-filter/1.jpg similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/maintenance/mfm-filter/1.jpg rename to libs/turbine-machines/data/metalfog/m/1/assets/maintenance/mfm-filter/1.jpg diff --git a/packages/turbine-machines/data/metalfog/m/1/assets/maintenance/mfm-filter/2.jpg b/libs/turbine-machines/data/metalfog/m/1/assets/maintenance/mfm-filter/2.jpg similarity index 100% rename from packages/turbine-machines/data/metalfog/m/1/assets/maintenance/mfm-filter/2.jpg rename to libs/turbine-machines/data/metalfog/m/1/assets/maintenance/mfm-filter/2.jpg diff --git a/packages/turbine-machines/data/metalfog/m/1/specs.json b/libs/turbine-machines/data/metalfog/m/1/specs.json similarity index 99% rename from packages/turbine-machines/data/metalfog/m/1/specs.json rename to libs/turbine-machines/data/metalfog/m/1/specs.json index 5f562bc1..4a8186dc 100644 --- a/packages/turbine-machines/data/metalfog/m/1/specs.json +++ b/libs/turbine-machines/data/metalfog/m/1/specs.json @@ -1,5 +1,5 @@ { - "$schema": "../../../../node_modules/@metalizz/nuster-typings/src/schemas/schema-specs.json", + "$schema": "../../../../node_modules/@metalizzsas/nuster-typings/src/schemas/schema-specs.json", "nuster": { "connectPopup": { diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/cycle/fdm.png b/libs/turbine-machines/data/smoothit/m/1/assets/cycle/fdm.png similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/cycle/fdm.png rename to libs/turbine-machines/data/smoothit/m/1/assets/cycle/fdm.png diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/cycle/sla.png b/libs/turbine-machines/data/smoothit/m/1/assets/cycle/sla.png similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/cycle/sla.png rename to libs/turbine-machines/data/smoothit/m/1/assets/cycle/sla.png diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/cycle/sls.png b/libs/turbine-machines/data/smoothit/m/1/assets/cycle/sls.png similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/cycle/sls.png rename to libs/turbine-machines/data/smoothit/m/1/assets/cycle/sls.png diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/lang/en.json b/libs/turbine-machines/data/smoothit/m/1/assets/lang/en.json similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/lang/en.json rename to libs/turbine-machines/data/smoothit/m/1/assets/lang/en.json diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/lang/fr.json b/libs/turbine-machines/data/smoothit/m/1/assets/lang/fr.json similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/lang/fr.json rename to libs/turbine-machines/data/smoothit/m/1/assets/lang/fr.json diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/0.jpg b/libs/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/0.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/0.jpg rename to libs/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/0.jpg diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/1.jpg b/libs/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/1.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/1.jpg rename to libs/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/1.jpg diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/2.jpg b/libs/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/2.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/2.jpg rename to libs/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/2.jpg diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/3.jpg b/libs/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/3.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/3.jpg rename to libs/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/3.jpg diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/4.jpg b/libs/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/4.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/4.jpg rename to libs/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/4.jpg diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/5.jpg b/libs/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/5.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/5.jpg rename to libs/turbine-machines/data/smoothit/m/1/assets/maintenance/ir-lamp/5.jpg diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/maintenance/smt-filter/0.jpg b/libs/turbine-machines/data/smoothit/m/1/assets/maintenance/smt-filter/0.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/maintenance/smt-filter/0.jpg rename to libs/turbine-machines/data/smoothit/m/1/assets/maintenance/smt-filter/0.jpg diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/maintenance/smt-filter/1.jpg b/libs/turbine-machines/data/smoothit/m/1/assets/maintenance/smt-filter/1.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/maintenance/smt-filter/1.jpg rename to libs/turbine-machines/data/smoothit/m/1/assets/maintenance/smt-filter/1.jpg diff --git a/packages/turbine-machines/data/smoothit/m/1/assets/maintenance/smt-filter/2.jpg b/libs/turbine-machines/data/smoothit/m/1/assets/maintenance/smt-filter/2.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/1/assets/maintenance/smt-filter/2.jpg rename to libs/turbine-machines/data/smoothit/m/1/assets/maintenance/smt-filter/2.jpg diff --git a/packages/turbine-machines/data/smoothit/m/1/specs.json b/libs/turbine-machines/data/smoothit/m/1/specs.json similarity index 99% rename from packages/turbine-machines/data/smoothit/m/1/specs.json rename to libs/turbine-machines/data/smoothit/m/1/specs.json index c161257a..9168c0a2 100644 --- a/packages/turbine-machines/data/smoothit/m/1/specs.json +++ b/libs/turbine-machines/data/smoothit/m/1/specs.json @@ -1,5 +1,5 @@ { - "$schema": "../../../../node_modules/@metalizz/nuster-typings/src/schemas/schema-specs.json", + "$schema": "../../../../node_modules/@metalizzsas/nuster-typings/src/schemas/schema-specs.json", "iohandlers": [ { "type": "wago", diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/cycle/fdm.png b/libs/turbine-machines/data/smoothit/m/2/assets/cycle/fdm.png similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/cycle/fdm.png rename to libs/turbine-machines/data/smoothit/m/2/assets/cycle/fdm.png diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/cycle/sla.png b/libs/turbine-machines/data/smoothit/m/2/assets/cycle/sla.png similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/cycle/sla.png rename to libs/turbine-machines/data/smoothit/m/2/assets/cycle/sla.png diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/cycle/sls.png b/libs/turbine-machines/data/smoothit/m/2/assets/cycle/sls.png similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/cycle/sls.png rename to libs/turbine-machines/data/smoothit/m/2/assets/cycle/sls.png diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/lang/en.json b/libs/turbine-machines/data/smoothit/m/2/assets/lang/en.json similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/lang/en.json rename to libs/turbine-machines/data/smoothit/m/2/assets/lang/en.json diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/lang/fr.json b/libs/turbine-machines/data/smoothit/m/2/assets/lang/fr.json similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/lang/fr.json rename to libs/turbine-machines/data/smoothit/m/2/assets/lang/fr.json diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/0.jpg b/libs/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/0.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/0.jpg rename to libs/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/0.jpg diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/1.jpg b/libs/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/1.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/1.jpg rename to libs/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/1.jpg diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/2.jpg b/libs/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/2.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/2.jpg rename to libs/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/2.jpg diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/3.jpg b/libs/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/3.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/3.jpg rename to libs/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/3.jpg diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/4.jpg b/libs/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/4.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/4.jpg rename to libs/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/4.jpg diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/5.jpg b/libs/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/5.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/5.jpg rename to libs/turbine-machines/data/smoothit/m/2/assets/maintenance/ir-lamp/5.jpg diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/maintenance/smt-filter/0.jpg b/libs/turbine-machines/data/smoothit/m/2/assets/maintenance/smt-filter/0.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/maintenance/smt-filter/0.jpg rename to libs/turbine-machines/data/smoothit/m/2/assets/maintenance/smt-filter/0.jpg diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/maintenance/smt-filter/1.jpg b/libs/turbine-machines/data/smoothit/m/2/assets/maintenance/smt-filter/1.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/maintenance/smt-filter/1.jpg rename to libs/turbine-machines/data/smoothit/m/2/assets/maintenance/smt-filter/1.jpg diff --git a/packages/turbine-machines/data/smoothit/m/2/assets/maintenance/smt-filter/2.jpg b/libs/turbine-machines/data/smoothit/m/2/assets/maintenance/smt-filter/2.jpg similarity index 100% rename from packages/turbine-machines/data/smoothit/m/2/assets/maintenance/smt-filter/2.jpg rename to libs/turbine-machines/data/smoothit/m/2/assets/maintenance/smt-filter/2.jpg diff --git a/packages/turbine-machines/data/smoothit/m/2/specs.json b/libs/turbine-machines/data/smoothit/m/2/specs.json similarity index 99% rename from packages/turbine-machines/data/smoothit/m/2/specs.json rename to libs/turbine-machines/data/smoothit/m/2/specs.json index 179eddce..c25d6842 100644 --- a/packages/turbine-machines/data/smoothit/m/2/specs.json +++ b/libs/turbine-machines/data/smoothit/m/2/specs.json @@ -1,5 +1,5 @@ { - "$schema": "../../../../node_modules/@metalizz/nuster-typings/src/schemas/schema-specs.json", + "$schema": "../../../../node_modules/@metalizzsas/nuster-typings/src/schemas/schema-specs.json", "iohandlers": [ { "type": "wago", diff --git a/packages/turbine-machines/data/uscleaner/m/1/addons/temperature-control.json b/libs/turbine-machines/data/uscleaner/m/1/addons/temperature-control.json similarity index 100% rename from packages/turbine-machines/data/uscleaner/m/1/addons/temperature-control.json rename to libs/turbine-machines/data/uscleaner/m/1/addons/temperature-control.json diff --git a/packages/turbine-machines/data/uscleaner/m/1/assets/lang/en.json b/libs/turbine-machines/data/uscleaner/m/1/assets/lang/en.json similarity index 100% rename from packages/turbine-machines/data/uscleaner/m/1/assets/lang/en.json rename to libs/turbine-machines/data/uscleaner/m/1/assets/lang/en.json diff --git a/packages/turbine-machines/data/uscleaner/m/1/assets/lang/fr.json b/libs/turbine-machines/data/uscleaner/m/1/assets/lang/fr.json similarity index 100% rename from packages/turbine-machines/data/uscleaner/m/1/assets/lang/fr.json rename to libs/turbine-machines/data/uscleaner/m/1/assets/lang/fr.json diff --git a/packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/1.jpg b/libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/1.jpg similarity index 100% rename from packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/1.jpg rename to libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/1.jpg diff --git a/packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/2.jpg b/libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/2.jpg similarity index 100% rename from packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/2.jpg rename to libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/2.jpg diff --git a/packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/3.jpg b/libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/3.jpg similarity index 100% rename from packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/3.jpg rename to libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/3.jpg diff --git a/packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/4.jpg b/libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/4.jpg similarity index 100% rename from packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/4.jpg rename to libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/4.jpg diff --git a/packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/5.jpg b/libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/5.jpg similarity index 100% rename from packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/5.jpg rename to libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/5.jpg diff --git a/packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/6.jpg b/libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/6.jpg similarity index 100% rename from packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/6.jpg rename to libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/6.jpg diff --git a/packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/7.jpg b/libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/7.jpg similarity index 100% rename from packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/7.jpg rename to libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/7.jpg diff --git a/packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/8.jpg b/libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/8.jpg similarity index 100% rename from packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/8.jpg rename to libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/8.jpg diff --git a/packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/9.jpg b/libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/9.jpg similarity index 100% rename from packages/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/9.jpg rename to libs/turbine-machines/data/uscleaner/m/1/assets/maintenance/usc-filter/9.jpg diff --git a/packages/turbine-machines/data/uscleaner/m/1/specs.json b/libs/turbine-machines/data/uscleaner/m/1/specs.json similarity index 99% rename from packages/turbine-machines/data/uscleaner/m/1/specs.json rename to libs/turbine-machines/data/uscleaner/m/1/specs.json index 03c58775..0cb36657 100644 --- a/packages/turbine-machines/data/uscleaner/m/1/specs.json +++ b/libs/turbine-machines/data/uscleaner/m/1/specs.json @@ -1,5 +1,5 @@ { - "$schema": "../../../../node_modules/@metalizz/nuster-typings/src/schemas/schema-specs.json", + "$schema": "../../../../node_modules/@metalizzsas/nuster-typings/src/schemas/schema-specs.json", "iohandlers": [ { "type": "wago", diff --git a/packages/turbine-machines/jest.config.js b/libs/turbine-machines/jest.config.js similarity index 100% rename from packages/turbine-machines/jest.config.js rename to libs/turbine-machines/jest.config.js diff --git a/packages/turbine-machines/package.json b/libs/turbine-machines/package.json similarity index 56% rename from packages/turbine-machines/package.json rename to libs/turbine-machines/package.json index 4632d368..5911fea4 100644 --- a/packages/turbine-machines/package.json +++ b/libs/turbine-machines/package.json @@ -1,23 +1,23 @@ { - "name": "@metalizz/nuster-turbine-machines", + "name": "@metalizzsas/nuster-turbine-machines", "version": "1.0.0", "description": "metalizz machines descriptions", - "main": "index.js", + "main": "", "scripts": { "test": "npx jest" }, "repository": { "type": "git", - "url": "git+https://github.com/Kworz/NusterTurbineMachines.git" + "url": "git+https://github.com/Kworz/NusterKit.git" }, "author": "Metalizz", "license": "UNLICENSED", "bugs": { - "url": "https://github.com/Kworz/NusterTurbineMachines/issues" + "url": "https://github.com/Kworz/NusterKit/issues" }, - "homepage": "https://github.com/Kworz/NusterTurbineMachines#readme", + "homepage": "https://github.com/Kworz/NusterKit/libs/turbine-machines#readme", "devDependencies": { - "@metalizz/nuster-typings": "1.0.0", + "@metalizzsas/nuster-typings": "1.0.0", "@types/jest-json-schema": "^6.1.0", "@types/node": "^18.7.22", "jest": "^27.5.1", @@ -27,5 +27,8 @@ "npx": "^10.2.2", "ts-jest": "^27.1.3", "typescript": "^4.5.5" + }, + "publishConfig": { + "registry": "https://npm.pkg.github.com" } } diff --git a/packages/turbine-machines/src/__tests__/assets.ts b/libs/turbine-machines/src/__tests__/assets.ts similarity index 97% rename from packages/turbine-machines/src/__tests__/assets.ts rename to libs/turbine-machines/src/__tests__/assets.ts index 513e958a..76d058bf 100644 --- a/packages/turbine-machines/src/__tests__/assets.ts +++ b/libs/turbine-machines/src/__tests__/assets.ts @@ -1,4 +1,4 @@ -import { IMachineSpecs } from "@metalizz/nuster-typings/src/spec"; +import { IMachineSpecs } from "@metalizzsas/nuster-typings/src/spec"; import fs from "fs"; import path from "path"; diff --git a/packages/turbine-machines/src/__tests__/blocks.ts b/libs/turbine-machines/src/__tests__/blocks.ts similarity index 94% rename from packages/turbine-machines/src/__tests__/blocks.ts rename to libs/turbine-machines/src/__tests__/blocks.ts index c34950f1..824bc5e1 100644 --- a/packages/turbine-machines/src/__tests__/blocks.ts +++ b/libs/turbine-machines/src/__tests__/blocks.ts @@ -3,11 +3,11 @@ import path from "path"; import { matchers } from 'jest-json-schema'; -import { IMachineSpecs } from "@metalizz/nuster-typings/src/spec"; -import { IProgramBlocks } from "@metalizz/nuster-typings/src/spec/cycle/IProgramBlock"; -import { IParameterBlocks } from "@metalizz/nuster-typings/src/spec/cycle/IParameterBlock"; -import { IConstantStringParameterBlock } from "@metalizz/nuster-typings/src/spec/cycle/programblocks/ParameterBlocks/IConstantStringParameterBlock"; -import { IIfProgramBlock } from "@metalizz/nuster-typings/src/spec/cycle/programblocks/ProgramBlocks/IIfProgramBlock"; +import { IMachineSpecs } from "@metalizzsas/nuster-typings/src/spec"; +import { IProgramBlocks } from "@metalizzsas/nuster-typings/src/spec/cycle/IProgramBlock"; +import { IParameterBlocks } from "@metalizzsas/nuster-typings/src/spec/cycle/IParameterBlock"; +import { IConstantStringParameterBlock } from "@metalizzsas/nuster-typings/src/spec/cycle/programblocks/ParameterBlocks/IConstantStringParameterBlock"; +import { IIfProgramBlock } from "@metalizzsas/nuster-typings/src/spec/cycle/programblocks/ProgramBlocks/IIfProgramBlock"; expect.extend(matchers); diff --git a/packages/turbine-machines/src/__tests__/schema.ts b/libs/turbine-machines/src/__tests__/schema.ts similarity index 94% rename from packages/turbine-machines/src/__tests__/schema.ts rename to libs/turbine-machines/src/__tests__/schema.ts index 349b8882..e09c3b60 100644 --- a/packages/turbine-machines/src/__tests__/schema.ts +++ b/libs/turbine-machines/src/__tests__/schema.ts @@ -1,7 +1,7 @@ import fs from "fs"; import path from "path"; -import * as fileSchema from "../../node_modules/@metalizz/nuster-typings/src/schemas/schema-specs.json"; +import * as fileSchema from "../../node_modules/@metalizzsas/nuster-typings/src/schemas/schema-specs.json"; import { matchers } from 'jest-json-schema'; diff --git a/packages/turbine-machines/src/__tests__/translations.ts b/libs/turbine-machines/src/__tests__/translations.ts similarity index 99% rename from packages/turbine-machines/src/__tests__/translations.ts rename to libs/turbine-machines/src/__tests__/translations.ts index 1551fd81..6000b874 100644 --- a/packages/turbine-machines/src/__tests__/translations.ts +++ b/libs/turbine-machines/src/__tests__/translations.ts @@ -1,7 +1,7 @@ import fs from "fs"; import path from "path"; -import { IMachineSpecs } from "@metalizz/nuster-typings/src/spec/"; +import { IMachineSpecs } from "@metalizzsas/nuster-typings/src/spec/"; interface Specs { model: string; diff --git a/packages/turbine-machines/tsconfig.json b/libs/turbine-machines/tsconfig.json similarity index 100% rename from packages/turbine-machines/tsconfig.json rename to libs/turbine-machines/tsconfig.json diff --git a/libs/typings/.eslintrc.json b/libs/typings/.eslintrc.json new file mode 100644 index 00000000..f64b8e28 --- /dev/null +++ b/libs/typings/.eslintrc.json @@ -0,0 +1,25 @@ +{ + "env": { + "browser": true, + "es2021": false + }, + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/recommended" + ], + "overrides": [ + ], + "parser": "@typescript-eslint/parser", + "parserOptions": { + "ecmaVersion": "latest", + "sourceType": "module" + }, + "plugins": [ + "@typescript-eslint" + ], + "rules": { + "@typescript-eslint/no-unused-vars": "error", + "no-console": "error", + "camelcase": "error" + } +} diff --git a/packages/typings/.gitignore b/libs/typings/.gitignore similarity index 100% rename from packages/typings/.gitignore rename to libs/typings/.gitignore diff --git a/packages/typings/package-lock.json b/libs/typings/package-lock.json similarity index 91% rename from packages/typings/package-lock.json rename to libs/typings/package-lock.json index ebbaf09d..4fed5f3d 100644 --- a/packages/typings/package-lock.json +++ b/libs/typings/package-lock.json @@ -1,11 +1,11 @@ { - "name": "@metalizz/nuster-typings", + "name": "@metalizzsas/nuster-typings", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "@metalizz/nuster-typings", + "name": "@metalizzsas/nuster-typings", "version": "1.0.0", "license": "ISC", "devDependencies": { diff --git a/packages/typings/package.json b/libs/typings/package.json similarity index 53% rename from packages/typings/package.json rename to libs/typings/package.json index 263df7d5..6b0a587f 100644 --- a/packages/typings/package.json +++ b/libs/typings/package.json @@ -1,20 +1,25 @@ { - "name": "@metalizz/nuster-typings", + "name": "@metalizzsas/nuster-typings", "version": "1.0.0", "description": "Typings for NusterKit", - "main": "src/index.js", + "main": "src/index.ts", "scripts": { - "dev": "tsc --watch --noEmit", - "build": "tsc --noEmit", - "schema": "npm run schema:config && npm run schema:spec", + "lint": "eslint --ext .js,.ts .", + "build": "npm run schema:config && npm run schema:spec", "schema:config": "typescript-json-schema src/configuration/index.ts IConfiguration --noExtraProps --required -o src/schemas/schema-config.json", "schema:spec": "typescript-json-schema src/spec/index.ts IMachineSpecs --noExtraProps --required -o src/schemas/schema-specs.json" }, "keywords": [], - "author": "", - "license": "ISC", + "author": "@metalizzsas/kworz", + "license": "UNLICENSED", "devDependencies": { + "@typescript-eslint/eslint-plugin": "^5.39.0", + "@typescript-eslint/parser": "^5.39.0", + "eslint": "^8.24.0", "typescript": "^4.8.4", "typescript-json-schema": "0.54.0" + }, + "publishConfig": { + "registry": "https://npm.pkg.github.com" } } diff --git a/packages/typings/src/configuration/index.ts b/libs/typings/src/configuration/index.ts similarity index 100% rename from packages/typings/src/configuration/index.ts rename to libs/typings/src/configuration/index.ts diff --git a/packages/typings/src/hydrated/balena/IDeviceData.ts b/libs/typings/src/hydrated/balena/IDeviceData.ts similarity index 100% rename from packages/typings/src/hydrated/balena/IDeviceData.ts rename to libs/typings/src/hydrated/balena/IDeviceData.ts diff --git a/packages/typings/src/hydrated/balena/IHypervisorDevice.ts b/libs/typings/src/hydrated/balena/IHypervisorDevice.ts similarity index 100% rename from packages/typings/src/hydrated/balena/IHypervisorDevice.ts rename to libs/typings/src/hydrated/balena/IHypervisorDevice.ts diff --git a/packages/typings/src/hydrated/balena/IVPNData.ts b/libs/typings/src/hydrated/balena/IVPNData.ts similarity index 100% rename from packages/typings/src/hydrated/balena/IVPNData.ts rename to libs/typings/src/hydrated/balena/IVPNData.ts diff --git a/packages/typings/src/hydrated/cycle/IPBRStartConditionHydrated.ts b/libs/typings/src/hydrated/cycle/IPBRStartConditionHydrated.ts similarity index 100% rename from packages/typings/src/hydrated/cycle/IPBRStartConditionHydrated.ts rename to libs/typings/src/hydrated/cycle/IPBRStartConditionHydrated.ts diff --git a/packages/typings/src/hydrated/cycle/IProgramRunnerHydrated.ts b/libs/typings/src/hydrated/cycle/IProgramRunnerHydrated.ts similarity index 100% rename from packages/typings/src/hydrated/cycle/IProgramRunnerHydrated.ts rename to libs/typings/src/hydrated/cycle/IProgramRunnerHydrated.ts diff --git a/packages/typings/src/hydrated/cycle/IProgramStepHydrated.ts b/libs/typings/src/hydrated/cycle/IProgramStepHydrated.ts similarity index 100% rename from packages/typings/src/hydrated/cycle/IProgramStepHydrated.ts rename to libs/typings/src/hydrated/cycle/IProgramStepHydrated.ts diff --git a/packages/typings/src/hydrated/cycle/blocks/IParameterBlockHydrated.ts b/libs/typings/src/hydrated/cycle/blocks/IParameterBlockHydrated.ts similarity index 100% rename from packages/typings/src/hydrated/cycle/blocks/IParameterBlockHydrated.ts rename to libs/typings/src/hydrated/cycle/blocks/IParameterBlockHydrated.ts diff --git a/packages/typings/src/hydrated/cycle/blocks/IProgramBlockHydrated.ts b/libs/typings/src/hydrated/cycle/blocks/IProgramBlockHydrated.ts similarity index 100% rename from packages/typings/src/hydrated/cycle/blocks/IProgramBlockHydrated.ts rename to libs/typings/src/hydrated/cycle/blocks/IProgramBlockHydrated.ts diff --git a/packages/typings/src/hydrated/cycle/index.ts b/libs/typings/src/hydrated/cycle/index.ts similarity index 100% rename from packages/typings/src/hydrated/cycle/index.ts rename to libs/typings/src/hydrated/cycle/index.ts diff --git a/packages/typings/src/hydrated/index.ts b/libs/typings/src/hydrated/index.ts similarity index 100% rename from packages/typings/src/hydrated/index.ts rename to libs/typings/src/hydrated/index.ts diff --git a/packages/typings/src/hydrated/maintenance/index.ts b/libs/typings/src/hydrated/maintenance/index.ts similarity index 100% rename from packages/typings/src/hydrated/maintenance/index.ts rename to libs/typings/src/hydrated/maintenance/index.ts diff --git a/packages/typings/src/hydrated/manual/index.ts b/libs/typings/src/hydrated/manual/index.ts similarity index 100% rename from packages/typings/src/hydrated/manual/index.ts rename to libs/typings/src/hydrated/manual/index.ts diff --git a/packages/typings/src/hydrated/passive/index.ts b/libs/typings/src/hydrated/passive/index.ts similarity index 100% rename from packages/typings/src/hydrated/passive/index.ts rename to libs/typings/src/hydrated/passive/index.ts diff --git a/packages/typings/src/hydrated/profile/index.ts b/libs/typings/src/hydrated/profile/index.ts similarity index 100% rename from packages/typings/src/hydrated/profile/index.ts rename to libs/typings/src/hydrated/profile/index.ts diff --git a/packages/typings/src/hydrated/slot/index.ts b/libs/typings/src/hydrated/slot/index.ts similarity index 100% rename from packages/typings/src/hydrated/slot/index.ts rename to libs/typings/src/hydrated/slot/index.ts diff --git a/packages/typings/src/index.ts b/libs/typings/src/index.ts similarity index 100% rename from packages/typings/src/index.ts rename to libs/typings/src/index.ts diff --git a/packages/typings/src/schemas/schema-config.json b/libs/typings/src/schemas/schema-config.json similarity index 100% rename from packages/typings/src/schemas/schema-config.json rename to libs/typings/src/schemas/schema-config.json diff --git a/packages/typings/src/schemas/schema-specs.json b/libs/typings/src/schemas/schema-specs.json similarity index 100% rename from packages/typings/src/schemas/schema-specs.json rename to libs/typings/src/schemas/schema-specs.json diff --git a/packages/typings/src/spec/addons/index.ts b/libs/typings/src/spec/addons/index.ts similarity index 100% rename from packages/typings/src/spec/addons/index.ts rename to libs/typings/src/spec/addons/index.ts diff --git a/packages/typings/src/spec/cycle/IParameterBlock.ts b/libs/typings/src/spec/cycle/IParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/IParameterBlock.ts rename to libs/typings/src/spec/cycle/IParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/IProgramBlock.ts b/libs/typings/src/spec/cycle/IProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/IProgramBlock.ts rename to libs/typings/src/spec/cycle/IProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/IProgramBlockRunner.ts b/libs/typings/src/spec/cycle/IProgramBlockRunner.ts similarity index 100% rename from packages/typings/src/spec/cycle/IProgramBlockRunner.ts rename to libs/typings/src/spec/cycle/IProgramBlockRunner.ts diff --git a/packages/typings/src/spec/cycle/IProgramStep.ts b/libs/typings/src/spec/cycle/IProgramStep.ts similarity index 100% rename from packages/typings/src/spec/cycle/IProgramStep.ts rename to libs/typings/src/spec/cycle/IProgramStep.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IAdditionParameterBlock.ts b/libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IAdditionParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IAdditionParameterBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IAdditionParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IConditionalParameterBlock.ts b/libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IConditionalParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IConditionalParameterBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IConditionalParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IConstantParameterBlock.ts b/libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IConstantParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IConstantParameterBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IConstantParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IConstantStringParameterBlock.ts b/libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IConstantStringParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IConstantStringParameterBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IConstantStringParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IIOReadParameterBlock.ts b/libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IIOReadParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IIOReadParameterBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IIOReadParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IMaintenanceParameterBlock.ts b/libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IMaintenanceParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IMaintenanceParameterBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IMaintenanceParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IMultiplyParameterBlock.ts b/libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IMultiplyParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IMultiplyParameterBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IMultiplyParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IProfileParameterBlock.ts b/libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IProfileParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IProfileParameterBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IProfileParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IReverseParameterBlock.ts b/libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IReverseParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IReverseParameterBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IReverseParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ParameterBlocks/ISlotLifetimeParameterBlock.ts b/libs/typings/src/spec/cycle/programblocks/ParameterBlocks/ISlotLifetimeParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ParameterBlocks/ISlotLifetimeParameterBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ParameterBlocks/ISlotLifetimeParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ParameterBlocks/ISlotProductStatusParameterBlock.ts b/libs/typings/src/spec/cycle/programblocks/ParameterBlocks/ISlotProductStatusParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ParameterBlocks/ISlotProductStatusParameterBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ParameterBlocks/ISlotProductStatusParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IVariableParameterBlock.ts b/libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IVariableParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ParameterBlocks/IVariableParameterBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ParameterBlocks/IVariableParameterBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IForLoopProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IForLoopProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IForLoopProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IForLoopProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IGroupProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IGroupProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IGroupProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IGroupProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IIOProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IIOProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IIOProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IIOProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IIfProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IIfProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IIfProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IIfProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IMaintenanceProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IMaintenanceProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IMaintenanceProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IMaintenanceProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IPassiveProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IPassiveProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IPassiveProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IPassiveProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/ISleepProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/ISleepProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/ISleepProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/ISleepProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/ISlotLoadProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/ISlotLoadProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/ISlotLoadProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/ISlotLoadProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/ISlotUnloadProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/ISlotUnloadProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/ISlotUnloadProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/ISlotUnloadProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IStartTimerProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IStartTimerProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IStartTimerProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IStartTimerProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IStopProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IStopProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IStopProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IStopProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IStopTimerProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IStopTimerProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IStopTimerProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IStopTimerProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IVariableProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IVariableProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IVariableProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IVariableProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IWhileLoopProgramBlock.ts b/libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IWhileLoopProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/ProgramBlocks/IWhileLoopProgramBlock.ts rename to libs/typings/src/spec/cycle/programblocks/ProgramBlocks/IWhileLoopProgramBlock.ts diff --git a/packages/typings/src/spec/cycle/programblocks/startchain/IPBRSCCheckChain.ts b/libs/typings/src/spec/cycle/programblocks/startchain/IPBRSCCheckChain.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/startchain/IPBRSCCheckChain.ts rename to libs/typings/src/spec/cycle/programblocks/startchain/IPBRSCCheckChain.ts diff --git a/packages/typings/src/spec/cycle/programblocks/startchain/IPBRStartCondition.ts b/libs/typings/src/spec/cycle/programblocks/startchain/IPBRStartCondition.ts similarity index 100% rename from packages/typings/src/spec/cycle/programblocks/startchain/IPBRStartCondition.ts rename to libs/typings/src/spec/cycle/programblocks/startchain/IPBRStartCondition.ts diff --git a/packages/typings/src/spec/index.ts b/libs/typings/src/spec/index.ts similarity index 93% rename from packages/typings/src/spec/index.ts rename to libs/typings/src/spec/index.ts index 5fe2c600..4aa82388 100644 --- a/packages/typings/src/spec/index.ts +++ b/libs/typings/src/spec/index.ts @@ -14,7 +14,7 @@ export declare interface IMachineSpecs { /** * Schema used by the configuration file - * @defaultValue ../../../../node_modules/@metalizz/nuster-typings/src/schemas/schema-specs.json + * @defaultValue ../../../../node_modules/@metalizzsas/nuster-typings/src/schemas/schema-specs.json */ $schema: string; diff --git a/packages/typings/src/spec/iogates/IDefaultGate.ts b/libs/typings/src/spec/iogates/IDefaultGate.ts similarity index 100% rename from packages/typings/src/spec/iogates/IDefaultGate.ts rename to libs/typings/src/spec/iogates/IDefaultGate.ts diff --git a/packages/typings/src/spec/iogates/IMappedGate.ts b/libs/typings/src/spec/iogates/IMappedGate.ts similarity index 100% rename from packages/typings/src/spec/iogates/IMappedGate.ts rename to libs/typings/src/spec/iogates/IMappedGate.ts diff --git a/packages/typings/src/spec/iogates/IPT100Gate.ts b/libs/typings/src/spec/iogates/IPT100Gate.ts similarity index 100% rename from packages/typings/src/spec/iogates/IPT100Gate.ts rename to libs/typings/src/spec/iogates/IPT100Gate.ts diff --git a/packages/typings/src/spec/iogates/IUM18Gate.ts b/libs/typings/src/spec/iogates/IUM18Gate.ts similarity index 100% rename from packages/typings/src/spec/iogates/IUM18Gate.ts rename to libs/typings/src/spec/iogates/IUM18Gate.ts diff --git a/packages/typings/src/spec/iogates/index.ts b/libs/typings/src/spec/iogates/index.ts similarity index 100% rename from packages/typings/src/spec/iogates/index.ts rename to libs/typings/src/spec/iogates/index.ts diff --git a/packages/typings/src/spec/iophysicalcontrollers/EX260xController.ts b/libs/typings/src/spec/iophysicalcontrollers/EX260xController.ts similarity index 100% rename from packages/typings/src/spec/iophysicalcontrollers/EX260xController.ts rename to libs/typings/src/spec/iophysicalcontrollers/EX260xController.ts diff --git a/packages/typings/src/spec/iophysicalcontrollers/WagoController.ts b/libs/typings/src/spec/iophysicalcontrollers/WagoController.ts similarity index 100% rename from packages/typings/src/spec/iophysicalcontrollers/WagoController.ts rename to libs/typings/src/spec/iophysicalcontrollers/WagoController.ts diff --git a/packages/typings/src/spec/iophysicalcontrollers/index.ts b/libs/typings/src/spec/iophysicalcontrollers/index.ts similarity index 100% rename from packages/typings/src/spec/iophysicalcontrollers/index.ts rename to libs/typings/src/spec/iophysicalcontrollers/index.ts diff --git a/packages/typings/src/spec/maintenance/index.ts b/libs/typings/src/spec/maintenance/index.ts similarity index 100% rename from packages/typings/src/spec/maintenance/index.ts rename to libs/typings/src/spec/maintenance/index.ts diff --git a/packages/typings/src/spec/manual/index.ts b/libs/typings/src/spec/manual/index.ts similarity index 100% rename from packages/typings/src/spec/manual/index.ts rename to libs/typings/src/spec/manual/index.ts diff --git a/packages/typings/src/spec/nuster/ICallToAction.ts b/libs/typings/src/spec/nuster/ICallToAction.ts similarity index 100% rename from packages/typings/src/spec/nuster/ICallToAction.ts rename to libs/typings/src/spec/nuster/ICallToAction.ts diff --git a/packages/typings/src/spec/passive/index.ts b/libs/typings/src/spec/passive/index.ts similarity index 100% rename from packages/typings/src/spec/passive/index.ts rename to libs/typings/src/spec/passive/index.ts diff --git a/packages/typings/src/spec/profile/index.ts b/libs/typings/src/spec/profile/index.ts similarity index 100% rename from packages/typings/src/spec/profile/index.ts rename to libs/typings/src/spec/profile/index.ts diff --git a/packages/typings/src/spec/programblocks/ParameterBlocks/IConditionalParameterBlock.ts b/libs/typings/src/spec/programblocks/ParameterBlocks/IConditionalParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ParameterBlocks/IConditionalParameterBlock.ts rename to libs/typings/src/spec/programblocks/ParameterBlocks/IConditionalParameterBlock.ts diff --git a/packages/typings/src/spec/programblocks/ParameterBlocks/IConstantParameterBlock.ts b/libs/typings/src/spec/programblocks/ParameterBlocks/IConstantParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ParameterBlocks/IConstantParameterBlock.ts rename to libs/typings/src/spec/programblocks/ParameterBlocks/IConstantParameterBlock.ts diff --git a/packages/typings/src/spec/programblocks/ParameterBlocks/IConstantStringParameterBlock.ts b/libs/typings/src/spec/programblocks/ParameterBlocks/IConstantStringParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ParameterBlocks/IConstantStringParameterBlock.ts rename to libs/typings/src/spec/programblocks/ParameterBlocks/IConstantStringParameterBlock.ts diff --git a/packages/typings/src/spec/programblocks/ParameterBlocks/IIOReadParameterBlock.ts b/libs/typings/src/spec/programblocks/ParameterBlocks/IIOReadParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ParameterBlocks/IIOReadParameterBlock.ts rename to libs/typings/src/spec/programblocks/ParameterBlocks/IIOReadParameterBlock.ts diff --git a/packages/typings/src/spec/programblocks/ParameterBlocks/IMaintenanceParameterBlock.ts b/libs/typings/src/spec/programblocks/ParameterBlocks/IMaintenanceParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ParameterBlocks/IMaintenanceParameterBlock.ts rename to libs/typings/src/spec/programblocks/ParameterBlocks/IMaintenanceParameterBlock.ts diff --git a/packages/typings/src/spec/programblocks/ParameterBlocks/IMultiplyParameterBlock.ts b/libs/typings/src/spec/programblocks/ParameterBlocks/IMultiplyParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ParameterBlocks/IMultiplyParameterBlock.ts rename to libs/typings/src/spec/programblocks/ParameterBlocks/IMultiplyParameterBlock.ts diff --git a/packages/typings/src/spec/programblocks/ParameterBlocks/IProfileParameterBlock.ts b/libs/typings/src/spec/programblocks/ParameterBlocks/IProfileParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ParameterBlocks/IProfileParameterBlock.ts rename to libs/typings/src/spec/programblocks/ParameterBlocks/IProfileParameterBlock.ts diff --git a/packages/typings/src/spec/programblocks/ParameterBlocks/IReverseParameterBlock.ts b/libs/typings/src/spec/programblocks/ParameterBlocks/IReverseParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ParameterBlocks/IReverseParameterBlock.ts rename to libs/typings/src/spec/programblocks/ParameterBlocks/IReverseParameterBlock.ts diff --git a/packages/typings/src/spec/programblocks/ParameterBlocks/ISlotLifetimeParameterBlock.ts b/libs/typings/src/spec/programblocks/ParameterBlocks/ISlotLifetimeParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ParameterBlocks/ISlotLifetimeParameterBlock.ts rename to libs/typings/src/spec/programblocks/ParameterBlocks/ISlotLifetimeParameterBlock.ts diff --git a/packages/typings/src/spec/programblocks/ParameterBlocks/ISlotProductStatusParameterBlock.ts b/libs/typings/src/spec/programblocks/ParameterBlocks/ISlotProductStatusParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ParameterBlocks/ISlotProductStatusParameterBlock.ts rename to libs/typings/src/spec/programblocks/ParameterBlocks/ISlotProductStatusParameterBlock.ts diff --git a/packages/typings/src/spec/programblocks/ParameterBlocks/IVariableParameterBlock.ts b/libs/typings/src/spec/programblocks/ParameterBlocks/IVariableParameterBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ParameterBlocks/IVariableParameterBlock.ts rename to libs/typings/src/spec/programblocks/ParameterBlocks/IVariableParameterBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/IForLoopProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/IForLoopProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/IForLoopProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/IForLoopProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/IGroupProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/IGroupProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/IGroupProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/IGroupProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/IIOProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/IIOProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/IIOProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/IIOProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/IIfProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/IIfProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/IIfProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/IIfProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/IMaintenanceProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/IMaintenanceProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/IMaintenanceProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/IMaintenanceProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/IPassiveProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/IPassiveProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/IPassiveProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/IPassiveProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/ISleepProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/ISleepProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/ISleepProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/ISleepProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/ISlotLoadProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/ISlotLoadProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/ISlotLoadProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/ISlotLoadProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/ISlotUnloadProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/ISlotUnloadProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/ISlotUnloadProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/ISlotUnloadProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/IStartTimerProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/IStartTimerProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/IStartTimerProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/IStartTimerProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/IStopProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/IStopProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/IStopProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/IStopProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/IStopTimerProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/IStopTimerProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/IStopTimerProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/IStopTimerProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/IVariableProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/IVariableProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/IVariableProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/IVariableProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/ProgramBlocks/IWhileLoopProgramBlock.ts b/libs/typings/src/spec/programblocks/ProgramBlocks/IWhileLoopProgramBlock.ts similarity index 100% rename from packages/typings/src/spec/programblocks/ProgramBlocks/IWhileLoopProgramBlock.ts rename to libs/typings/src/spec/programblocks/ProgramBlocks/IWhileLoopProgramBlock.ts diff --git a/packages/typings/src/spec/programblocks/startchain/IPBRSCCheckChain.ts b/libs/typings/src/spec/programblocks/startchain/IPBRSCCheckChain.ts similarity index 100% rename from packages/typings/src/spec/programblocks/startchain/IPBRSCCheckChain.ts rename to libs/typings/src/spec/programblocks/startchain/IPBRSCCheckChain.ts diff --git a/packages/typings/src/spec/slot/index.ts b/libs/typings/src/spec/slot/index.ts similarity index 100% rename from packages/typings/src/spec/slot/index.ts rename to libs/typings/src/spec/slot/index.ts diff --git a/packages/typings/tsconfig.json b/libs/typings/tsconfig.json similarity index 85% rename from packages/typings/tsconfig.json rename to libs/typings/tsconfig.json index 3cf2174e..46c593a5 100644 --- a/packages/typings/tsconfig.json +++ b/libs/typings/tsconfig.json @@ -1,11 +1,9 @@ { "compilerOptions": { - "lib": [ - "es2021" - ], + "lib": ["es2016"], "typeRoots": [], "module": "commonjs", - "target": "es2021", + "target": "es2016", "strict": true, "esModuleInterop": true, "skipLibCheck": true, diff --git a/package.json b/package.json index 0ff8a970..abc5199e 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,24 @@ { - "name": "@metalizz/nuster-kit", + "name": "@metalizzsas/nuster-kit", "version": "1.0.0", "description": "", "main": "", "scripts": { "dev": "pnpm -r --parallel --filter='./packages/*' run dev", - "build": "pnpm -r --parallel --filter='./packages/*' run build" + + "lint": "pnpm -r --parallel run lint", + "test": "pnpm -r --parallel run test", + + "build": "pnpm -r --parallel --filter='./packages/*' run build", + + "release": "changeset publish" }, "keywords": [], "author": "", "license": "ISC", "devDependencies": { + "@svitejs/changesets-changelog-github-compact": "^0.1.1", "@changesets/cli": "^2.25.0" - } + }, + "packageManager": "pnpm@7.13.0" } diff --git a/packages/desktop/.eslintignore b/packages/desktop/.eslintignore new file mode 100644 index 00000000..93d642a3 --- /dev/null +++ b/packages/desktop/.eslintignore @@ -0,0 +1,2 @@ +app.html +index.d.ts \ No newline at end of file diff --git a/packages/desktop/.eslintrc b/packages/desktop/.eslintrc deleted file mode 100644 index d3a23fdd..00000000 --- a/packages/desktop/.eslintrc +++ /dev/null @@ -1,22 +0,0 @@ -{ - "env": { - "browser": true, - "es6": true - }, - "parser": "babel-eslint", - "parserOptions": { - "ecmaVersion": 2019, - "sourceType": "module" - }, - "plugins": ["svelte3"], - "extends": ["eslint:recommended"], - "overrides": [ - { - "files": ["**/*.svelte"], - "processor": "svelte3/svelte3" - } - ], - "rules": { - // ... - } - } \ No newline at end of file diff --git a/packages/desktop/.eslintrc.cjs b/packages/desktop/.eslintrc.cjs new file mode 100644 index 00000000..11954685 --- /dev/null +++ b/packages/desktop/.eslintrc.cjs @@ -0,0 +1,20 @@ +module.exports = { + parser: "@typescript-eslint/parser", + parserOptions: { + project: "./tsconfig.json", + extraFileExtensions: [".svelte"], + }, + overrides: [ + { + files: ["*.svelte"], + parser: "svelte-eslint-parser", + parserOptions: { + parser: "@typescript-eslint/parser", + }, + }, + { + files: [".ts"], + parser: "@typescript-eslint/parser" + } + ], +}; \ No newline at end of file diff --git a/packages/desktop/.gitignore b/packages/desktop/.gitignore index fdd0fe83..d4ea20f6 100644 --- a/packages/desktop/.gitignore +++ b/packages/desktop/.gitignore @@ -1,6 +1,4 @@ -package-lock.json -types/env.d.ts -yarn-error.log + pnpm-lock.yaml node_modules/ .svelte-kit/ @@ -9,5 +7,4 @@ svelte-build/ .svelte/ *.local dist/ -build/* -!build/entitlements.mac.plist \ No newline at end of file +build/ \ No newline at end of file diff --git a/packages/desktop/dockerfile b/packages/desktop/dockerfile index 90af8cf5..a88e65a5 100644 --- a/packages/desktop/dockerfile +++ b/packages/desktop/dockerfile @@ -4,7 +4,7 @@ WORKDIR /usr/src/app COPY package*.json ./ -RUN JOBS=MAX npm install --unsafe-perm && npm cache verify +RUN --mount=type=secret,id=NPMRC,target=.npmrc npm install --save-dev COPY ./ ./ @@ -18,7 +18,7 @@ WORKDIR /usr/src/app COPY --from=builder usr/src/app/package*.json /usr/src/app/ -RUN npm i --omit=dev +RUN --mount=type=secret,id=NPMRC,target=.npmrc npm ci --omit=dev COPY --from=builder usr/src/app/build /usr/src/app/build diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 13d2b86c..fb2a55b9 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,11 +1,11 @@ { - "name": "@metalizz/nuster-desktop", + "name": "@metalizzsas/nuster-desktop", "version": "1.3.0", "private": true, "description": "Nuster Desktop", "main": "build/index.js", "license": "UNLICENSED", - "author": "Metalizz SAS", + "author": "@metalizzsas/kworz", "type": "module", "scripts": { "clean": "rm -rf ./node_modules/ && rm package-lock.json && npm i", @@ -13,7 +13,7 @@ "dev": "vite dev --port 3001 --host", "build": "vite build", "preview": "vite preview", - "lint": "eslint" + "lint-tocheck": "eslint ./src/** --ext .ts,svelte" }, "dependencies": { "@fontsource/montserrat": "^4.5.11", @@ -31,16 +31,17 @@ "tailwindcss": "^3.1.8" }, "devDependencies": { + "@metalizzsas/nuster-typings": "1.0.0", "@sveltejs/adapter-node": "^1.0.0-next.90", "@sveltejs/kit": "^1.0.0-next.481", "@types/cookie": "^0.5.1", "@types/howler": "^2.2.4", - "@typescript-eslint/eslint-plugin": "^5.37.0", - "@typescript-eslint/parser": "^5.37.0", - "@metalizz/nuster-typings": "1.0.0", + "@types/node": "18.8.1", + "@typescript-eslint/eslint-plugin": "^5.39.0", + "@typescript-eslint/parser": "^5.39.0", "dotenv": "^16.0.2", - "eslint": "^8.23.1", - "eslint-plugin-svelte": "^2.8.0", + "eslint": "^8.24.0", + "eslint-plugin-svelte": "^2.9.0", "howler": "^2.2.3", "npm-run-all": "^4.1.5", "prettier": "^2.5.1", @@ -48,6 +49,7 @@ "sass": "^1.44.0", "svelte": "^3.50.1", "svelte-check": "^2.9.0", + "svelte-eslint-parser": "^0.18.4", "svelte-preprocess": "^4.9.8", "typescript": "^4.5.2", "vite": "^3.1.0-beta.1" diff --git a/packages/desktop/src/lib/components/button.svelte b/packages/desktop/src/lib/components/button.svelte index 4c92e552..4d92f3ad 100644 --- a/packages/desktop/src/lib/components/button.svelte +++ b/packages/desktop/src/lib/components/button.svelte @@ -1,6 +1,6 @@

Profile values

- {#each Object.keys(profile.values) as key} - + {#each profile.values as field} + {/each}
diff --git a/packages/desktop/src/lib/components/cycle/quickstart.svelte b/packages/desktop/src/lib/components/cycle/quickstart.svelte index 526311ab..2295d498 100644 --- a/packages/desktop/src/lib/components/cycle/quickstart.svelte +++ b/packages/desktop/src/lib/components/cycle/quickstart.svelte @@ -16,10 +16,10 @@ import Modal from '../modals/modal.svelte'; import Modalprompt from '../modals/modalprompt.svelte'; - import type { IProfileHydrated } from '@metalizz/nuster-typings/src/hydrated/profile'; + import type { IProfileHydrated } from '@metalizzsas/nuster-typings/src/hydrated/profile'; let profiles: Array = []; - let selectedProfile: string = 'default'; + let selectedProfile = 'default'; let saveProfileModalShown = false; let saveProfileNameInvalid = false; @@ -47,12 +47,8 @@ result.id = 'skeleton'; result.name = '—'; - result.isPremade = false; - result.overwriteable = true; - profiles.push(result); - - profiles = profiles; + profiles = [...profiles, result]; selectedProfile = 'skeleton'; } @@ -140,7 +136,6 @@ { text: $_('cancel'), color: 'bg-gray-500', - callback: () => {}, }, ]} > @@ -170,7 +165,6 @@ { text: $_('no'), color: 'bg-gray-400', - callback: () => {}, }, ]} > @@ -204,7 +198,7 @@ {/each} - {#if profile.overwriteable} + {#if profile.isOverwritable !== false} {/if} - {#if profile.removable} + {#if profile.isRemovable !== false}