chore: FIXES NEED TO MERGE

gchoqueux · Jan 27, 2025 · 908710a · 908710a
1 parent 2a55e71
commit 908710a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -30,9 +30,9 @@
     "watch": "node ./config/concurrently.mjs watch",
     "changelog": "conventional-changelog -n ./config/conventionalChangelog/config.cjs -i changelog.md -s",
     "bump": "if [ -z $npm_config_level ]; then grunt bump:minor;  else grunt bump:$npm_config_level; fi && npm run changelog && npm run update-packages && npm install && git add -A && git commit --amend --no-edit",
-    "publish-next": "npm run publish-next -workspaces --if-present && npm publish --access public --tag=next --workspaces --provenance",
-    "publish-latest": "npm publish --access public --tag=latest --provenance --workspaces",
-    "update-packages": "npm run update-package -workspaces --if-present"
+    "publish-next": "npm version prerelease --preid next && npm run prerelease-next --workspaces --if-present && npm run publish-next --workspaces --if-present",
+    "publish-latest": "npm run publish-latest --workspaces --if-present",
+    "update-packages": "npm run update-package --workspaces --if-present"
   },
   "c8": {
     "exclude": [

diff --git a/packages/Debug/package.json b/packages/Debug/package.json
@@ -9,7 +9,9 @@
   "scripts": {
     "lint": "eslint \"src/**/*.{js,ts,tsx}\"",
     "transpile": "cross-env BABEL_DISABLE_CACHE=1 babel src --out-dir lib --extensions .js,.ts",
-    "watch": "npm run transpile -- --watch"
+    "watch": "npm run transpile -- --watch",
+    "prerelease-next": "npm version prerelease --preid next && npm run update-package",
+    "update-package": "npm remove @itowns/geographic itowns && npm install @itowns/geographic@$npm_package_version itowns@$npm_package_version --save"
   },
   "files": [
     "*.md",
@@ -26,6 +28,7 @@
   },
   "homepage": "https://itowns.github.io/",
   "dependencies": {
+    "@itowns/geographic": "^2.44.2",
     "chart.js": "^4.4.4",
     "dat.gui": "^0.7.9",
     "itowns": "^2.44.2",

diff --git a/packages/Geographic/package.json b/packages/Geographic/package.json
@@ -16,7 +16,9 @@
     "test-with-coverage": "c8 -n src -r html cross-env npm run test-unit",
     "test-with-coverage_lcov": "c8 -n src --reporter=lcov cross-env npm run test-unit",
     "watch": "npm run transpile -- --watch",
-    "publish-next": "npm version prerelease --preid next"
+    "publish-latest": "npm publish --access public --tag=latest --provenance",
+    "prerelease-next": "npm version prerelease --preid next",
+    "publish-next": "npm publish --access public --tag=next"
   },
   "files": [
     "*.md",

diff --git a/packages/Main/package.json b/packages/Main/package.json
@@ -19,7 +19,9 @@
     "postinstall": "cross-env NO_UPDATE_NOTIFIER=true node ./scripts/prepare.mjs && node ./scripts/replace.config.mjs",
     "prepublishOnly": "npx copyfiles -u 1 \"../../examples/**/*\" ./examples/ && npx copyfiles -u 1 \"../../docs/**/*\" ./docs/ && npx copyfiles -u 1 \"../../dist/**/*\" ./dist/ ",
     "postpublish": "node clean.cjs",
-    "publish-next": "npm version prerelease --preid next && npm run update-package",
+    "publish-latest": "npm publish --access public --tag=latest --provenance",
+    "prerelease-next": "npm version prerelease --preid next && npm run update-package",
+    "publish-next": "npm publish --access public --tag=next --provenance",
     "update-package": "npm remove @itowns/geographic && npm install @itowns/geographic@$npm_package_version --save"
   },
   "c8": {

diff --git a/packages/Widgets/package.json b/packages/Widgets/package.json
@@ -13,7 +13,8 @@
     "transpileOnly": "cross-env BABEL_DISABLE_CACHE=1 babel src --out-dir lib --extensions .js,.ts",
     "transpile": "npm run transpileOnly && npm run copy_transpile",
     "watch": "npm run transpileOnly -- --watch",
-    "publish-next": "npm version prerelease --preid next"
+    "prerelease-next": "npm version prerelease --preid next && npm run update-package",
+    "update-package": "npm remove @itowns/geographic itowns && npm install @itowns/geographic@$npm_package_version itowns@$npm_package_version --save"
   },
   "files": [
     "*.md",