Merge branch 'angus-c:master' into order-by

angus-c · Mar 12, 2023 · 0363942 · 0363942
2 parents bba16ee + 50bd940
commit 0363942
Show file tree

Hide file tree

Showing 17 changed files with 545 additions and 21,544 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x, 18.x]
+        node-version: [14.x, 16.x, 18.x]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Angus Croll
+Copyright (c) 2016-2023 Angus Croll
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -916,10 +916,6 @@ const obj3 = {a: {aa: {aaa: 2}}};
 set(obj3, 'a.aa.aaa', 3); // true
 obj3; // {a: {aa: {aaa: 3}}}
 
-// don't clobber existing
-const obj4 = {a: {aa: {aaa: 2}}};
-set(obj4, 'a.aa', {bbb: 7}); // false
-
 const obj5 = {a: {}};
 const sym = Symbol();
 set(obj5.a, sym, 7); // true
@@ -1560,7 +1556,7 @@ yarn add just-permutations
 Returns all permutations of the length N of the elements of the given Array
 
 ```js
-import permutations from 'just-array-permutations;
+import permutations from 'just-permutations';
 
 permutations([1, 2, 3]); // [[1, 2, 3], [2, 1, 3], [2, 3, 1], [1, 3, 2], [3, 1, 2], [3, 2, 1]]
 permutations([]); // []

diff --git a/lerna.json b/lerna.json
@@ -1,4 +1,4 @@
 {
-  "lerna": "2.0.0-beta.23",
+  "lerna": "3.20.2",
   "version": "independent"
 }
diff --git a/md-variables.json b/md-variables.json
@@ -301,7 +301,7 @@
     "dir": "array-permutations",
     "description": "Returns all permutations of the length N of the elements of the given Array",
     "examples": [
-      "import permutations from 'just-array-permutations;",
+      "import permutations from 'just-permutations';",
       "",
       "permutations([1, 2, 3]); // [[1, 2, 3], [2, 1, 3], [2, 3, 1], [1, 3, 2], [3, 1, 2], [3, 2, 1]]",
       "permutations([]); // []",
@@ -1448,10 +1448,6 @@
       "set(obj3, 'a.aa.aaa', 3); // true",
       "obj3; // {a: {aa: {aaa: 3}}}",
       "",
-      "// don't clobber existing",
-      "const obj4 = {a: {aa: {aaa: 2}}};",
-      "set(obj4, 'a.aa', {bbb: 7}); // false",
-      "",
       "const obj5 = {a: {}};",
       "const sym = Symbol();",
       "set(obj5.a, sym, 7); // true",