Skip to content

Commit

Permalink
feat: renaming packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Desplandis committed Feb 12, 2025
1 parent faa9160 commit 2315a1e
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 15 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:

Expand Down
3 changes: 3 additions & 0 deletions config/babel-register/babel-hooks.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions packages/Debug/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/Geographic/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@itowns/geographic",
"name": "monorepo-itowns-geo",
"version": "2.44.2",
"description": "Geodesy",
"type": "module",
Expand Down
4 changes: 2 additions & 2 deletions packages/Main/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/Widgets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
}

0 comments on commit 2315a1e

Please sign in to comment.