@onflow/config - npm Package Compare versions

Comparing version 1.4.1 to 1.5.0-alpha.0

CHANGELOG.md

 # @onflow/config
 
+## 1.5.0-alpha.0
+
+### Minor Changes
+
+- [`cd234798`](https://github.com/onflow/fcl-js/commit/cd234798008868df13447ea97654b7e278dd746f) Thanks [@nialexsan](https://github.com/nialexsan)! - Add `ignoreConflicts` flag to `config.load`
+
 ## 1.4.1
@@ -4,0 +10,0 @@

dist/config.js

@@ -436,4 +436,9 @@ 'use strict';
  * @param data.flowJSON - The flow.json or array of flow.json files
+ * @param options - override flag
+ * @param options.ignoreConflicts - ignore conflicts and override config
  */
 async function load(data) {
+  let {
+    ignoreConflicts = false
+  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   const network = await get("flow.network");
@@ -458,3 +463,3 @@ const cleanedNetwork = cleanNetwork(network);
     const existingContractConfigKey = await get(contractConfigKey);
-    if (existingContractConfigKey && existingContractConfigKey !== value) {
+    if (existingContractConfigKey && existingContractConfigKey !== value && !ignoreConflicts) {
       logger__namespace.log({
@@ -470,3 +475,3 @@ title: "Contract Placeholder Conflict Detected",
     const systemExistingContractConfigKeyValue = await get(systemContractConfigKey);
-    if (systemExistingContractConfigKeyValue && systemExistingContractConfigKeyValue !== value) {
+    if (systemExistingContractConfigKeyValue && systemExistingContractConfigKeyValue !== value && !ignoreConflicts) {
       logger__namespace.log({
@@ -473,0 +478,0 @@ title: "Contract Placeholder Conflict Detected",

dist/config.module.js

@@ -412,4 +412,9 @@ import { spawn, SUBSCRIBE, UNSUBSCRIBE, send, subscriber } from '@onflow/util-actor';
  * @param data.flowJSON - The flow.json or array of flow.json files
+ * @param options - override flag
+ * @param options.ignoreConflicts - ignore conflicts and override config
  */
 async function load(data) {
+  let {
+    ignoreConflicts = false
+  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   const network = await get("flow.network");
@@ -434,3 +439,3 @@ const cleanedNetwork = cleanNetwork(network);
     const existingContractConfigKey = await get(contractConfigKey);
-    if (existingContractConfigKey && existingContractConfigKey !== value) {
+    if (existingContractConfigKey && existingContractConfigKey !== value && !ignoreConflicts) {
       logger.log({
@@ -446,3 +451,3 @@ title: "Contract Placeholder Conflict Detected",
     const systemExistingContractConfigKeyValue = await get(systemContractConfigKey);
-    if (systemExistingContractConfigKeyValue && systemExistingContractConfigKeyValue !== value) {
+    if (systemExistingContractConfigKeyValue && systemExistingContractConfigKeyValue !== value && !ignoreConflicts) {
       logger.log({
@@ -449,0 +454,0 @@ title: "Contract Placeholder Conflict Detected",

dist/config.umd.js

@@ -434,4 +434,9 @@ (function (global, factory) {
    * @param data.flowJSON - The flow.json or array of flow.json files
+   * @param options - override flag
+   * @param options.ignoreConflicts - ignore conflicts and override config
    */
   async function load(data) {
+    let {
+      ignoreConflicts = false
+    } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     const network = await get("flow.network");
@@ -456,3 +461,3 @@ const cleanedNetwork = cleanNetwork(network);
       const existingContractConfigKey = await get(contractConfigKey);
-      if (existingContractConfigKey && existingContractConfigKey !== value) {
+      if (existingContractConfigKey && existingContractConfigKey !== value && !ignoreConflicts) {
         logger__namespace.log({
@@ -468,3 +473,3 @@ title: "Contract Placeholder Conflict Detected",
       const systemExistingContractConfigKeyValue = await get(systemContractConfigKey);
-      if (systemExistingContractConfigKeyValue && systemExistingContractConfigKeyValue !== value) {
+      if (systemExistingContractConfigKeyValue && systemExistingContractConfigKeyValue !== value && !ignoreConflicts) {
         logger__namespace.log({
@@ -471,0 +476,0 @@ title: "Contract Placeholder Conflict Detected",

package.json

 {
   "name": "@onflow/config",
-  "version": "1.4.1",
+  "version": "1.5.0-alpha.0",
   "description": "Config for FCL-JS",
@@ -17,3 +17,3 @@ "license": "Apache-2.0",
     "@babel/preset-typescript": "^7.22.11",
-    "@onflow/fcl-bundle": "1.4.2",
+    "@onflow/fcl-bundle": "1.5.0",
     "@types/estree": "^1.0.1",
@@ -20,0 +20,0 @@ "@types/jest": "^29.5.4",

types/config.d.ts

@@ -93,5 +93,9 @@ /**
  * @param data.flowJSON - The flow.json or array of flow.json files
+ * @param options - override flag
+ * @param options.ignoreConflicts - ignore conflicts and override config
  */
 declare function load(data: {
     flowJSON: Record<string, unknown> | Record<string, unknown>[];
+}, { ignoreConflicts, }?: {
+    ignoreConflicts?: boolean;
 }): Promise<void>;
@@ -128,2 +132,4 @@ /**
             flowJSON: Record<string, unknown> | Record<string, unknown>[];
+        }, { ignoreConflicts, }?: {
+            ignoreConflicts?: boolean | undefined;
         }) => Promise<void>;
@@ -146,2 +152,4 @@ };
             flowJSON: Record<string, unknown> | Record<string, unknown>[];
+        }, { ignoreConflicts, }?: {
+            ignoreConflicts?: boolean | undefined;
         }) => Promise<void>;
@@ -155,2 +163,4 @@ };
         flowJSON: Record<string, unknown> | Record<string, unknown>[];
+    }, { ignoreConflicts, }?: {
+        ignoreConflicts?: boolean | undefined;
     }) => Promise<void>;
@@ -157,0 +167,0 @@ export { _a as delete };

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

175367

increased by1.71%

Lines of code

1756

increased by1.44%

Worsened metrics

Number of low quality alerts

1

increased byInfinity%

No dependency changes