cnpmcore 4.33.0 → 4.33.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.
Files changed (2) hide show
  1. package/dist/app/common/adapter/binary/PlaywrightBinary.js +142 -84
  2. package/package.json +5 -5
package/dist/app/common/adapter/binary/PlaywrightBinary.js CHANGED
@@ -14,123 +14,134 @@ const DOWNLOAD_HOST = 'https://playwright.azureedge.net/';
14
14
  // https://github.com/playwright-community/playwright-go/blob/56e30d60f8b42785982469eaca6ad969bc2e1946/run.go#L341-L374
15
15
  const PLAYWRIGHT_DRIVER_ARCHS = ['win32_x64', 'mac-arm64', 'mac', 'linux-arm64', 'linux'];
16
16
  // https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/server/registry/index.ts
17
+ // CFT entries use Chrome for Testing URLs: builds/cft/{browserVersion}/{suffix}
18
+ // (introduced in playwright 1.58.1, see https://github.com/cnpm/cnpmcore/issues/1033)
19
+ const cft = (suffix) => ({ cft: suffix });
17
20
  /* eslint-disable quote-props */
18
21
  const DOWNLOAD_PATHS = {
19
22
  chromium: {
20
23
  '<unknown>': undefined,
21
24
  'ubuntu18.04-x64': undefined,
22
- 'ubuntu20.04-x64': 'builds/chromium/%s/chromium-linux.zip',
23
- 'ubuntu22.04-x64': 'builds/chromium/%s/chromium-linux.zip',
24
- 'ubuntu24.04-x64': 'builds/chromium/%s/chromium-linux.zip',
25
+ 'ubuntu20.04-x64': cft('linux64/chrome-linux64.zip'),
26
+ 'ubuntu22.04-x64': cft('linux64/chrome-linux64.zip'),
27
+ 'ubuntu24.04-x64': cft('linux64/chrome-linux64.zip'),
25
28
  'ubuntu18.04-arm64': undefined,
26
29
  'ubuntu20.04-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
27
30
  'ubuntu22.04-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
28
31
  'ubuntu24.04-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
29
- 'debian11-x64': 'builds/chromium/%s/chromium-linux.zip',
32
+ 'debian11-x64': cft('linux64/chrome-linux64.zip'),
30
33
  'debian11-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
31
- 'debian12-x64': 'builds/chromium/%s/chromium-linux.zip',
34
+ 'debian12-x64': cft('linux64/chrome-linux64.zip'),
32
35
  'debian12-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
33
- 'mac10.13': 'builds/chromium/%s/chromium-mac.zip',
34
- 'mac10.14': 'builds/chromium/%s/chromium-mac.zip',
35
- 'mac10.15': 'builds/chromium/%s/chromium-mac.zip',
36
- mac11: 'builds/chromium/%s/chromium-mac.zip',
37
- 'mac11-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
38
- mac12: 'builds/chromium/%s/chromium-mac.zip',
39
- 'mac12-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
40
- mac13: 'builds/chromium/%s/chromium-mac.zip',
41
- 'mac13-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
42
- mac14: 'builds/chromium/%s/chromium-mac.zip',
43
- 'mac14-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
44
- mac15: 'builds/chromium/%s/chromium-mac.zip',
45
- 'mac15-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
46
- win64: 'builds/chromium/%s/chromium-win64.zip',
36
+ 'debian13-x64': cft('linux64/chrome-linux64.zip'),
37
+ 'debian13-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
38
+ 'mac10.13': cft('mac-x64/chrome-mac-x64.zip'),
39
+ 'mac10.14': cft('mac-x64/chrome-mac-x64.zip'),
40
+ 'mac10.15': cft('mac-x64/chrome-mac-x64.zip'),
41
+ mac11: cft('mac-x64/chrome-mac-x64.zip'),
42
+ 'mac11-arm64': cft('mac-arm64/chrome-mac-arm64.zip'),
43
+ mac12: cft('mac-x64/chrome-mac-x64.zip'),
44
+ 'mac12-arm64': cft('mac-arm64/chrome-mac-arm64.zip'),
45
+ mac13: cft('mac-x64/chrome-mac-x64.zip'),
46
+ 'mac13-arm64': cft('mac-arm64/chrome-mac-arm64.zip'),
47
+ mac14: cft('mac-x64/chrome-mac-x64.zip'),
48
+ 'mac14-arm64': cft('mac-arm64/chrome-mac-arm64.zip'),
49
+ mac15: cft('mac-x64/chrome-mac-x64.zip'),
50
+ 'mac15-arm64': cft('mac-arm64/chrome-mac-arm64.zip'),
51
+ win64: cft('win64/chrome-win64.zip'),
47
52
  },
48
53
  'chromium-headless-shell': {
49
54
  '<unknown>': undefined,
50
55
  'ubuntu18.04-x64': undefined,
51
- 'ubuntu20.04-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
52
- 'ubuntu22.04-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
53
- 'ubuntu24.04-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
56
+ 'ubuntu20.04-x64': cft('linux64/chrome-headless-shell-linux64.zip'),
57
+ 'ubuntu22.04-x64': cft('linux64/chrome-headless-shell-linux64.zip'),
58
+ 'ubuntu24.04-x64': cft('linux64/chrome-headless-shell-linux64.zip'),
54
59
  'ubuntu18.04-arm64': undefined,
55
60
  'ubuntu20.04-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
56
61
  'ubuntu22.04-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
57
62
  'ubuntu24.04-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
58
- 'debian11-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
63
+ 'debian11-x64': cft('linux64/chrome-headless-shell-linux64.zip'),
59
64
  'debian11-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
60
- 'debian12-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
65
+ 'debian12-x64': cft('linux64/chrome-headless-shell-linux64.zip'),
61
66
  'debian12-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
67
+ 'debian13-x64': cft('linux64/chrome-headless-shell-linux64.zip'),
68
+ 'debian13-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
62
69
  'mac10.13': undefined,
63
70
  'mac10.14': undefined,
64
71
  'mac10.15': undefined,
65
- mac11: 'builds/chromium/%s/chromium-headless-shell-mac.zip',
66
- 'mac11-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
67
- mac12: 'builds/chromium/%s/chromium-headless-shell-mac.zip',
68
- 'mac12-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
69
- mac13: 'builds/chromium/%s/chromium-headless-shell-mac.zip',
70
- 'mac13-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
71
- mac14: 'builds/chromium/%s/chromium-headless-shell-mac.zip',
72
- 'mac14-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
73
- mac15: 'builds/chromium/%s/chromium-headless-shell-mac.zip',
74
- 'mac15-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
75
- win64: 'builds/chromium/%s/chromium-headless-shell-win64.zip',
72
+ mac11: cft('mac-x64/chrome-headless-shell-mac-x64.zip'),
73
+ 'mac11-arm64': cft('mac-arm64/chrome-headless-shell-mac-arm64.zip'),
74
+ mac12: cft('mac-x64/chrome-headless-shell-mac-x64.zip'),
75
+ 'mac12-arm64': cft('mac-arm64/chrome-headless-shell-mac-arm64.zip'),
76
+ mac13: cft('mac-x64/chrome-headless-shell-mac-x64.zip'),
77
+ 'mac13-arm64': cft('mac-arm64/chrome-headless-shell-mac-arm64.zip'),
78
+ mac14: cft('mac-x64/chrome-headless-shell-mac-x64.zip'),
79
+ 'mac14-arm64': cft('mac-arm64/chrome-headless-shell-mac-arm64.zip'),
80
+ mac15: cft('mac-x64/chrome-headless-shell-mac-x64.zip'),
81
+ 'mac15-arm64': cft('mac-arm64/chrome-headless-shell-mac-arm64.zip'),
82
+ win64: cft('win64/chrome-headless-shell-win64.zip'),
76
83
  },
77
84
  'chromium-tip-of-tree': {
78
85
  '<unknown>': undefined,
79
86
  'ubuntu18.04-x64': undefined,
80
- 'ubuntu20.04-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip',
81
- 'ubuntu22.04-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip',
82
- 'ubuntu24.04-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip',
87
+ 'ubuntu20.04-x64': cft('linux64/chrome-linux64.zip'),
88
+ 'ubuntu22.04-x64': cft('linux64/chrome-linux64.zip'),
89
+ 'ubuntu24.04-x64': cft('linux64/chrome-linux64.zip'),
83
90
  'ubuntu18.04-arm64': undefined,
84
91
  'ubuntu20.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
85
92
  'ubuntu22.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
86
93
  'ubuntu24.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
87
- 'debian11-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip',
94
+ 'debian11-x64': cft('linux64/chrome-linux64.zip'),
88
95
  'debian11-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
89
- 'debian12-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip',
96
+ 'debian12-x64': cft('linux64/chrome-linux64.zip'),
90
97
  'debian12-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
91
- 'mac10.13': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
92
- 'mac10.14': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
93
- 'mac10.15': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
94
- mac11: 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
95
- 'mac11-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
96
- mac12: 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
97
- 'mac12-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
98
- mac13: 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
99
- 'mac13-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
100
- mac14: 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
101
- 'mac14-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
102
- mac15: 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
103
- 'mac15-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
104
- win64: 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-win64.zip',
98
+ 'debian13-x64': cft('linux64/chrome-linux64.zip'),
99
+ 'debian13-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
100
+ 'mac10.13': cft('mac-x64/chrome-mac-x64.zip'),
101
+ 'mac10.14': cft('mac-x64/chrome-mac-x64.zip'),
102
+ 'mac10.15': cft('mac-x64/chrome-mac-x64.zip'),
103
+ mac11: cft('mac-x64/chrome-mac-x64.zip'),
104
+ 'mac11-arm64': cft('mac-arm64/chrome-mac-arm64.zip'),
105
+ mac12: cft('mac-x64/chrome-mac-x64.zip'),
106
+ 'mac12-arm64': cft('mac-arm64/chrome-mac-arm64.zip'),
107
+ mac13: cft('mac-x64/chrome-mac-x64.zip'),
108
+ 'mac13-arm64': cft('mac-arm64/chrome-mac-arm64.zip'),
109
+ mac14: cft('mac-x64/chrome-mac-x64.zip'),
110
+ 'mac14-arm64': cft('mac-arm64/chrome-mac-arm64.zip'),
111
+ mac15: cft('mac-x64/chrome-mac-x64.zip'),
112
+ 'mac15-arm64': cft('mac-arm64/chrome-mac-arm64.zip'),
113
+ win64: cft('win64/chrome-win64.zip'),
105
114
  },
106
115
  'chromium-tip-of-tree-headless-shell': {
107
116
  '<unknown>': undefined,
108
117
  'ubuntu18.04-x64': undefined,
109
- 'ubuntu20.04-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux.zip',
110
- 'ubuntu22.04-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux.zip',
111
- 'ubuntu24.04-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux.zip',
118
+ 'ubuntu20.04-x64': cft('linux64/chrome-headless-shell-linux64.zip'),
119
+ 'ubuntu22.04-x64': cft('linux64/chrome-headless-shell-linux64.zip'),
120
+ 'ubuntu24.04-x64': cft('linux64/chrome-headless-shell-linux64.zip'),
112
121
  'ubuntu18.04-arm64': undefined,
113
122
  'ubuntu20.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux-arm64.zip',
114
123
  'ubuntu22.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux-arm64.zip',
115
124
  'ubuntu24.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux-arm64.zip',
116
- 'debian11-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux.zip',
125
+ 'debian11-x64': cft('linux64/chrome-headless-shell-linux64.zip'),
117
126
  'debian11-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux-arm64.zip',
118
- 'debian12-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux.zip',
127
+ 'debian12-x64': cft('linux64/chrome-headless-shell-linux64.zip'),
119
128
  'debian12-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux-arm64.zip',
129
+ 'debian13-x64': cft('linux64/chrome-headless-shell-linux64.zip'),
130
+ 'debian13-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux-arm64.zip',
120
131
  'mac10.13': undefined,
121
132
  'mac10.14': undefined,
122
133
  'mac10.15': undefined,
123
- mac11: 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac.zip',
124
- 'mac11-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac-arm64.zip',
125
- mac12: 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac.zip',
126
- 'mac12-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac-arm64.zip',
127
- mac13: 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac.zip',
128
- 'mac13-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac-arm64.zip',
129
- mac14: 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac.zip',
130
- 'mac14-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac-arm64.zip',
131
- mac15: 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac.zip',
132
- 'mac15-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac-arm64.zip',
133
- win64: 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-win64.zip',
134
+ mac11: cft('mac-x64/chrome-headless-shell-mac-x64.zip'),
135
+ 'mac11-arm64': cft('mac-arm64/chrome-headless-shell-mac-arm64.zip'),
136
+ mac12: cft('mac-x64/chrome-headless-shell-mac-x64.zip'),
137
+ 'mac12-arm64': cft('mac-arm64/chrome-headless-shell-mac-arm64.zip'),
138
+ mac13: cft('mac-x64/chrome-headless-shell-mac-x64.zip'),
139
+ 'mac13-arm64': cft('mac-arm64/chrome-headless-shell-mac-arm64.zip'),
140
+ mac14: cft('mac-x64/chrome-headless-shell-mac-x64.zip'),
141
+ 'mac14-arm64': cft('mac-arm64/chrome-headless-shell-mac-arm64.zip'),
142
+ mac15: cft('mac-x64/chrome-headless-shell-mac-x64.zip'),
143
+ 'mac15-arm64': cft('mac-arm64/chrome-headless-shell-mac-arm64.zip'),
144
+ win64: cft('win64/chrome-headless-shell-win64.zip'),
134
145
  },
135
146
  firefox: {
136
147
  '<unknown>': undefined,
@@ -335,6 +346,15 @@ let PlaywrightBinary = class PlaywrightBinary extends AbstractBinary {
335
346
  size: '-',
336
347
  date: nowDateISO,
337
348
  });
349
+ // builds/cft/ holds Chrome for Testing downloads
350
+ // (Playwright 1.58.1+ moved chromium downloads to builds/cft/{browserVersion}/{platform}/)
351
+ buildDirs.push({
352
+ name: 'cft/',
353
+ isDir: true,
354
+ url: '',
355
+ size: '-',
356
+ date: nowDateISO,
357
+ });
338
358
  this.dirItems = {
339
359
  '/': [
340
360
  {
@@ -346,6 +366,7 @@ let PlaywrightBinary = class PlaywrightBinary extends AbstractBinary {
346
366
  },
347
367
  ],
348
368
  '/builds/': buildDirs,
369
+ '/builds/cft/': [],
349
370
  };
350
371
  for (const browserName of Object.keys(DOWNLOAD_PATHS)) {
351
372
  if (browserName === 'chromium-headless-shell' || browserName === 'chromium-tip-of-tree-headless-shell') {
@@ -450,22 +471,59 @@ let PlaywrightBinary = class PlaywrightBinary extends AbstractBinary {
450
471
  browserDirname = 'chromium-tip-of-tree';
451
472
  }
452
473
  for (const [platform, remotePath] of Object.entries(downloadPaths)) {
453
- if (typeof remotePath !== 'string')
474
+ if (!remotePath)
454
475
  continue;
455
476
  const revision = browser.revisionOverrides?.[platform] ?? browser.revision;
456
477
  const itemDate = browser.browserVersion || revision;
457
- const url = DOWNLOAD_HOST + util.format(remotePath, revision);
458
- const name = path.basename(remotePath);
459
- const dir = `/builds/${browserDirname}/${revision}/`;
460
- if (!this.dirItems[dir]) {
461
- this.dirItems[`/builds/${browserDirname}/`].push({
462
- name: `${revision}/`,
463
- isDir: true,
464
- url: '',
465
- size: '-',
466
- date: revision,
467
- });
468
- this.dirItems[dir] = [];
478
+ let url;
479
+ let name;
480
+ let dir;
481
+ if (typeof remotePath === 'string') {
482
+ url = DOWNLOAD_HOST + util.format(remotePath, revision);
483
+ name = path.basename(remotePath);
484
+ dir = `/builds/${browserDirname}/${revision}/`;
485
+ if (!this.dirItems[dir]) {
486
+ this.dirItems[`/builds/${browserDirname}/`].push({
487
+ name: `${revision}/`,
488
+ isDir: true,
489
+ url: '',
490
+ size: '-',
491
+ date: revision,
492
+ });
493
+ this.dirItems[dir] = [];
494
+ }
495
+ }
496
+ else {
497
+ if (!browser.browserVersion)
498
+ continue;
499
+ const cftSuffix = remotePath.cft;
500
+ url = `${DOWNLOAD_HOST}builds/cft/${browser.browserVersion}/${cftSuffix}`;
501
+ name = path.basename(cftSuffix);
502
+ const platformDir = path.dirname(cftSuffix);
503
+ const versionDir = `/builds/cft/${browser.browserVersion}/`;
504
+ dir = `${versionDir}${platformDir}/`;
505
+ if (!this.dirItems[versionDir]) {
506
+ this.dirItems['/builds/cft/'].push({
507
+ name: `${browser.browserVersion}/`,
508
+ isDir: true,
509
+ url: '',
510
+ size: '-',
511
+ date: browser.browserVersion,
512
+ });
513
+ this.dirItems[versionDir] = [];
514
+ }
515
+ if (!this.dirItems[versionDir].some((item) => item.name === `${platformDir}/`)) {
516
+ this.dirItems[versionDir].push({
517
+ name: `${platformDir}/`,
518
+ isDir: true,
519
+ url: '',
520
+ size: '-',
521
+ date: browser.browserVersion,
522
+ });
523
+ }
524
+ if (!this.dirItems[dir]) {
525
+ this.dirItems[dir] = [];
526
+ }
469
527
  }
470
528
  if (!this.dirItems[dir].some((item) => item.name === name)) {
471
529
  this.dirItems[dir].push({
@@ -487,4 +545,4 @@ PlaywrightBinary = __decorate([
487
545
  BinaryAdapter(BinaryType.Playwright)
488
546
  ], PlaywrightBinary);
489
547
  export { PlaywrightBinary };
490
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PlaywrightBinary.js","sourceRoot":"","sources":["../../../../../app/common/adapter/binary/PlaywrightBinary.ts"],"names":[],"mappings":"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"}
548
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PlaywrightBinary.js","sourceRoot":"","sources":["../../../../../app/common/adapter/binary/PlaywrightBinary.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cnpmcore",
3
- "version": "4.33.0",
3
+ "version": "4.33.1",
4
4
  "description": "Private NPM Registry for Enterprise",
5
5
  "keywords": [
6
6
  "npm",
@@ -122,7 +122,7 @@
122
122
  "tar": "^7.5.2",
123
123
  "type-fest": "^5.3.1",
124
124
  "ua-parser-js": "^2.0.7",
125
- "validate-npm-package-name": "^7.0.0"
125
+ "validate-npm-package-name": "^8.0.0"
126
126
  },
127
127
  "devDependencies": {
128
128
  "@eggjs/bin": "^8.0.2-beta.2",
@@ -145,10 +145,10 @@
145
145
  "coffee": "^5.5.1",
146
146
  "husky": "^9.1.7",
147
147
  "ioredis-mock": "^8.13.1",
148
- "lint-staged": "^16.2.7",
149
- "oxfmt": "^0.44.0",
148
+ "lint-staged": "^17.0.0",
149
+ "oxfmt": "^0.51.0",
150
150
  "oxlint": "^1.32.0",
151
- "oxlint-tsgolint": "^0.20.0",
151
+ "oxlint-tsgolint": "^0.23.0",
152
152
  "typescript": "^6.0.0"
153
153
  },
154
154
  "optionalDependencies": {