Merge branch 'main' into multi-owner

ZenVoich · Dec 10, 2024 · 6dfdc71 · 6dfdc71
2 parents e62b7bf + 8e3804f
commit 6dfdc71
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 7 deletions.
diff --git a/cli-releases/releases.json b/cli-releases/releases.json
@@ -1,6 +1,6 @@
 {
   "tags": {
-    "latest": "1.1.1"
+    "latest": "1.1.2"
   },
   "versions": {
     "0.41.0": {
@@ -104,6 +104,14 @@
       "commitHash": "81f69d54900d536e23ca56cfba0095d12d10a082",
       "url": "https://cli.mops.one/versions/1.1.1.tgz",
       "hash": "11471e7a0e6dd44f0c573e79724f1a2d447cc8e256f20960a39e01de651c753a"
+    },
+    "1.1.2": {
+      "time": 1733808678915,
+      "size": 717007,
+      "relseaseNotes": "* Fixed `{MOPS_ENV}` substitution in local package path\n",
+      "commitHash": "a894d3d31cc4acf9137f7187383110a7007279e6",
+      "url": "https://cli.mops.one/versions/1.1.2.tgz",
+      "hash": "026fe911da71223cc4e1ccf9401ab91f3b34bad0d6a649472ec4dc304ceb2eed"
     }
   }
 }
diff --git a/cli-releases/tags/latest b/cli-releases/tags/latest
@@ -1 +1 @@
-1.1.1
+1.1.2
diff --git a/cli-releases/versions/1.1.2.tgz b/cli-releases/versions/1.1.2.tgz
diff --git a/cli-releases/versions/1.tgz b/cli-releases/versions/1.tgz
diff --git a/cli-releases/versions/latest.tgz b/cli-releases/versions/latest.tgz
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -6,6 +6,9 @@
 - Added `mops maintainers` command to manage package maintainers ([docs](https://docs.mops.one/cli/mops-maintainers))
 - Fixed bug where `mops watch` would fail if dfx.json did not exist
 
+## 1.1.2
+- Fixed `{MOPS_ENV}` substitution in local package path
+
 ## 1.1.1
 - `moc-wrapper` now adds hostname to the moc path cache(`.mops/moc-*` filename) to avoid errors when running in Dev Containers
 - `mops watch` now deploys canisters with the `--yes` flag to skip data loss confirmation

diff --git a/cli/DEVELOPMENT.md b/cli/DEVELOPMENT.md
@@ -33,7 +33,7 @@ npm publish
 
 Check release hash of latest build for version `0.0.0` at https://github.com/ZenVoich/mops/actions/workflows/build-hash.yml
 
-Build locally veersion `0.0.0`
+Build locally version `0.0.0`
 ```
 MOPS_VERSION=0.0.0 ./build.sh
 ```

diff --git a/cli/commands/install/install-local-dep.ts b/cli/commands/install/install-local-dep.ts
@@ -27,7 +27,7 @@ export async function installLocalDep(pkg : string, pkgPath = '', {verbose, sile
 
 	// install dependencies
 	if (!ignoreTransitive) {
-		let dir = path.resolve(getRootDir(), pkgPath);
+		let dir = path.resolve(getRootDir(), pkgPath).replaceAll('{MOPS_ENV}', process.env.MOPS_ENV || 'local');
 		let config = readConfig(path.join(dir, 'mops.toml'));
 		return installDeps(Object.values(config.dependencies || {}), {silent, verbose}, pkgPath);
 	}

diff --git a/cli/package-lock.json b/cli/package-lock.json
diff --git a/cli/package.json b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",