@pgpmjs/core 6.17.1 → 6.18.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -829,10 +829,14 @@ ${dependencies.length > 0 ? dependencies.map(dep => `-- requires: ${dep}`).join(
829
829
  const installs = matches.map((conf) => {
830
830
  const fullConf = (0, path_1.resolve)(conf);
831
831
  const extDir = (0, path_1.dirname)(fullConf);
832
- const relativeDir = extDir.split('node_modules/')[1];
832
+ const parts = extDir.split('node_modules/');
833
+ const relativeDir = parts[parts.length - 1];
833
834
  const dstDir = path_1.default.join(skitchExtDir, relativeDir);
834
835
  return { src: extDir, dst: dstDir, pkg: relativeDir };
835
836
  });
837
+ // Sort deepest paths first so nested node_modules deps are
838
+ // extracted before their parent directories are moved.
839
+ installs.sort((a, b) => b.src.split('/').length - a.src.split('/').length);
836
840
  for (const { src, dst, pkg } of installs) {
837
841
  if (fs_1.default.existsSync(dst)) {
838
842
  fs_1.default.rmSync(dst, { recursive: true, force: true });
@@ -790,10 +790,14 @@ ${dependencies.length > 0 ? dependencies.map(dep => `-- requires: ${dep}`).join(
790
790
  const installs = matches.map((conf) => {
791
791
  const fullConf = resolve(conf);
792
792
  const extDir = dirname(fullConf);
793
- const relativeDir = extDir.split('node_modules/')[1];
793
+ const parts = extDir.split('node_modules/');
794
+ const relativeDir = parts[parts.length - 1];
794
795
  const dstDir = path.join(skitchExtDir, relativeDir);
795
796
  return { src: extDir, dst: dstDir, pkg: relativeDir };
796
797
  });
798
+ // Sort deepest paths first so nested node_modules deps are
799
+ // extracted before their parent directories are moved.
800
+ installs.sort((a, b) => b.src.split('/').length - a.src.split('/').length);
797
801
  for (const { src, dst, pkg } of installs) {
798
802
  if (fs.existsSync(dst)) {
799
803
  fs.rmSync(dst, { recursive: true, force: true });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pgpmjs/core",
3
- "version": "6.17.1",
3
+ "version": "6.18.1",
4
4
  "author": "Constructive <developers@constructive.io>",
5
5
  "description": "PGPM Package and Migration Tools",
6
6
  "main": "index.js",
@@ -48,21 +48,21 @@
48
48
  "makage": "^0.3.0"
49
49
  },
50
50
  "dependencies": {
51
- "@pgpmjs/env": "^2.22.1",
52
- "@pgpmjs/logger": "^2.10.1",
53
- "@pgpmjs/server-utils": "^3.10.1",
54
- "@pgpmjs/types": "^2.26.1",
55
- "csv-to-pg": "^3.16.1",
51
+ "@pgpmjs/env": "^2.23.0",
52
+ "@pgpmjs/logger": "^2.11.0",
53
+ "@pgpmjs/server-utils": "^3.11.0",
54
+ "@pgpmjs/types": "^2.27.0",
55
+ "csv-to-pg": "^3.17.0",
56
56
  "genomic": "^5.3.9",
57
57
  "glob": "^13.0.6",
58
58
  "minimatch": "^10.2.4",
59
59
  "parse-package-name": "^1.0.0",
60
60
  "pg": "^8.20.0",
61
- "pg-cache": "^3.9.1",
62
- "pg-env": "^1.13.1",
61
+ "pg-cache": "^3.10.0",
62
+ "pg-env": "^1.14.0",
63
63
  "pgsql-deparser": "^17.18.2",
64
64
  "pgsql-parser": "^17.9.14",
65
65
  "yanse": "^0.2.1"
66
66
  },
67
- "gitHead": "d43f1d7e38cc39a71b4f8d2cafb39f46df12e31a"
67
+ "gitHead": "62282a9e2b4a72a68c6c3c6a8729e3a0a42a54b2"
68
68
  }