From 2315a1ec58683950ee161523943fb4faef4856a4 Mon Sep 17 00:00:00 2001 From: Bouillaguet Quentin Date: Wed, 12 Feb 2025 15:32:31 +0100 Subject: [PATCH] feat: renaming packages --- .github/workflows/integration.yml | 13 ++++++++----- config/babel-register/babel-hooks.mjs | 3 +++ package.json | 4 ++-- packages/Debug/package.json | 6 +++--- packages/Geographic/package.json | 2 +- packages/Main/package.json | 4 ++-- packages/Widgets/package.json | 4 ++-- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 81113b6ca0..ac73ca3339 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -83,9 +83,9 @@ jobs: strategy: matrix: include: - - package: "@itowns/geographic" + - package: "monorepo-itowns-geo" path: "Geographic" - - package: "itowns" + - package: "monorepo-itowns" path: "Main" steps: @@ -162,6 +162,7 @@ jobs: name: Publish NPM package if: ${{ github.ref == 'refs/heads/master' }} needs: [finish-coverage, functional-tests] + # needs: [build, check-commit-message] runs-on: ubuntu-latest permissions: # id-token: write permission is required for npm provenance: @@ -221,7 +222,8 @@ jobs: deploy: name: Deploy to itowns.github.io if: ${{ github.ref == 'refs/heads/master' }} - needs: [finish-coverage, functional-tests] + # needs: [finish-coverage, functional-tests] + needs: [build, check-commit-message] runs-on: ubuntu-latest steps: @@ -256,7 +258,7 @@ jobs: uses: peaceiris/actions-gh-pages@v3 with: deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} - external_repository: iTowns/itowns.github.io + external_repository: desplandis/itowns.github.io publish_dir: ./itowns destination_dir: ./itowns publish_branch: master @@ -271,7 +273,7 @@ jobs: uses: peaceiris/actions-gh-pages@v3 with: deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} - external_repository: iTowns/itowns.github.io + external_repository: desplandis/itowns.github.io publish_dir: ./itowns destination_dir: ./itowns/dev publish_branch: master @@ -283,6 +285,7 @@ jobs: name: Release GitHub if: ${{ github.ref == 'refs/heads/master' && startsWith( github.event.head_commit.message, 'release v' ) }} needs: [finish-coverage, functional-tests] + # needs: [build, check-commit-message] runs-on: ubuntu-latest steps: diff --git a/config/babel-register/babel-hooks.mjs b/config/babel-register/babel-hooks.mjs index 58443a4929..318bd6d8b9 100644 --- a/config/babel-register/babel-hooks.mjs +++ b/config/babel-register/babel-hooks.mjs @@ -71,6 +71,9 @@ async function transpile(source, context) { * the Node.js default resolve hook after the last user-supplied resolve hook */ export async function resolve(specifier, context, nextResolve) { + if (specifier == '@itowns/geographic') { + specifier = 'monorepo-itowns-geo'; + } // Try to resolve the path of an imported module. // If the resolver failed, retry substituting the extension with '.ts'. try { diff --git a/package.json b/package.json index 641add3b69..5af70ad9eb 100644 --- a/package.json +++ b/package.json @@ -55,11 +55,11 @@ ], "repository": { "type": "git", - "url": "git+https://github.com/iTowns/itowns.git" + "url": "git+https://github.com/desplandis/itowns.git" }, "license": "(CECILL-B OR MIT)", "bugs": { - "url": "https://github.com/iTowns/itowns/issues" + "url": "https://github.com/desplandis/itowns/issues" }, "homepage": "https://itowns.github.io/", "devDependencies": { diff --git a/packages/Debug/package.json b/packages/Debug/package.json index 8a3b2f4144..df84b317b3 100644 --- a/packages/Debug/package.json +++ b/packages/Debug/package.json @@ -24,14 +24,14 @@ }, "license": "(CECILL-B OR MIT)", "bugs": { - "url": "https://github.com/itowns/itowns/issues" + "url": "https://github.com/iTowns/itowns/issues" }, "homepage": "https://itowns.github.io/", "dependencies": { - "@itowns/geographic": "^2.44.2", + "monorepo-itowns-geo": "^2.44.2", "chart.js": "^4.4.4", "dat.gui": "^0.7.9", - "itowns": "^2.44.2", + "monorepo-itowns": "^2.44.2", "@tweenjs/tween.js": "^25.0.0" }, "peerDependencies": { diff --git a/packages/Geographic/package.json b/packages/Geographic/package.json index 4a5e7435f2..9d55ea395d 100644 --- a/packages/Geographic/package.json +++ b/packages/Geographic/package.json @@ -1,5 +1,5 @@ { - "name": "@itowns/geographic", + "name": "monorepo-itowns-geo", "version": "2.44.2", "description": "Geodesy", "type": "module", diff --git a/packages/Main/package.json b/packages/Main/package.json index 74575ff202..e751b04cf3 100644 --- a/packages/Main/package.json +++ b/packages/Main/package.json @@ -1,5 +1,5 @@ { - "name": "itowns", + "name": "monorepo-itowns", "version": "2.44.2", "description": "A JS/WebGL framework for 3D geospatial data visualization", "type": "module", @@ -48,7 +48,7 @@ "url": "https://github.com/iTowns/itowns/issues" }, "dependencies": { - "@itowns/geographic": "^2.44.2", + "monorepo-itowns-geo": "^2.44.2", "@mapbox/vector-tile": "^2.0.3", "@maplibre/maplibre-gl-style-spec": "^22.0.0", "@tmcw/togeojson": "^5.8.1", diff --git a/packages/Widgets/package.json b/packages/Widgets/package.json index d9af297425..c11dd919d2 100644 --- a/packages/Widgets/package.json +++ b/packages/Widgets/package.json @@ -30,8 +30,8 @@ "url": "https://github.com/itowns/itowns/issues" }, "dependencies": { - "@itowns/geographic": "^2.44.2", - "itowns": "^2.44.2" + "monorepo-itowns-geo": "^2.44.2", + "monorepo-itowns": "^2.44.2" }, "homepage": "https://itowns.github.io/" }