Merge pull request #2463 from smeup/dev-to-mas

10.1.0
smeup · Feb 3, 2025 · 67c742c · 67c742c
2 parents 0723a4f + d2b57dd
commit 67c742c
Show file tree

Hide file tree

Showing 315 changed files with 15,098 additions and 7,334 deletions.
diff --git a/.github/workflows/continuum.yaml b/.github/workflows/continuum.yaml
@@ -1,149 +1,149 @@
 name: continuum
 
 on:
-    push:
-        branches:
-            - develop
+  push:
+    branches:
+      - develop
 
 env:
-    VERSION: 11.0.0-SNAPSHOT
-    AWS_REGION: eu-south-1
+  VERSION: 11.0.0-SNAPSHOT
+  AWS_REGION: eu-south-1
 
 jobs:
-    ketchup-release:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v4
-
-            - name: Setup Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: '18.16.0'
-                  cache: 'yarn'
-
-            - name: Install dependencies
-              run: yarn install --immutable
-
-            - name: Run Ketchup build
-              run: npm run k:build
-
-            - name: Run Ketchup Showcase build
-              run: npm run ksc:build
-
-            - name: Zip artifacts
-              run: |
-                  cd packages/ketchup/dist
-                  zip -qr /tmp/ketchup.zip *
-                  zip -qr /tmp/ketchup-components.zip ketchup/*
-
-            - name: Setup AWS
-              uses: aws-actions/configure-aws-credentials@v4
-              with:
-                  aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-                  aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-                  aws-region: ${{ env.AWS_REGION }}
-
-            - name: Upload artifacts to AWS S3
-              run: |
-                  aws s3 cp /tmp/ketchup.zip s3://smeup-ketchup/npm-pub/ketchup-stencil/${{ env.VERSION }}/zip/ketchup.zip
-                  aws s3 cp /tmp/ketchup-components.zip s3://smeup-ketchup/npm-pub/ketchup-stencil/${{ env.VERSION }}/zip/ketchup-components.zip
-
-            # Prepare GitHub Pages Showcase deployment
-            - name: Setup GitHub Pages
-              uses: actions/configure-pages@v5
-            - name: Upload GitHub Pages artifact
-              uses: actions/upload-pages-artifact@v3
-              with:
-                  path: './packages/ketchup-showcase/dist'
-
-    # Showcase Deployment Job
-    showcase-release:
-        needs: ketchup-release
-        runs-on: ubuntu-latest
-        # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
-        permissions:
-            pages: write # to deploy to Pages
-            id-token: write # to verify the deployment originates from an appropriate source
-
-        # Deploy to the github-pages environment
-        environment:
-            name: github-pages
-            url: ${{ steps.deployment.outputs.page_url }}
-        steps:
-            - name: Deploy to GitHub Pages
-              id: deployment
-              uses: actions/deploy-pages@v4
-
-    build:
-        runs-on: ubuntu-latest
-        needs: ketchup-release
-        steps:
-            - uses: actions/checkout@v4
-            - uses: actions/setup-node@v4
-              with:
-                  node-version: '18.x'
-                  registry-url: 'https://registry.npmjs.org'
-
-            - name: Install dependencies
-              run: yarn install --no-immutable
-
-            - name: Update Ketchup Version with Timestamp
-              run: |
-                  cd packages/ketchup
-                  VERSION=$(node -p "require('./package.json').version")
-                  TIMESTAMP=$(date +%Y%m%d%H%M%S)
-                  NEW_VERSION="${VERSION}-${TIMESTAMP}"
-                  echo "New version: $NEW_VERSION"
-                  sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/" ./package.json
-
-            - name: Update Ketchup React Version with Timestamp
-              run: |
-                  cd packages/ketchup-react
-                  VERSION=$(node -p "require('./package.json').version")
-                  TIMESTAMP=$(date +%Y%m%d%H%M%S)
-                  NEW_VERSION="${VERSION}-${TIMESTAMP}"
-                  echo "New version: $NEW_VERSION"
-                  sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/" ./package.json
-
-            - name: Run Ketchup build
-              run: npm run k:build
-
-            - name: Publish Ketchup
-              run: |
-                  cd packages/ketchup
-                  npm publish
-              env:
-                  NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-            - name: Publish Ketchup React
-              run: |
-                  cd packages/ketchup-react
-                  npm publish
-              env:
-                  NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-    trigger-webup-continuum:
-        needs: build
-        runs-on: ubuntu-latest
-        steps:
-            - run: |
-                  curl -L \
-                    -X POST \
-                    -H "Accept: application/vnd.github+json" \
-                    -H "Authorization: Bearer ${{ secrets.ROBBY_SMEUP_PAT }}" \
-                    -H "X-GitHub-Api-Version: 2022-11-28" \
-                    https://api.github.com/repos/smeup/webup-project/actions/workflows/continuum.yaml/dispatches \
-                    -d '{"ref": "develop"}'
-
-    trigger-webupjs-develop:
-        needs: build
-        runs-on: ubuntu-latest
-        steps:
-            - run: |
-                  curl -L \
-                    -X POST \
-                    -H "Accept: application/vnd.github+json" \
-                    -H "Authorization: Bearer ${{ secrets.ROBBY_SMEUP_PAT }}" \
-                    -H "X-GitHub-Api-Version: 2022-11-28" \
-                    https://api.github.com/repos/smeup/webup.js/actions/workflows/develop-release.yaml/dispatches \
-                    -d '{"ref": "develop"}'
+  ketchup-release:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+          node-version: '18.16.0'
+          cache: 'yarn'
+
+    - name: Install dependencies
+      run: yarn install --immutable
+
+    - name: Run Ketchup build
+      run: npm run k:build
+
+    - name: Run Ketchup Showcase build
+      run: npm run ksc:build
+
+    - name: Zip artifacts
+      run: |
+          cd packages/ketchup/dist
+          zip -qr /tmp/ketchup.zip *
+          zip -qr /tmp/ketchup-components.zip ketchup/*
+
+    - name: Setup AWS
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+    - name: Upload artifacts to AWS S3
+      run: |
+          aws s3 cp /tmp/ketchup.zip s3://smeup-ketchup/npm-pub/ketchup-stencil/${{ env.VERSION }}/zip/ketchup.zip
+          aws s3 cp /tmp/ketchup-components.zip s3://smeup-ketchup/npm-pub/ketchup-stencil/${{ env.VERSION }}/zip/ketchup-components.zip
+
+    # Prepare GitHub Pages Showcase deployment
+    - name: Setup GitHub Pages
+      uses: actions/configure-pages@v5
+    - name: Upload GitHub Pages artifact
+      uses: actions/upload-pages-artifact@v3
+      with:
+          path: './packages/ketchup-showcase/dist'
+
+  # Showcase Deployment Job
+  showcase-release:
+    needs: ketchup-release
+    runs-on: ubuntu-latest
+    # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
+    permissions:
+      pages: write # to deploy to Pages
+      id-token: write # to verify the deployment originates from an appropriate source
+
+    # Deploy to the github-pages environment
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+    - name: Deploy to GitHub Pages
+      id: deployment
+      uses: actions/deploy-pages@v4
+
+  build:
+    runs-on: ubuntu-latest
+    needs: ketchup-release
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: '18.x'
+        registry-url: 'https://registry.npmjs.org'
+
+    - name: Install dependencies
+      run: yarn install --no-immutable
+
+    - name: Update Ketchup Version with Timestamp
+      run: |
+        cd packages/ketchup
+        VERSION=$(node -p "require('./package.json').version")
+        TIMESTAMP=$(date +%Y%m%d%H%M%S)
+        NEW_VERSION="${VERSION}-${TIMESTAMP}"
+        echo "New version: $NEW_VERSION"
+        sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/" ./package.json
+
+    - name: Update Ketchup React Version with Timestamp
+      run: |
+        cd packages/ketchup-react
+        VERSION=$(node -p "require('./package.json').version")
+        TIMESTAMP=$(date +%Y%m%d%H%M%S)
+        NEW_VERSION="${VERSION}-${TIMESTAMP}"
+        echo "New version: $NEW_VERSION"
+        sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/" ./package.json
+
+    - name: Run Ketchup build
+      run: npm run k:build
+
+    - name: Publish Ketchup
+      run: |
+        cd packages/ketchup
+        npm publish
+      env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+    - name: Publish Ketchup React
+      run: |
+        cd packages/ketchup-react
+        npm publish
+      env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  trigger-webup-continuum:
+      needs: build
+      runs-on: ubuntu-latest
+      steps:
+      - run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.ROBBY_SMEUP_PAT }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/smeup/webup-project/actions/workflows/continuum.yaml/dispatches \
+            -d '{"ref": "develop"}'
+
+  trigger-webupjs-develop:
+      needs: build
+      runs-on: ubuntu-latest
+      steps:
+      - run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.ROBBY_SMEUP_PAT }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/smeup/webup.js/actions/workflows/ketchup-update.yaml/dispatches \
+            -d '{"ref": "develop"}'
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,9 +1,19 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Debug Stencil Build",
+            "skipFiles": ["<node_internals>/**"],
+            "program": "${workspaceFolder}/packages/ketchup/node_modules/@stencil/core/bin/stencil",
+            "args": ["build", "--dev", "--debug"],
+            "cwd": "${workspaceFolder}/packages/ketchup",
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "openOnSessionStart",
+            "outFiles": ["${workspaceFolder}/**/*.js"],
+            "runtimeArgs": ["--preserve-symlinks"]
+        },
         {
             "type": "node",
             "request": "launch",

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,7 +1,7 @@
 # Order is important. The last matching pattern has the most precedence.
 # So if a pull request only touches javascript files, only these owners
 # will be requested to review.
-*.js    @lucafoscili @pasere-smeup
+*.js    @lucafoscili @pasere-smeup @Leonardo-Signorelli
 
 # These owners will be the default owners for everything in the repo.
-*       @lucafoscili @pasere-smeup
+*       @lucafoscili @pasere-smeup @Leonardo-Signorelli
diff --git a/package.json b/package.json
@@ -15,16 +15,19 @@
     "author": "Gruppo Sme.UP <[email protected]> (https://www.smeup.com/)",
     "repository": "https://github.com/smeup/ketchup",
     "devDependencies": {
-        "@types/d3-shape": "^3.1.1",
-        "@types/geojson": "^7946.0.10",
-        "@types/jest": "^27.0.3",
-        "@types/node": "^20.2.5",
-        "@types/numeral": "^2.0.2",
-        "@types/react": "^18.2.7",
-        "@types/react-dom": "^18.2.4",
-        "eslint": "^8.46.0",
-        "lerna": "^7.1.4",
-        "workbox-build": "^7.0.0"
+        "@types/d3-shape": "3.1.6",
+        "@types/geojson": "7946.0.14",
+        "@types/jest": "27.0.3",
+        "@types/node": "18.16.0",
+        "@types/react": "^18",
+        "@types/react-dom": "^18",
+        "eslint": "8.46.0",
+        "lerna": "^8",
+        "typescript": "^5",
+        "workbox-build": "7.3.0"
+    },
+    "dependencies": {
+        "math-expression-evaluator": "^2.0.6"
     },
     "scripts": {
         "lerna": "lerna",