mirror of
https://github.com/4gray/iptvnator.git
synced 2026-10-10 18:36:15 -08:00
fix(ci): patch nx-electron package metadata copy
Entire-Checkpoint: f957cd9849e0
This commit is contained in:
1 parent
ef12bf41b2
commit
8bd48f5dc4
4 files changed
+40
-2
No files matched your search
@@ -223,6 +223,9 @@
|
||||
"smol-toml@1.6.0": "1.6.1",
|
||||
"svgo@3.3.2": "3.3.3",
|
||||
"yaml@1.10.2": "1.10.3"
|
||||
},
|
||||
"patchedDependencies": {
|
||||
"nx-electron@22.0.0": "patches/nx-electron@22.0.0.patch"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/src/executors/package/executor.js b/src/executors/package/executor.js
|
||||
index e36f61a825a280c26ec5064f1ba086ac170fb1b6..17a351dd4b91bf3b72743036f79c8300aba7f79e 100644
|
||||
--- a/src/executors/package/executor.js
|
||||
+++ b/src/executors/package/executor.js
|
||||
@@ -111,7 +111,6 @@ function _createBaseConfig(options, context) {
|
||||
return {
|
||||
directories: Object.assign(Object.assign({}, options.directories), { output: (0, path_1.join)(context.root, outputPath) }),
|
||||
files: files.concat([
|
||||
- './package.json',
|
||||
{
|
||||
from: (0, path_1.resolve)(options.sourcePath, options.name),
|
||||
to: options.name,
|
||||
Generated
+7
-2
@@ -25,6 +25,11 @@ overrides:
|
||||
svgo@3.3.2: 3.3.3
|
||||
yaml@1.10.2: 1.10.3
|
||||
|
||||
patchedDependencies:
|
||||
nx-electron@22.0.0:
|
||||
hash: f4bbde1778360c4c462b255bec47a337c0465d59cdcab14ecb601161f3467002
|
||||
path: patches/nx-electron@22.0.0.patch
|
||||
|
||||
importers:
|
||||
|
||||
.:
|
||||
@@ -401,7 +406,7 @@ importers:
|
||||
version: 22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))
|
||||
nx-electron:
|
||||
specifier: 22.0.0
|
||||
version: 22.0.0(@nx/devkit@22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))))(@nx/workspace@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(@swc/core@1.15.8(@swc/helpers@0.5.18))(electron-builder-squirrel-windows@26.0.12)(electron@39.8.8)(esbuild@0.27.0)(rxjs@7.8.2)(typescript@5.9.3)
|
||||
version: 22.0.0(patch_hash=f4bbde1778360c4c462b255bec47a337c0465d59cdcab14ecb601161f3467002)(@nx/devkit@22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))))(@nx/workspace@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(@swc/core@1.15.8(@swc/helpers@0.5.18))(electron-builder-squirrel-windows@26.0.12)(electron@39.8.8)(esbuild@0.27.0)(rxjs@7.8.2)(typescript@5.9.3)
|
||||
prettier:
|
||||
specifier: ^3.8.1
|
||||
version: 3.8.1
|
||||
@@ -22694,7 +22699,7 @@ snapshots:
|
||||
|
||||
nwsapi@2.2.23: {}
|
||||
|
||||
nx-electron@22.0.0(@nx/devkit@22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))))(@nx/workspace@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(@swc/core@1.15.8(@swc/helpers@0.5.18))(electron-builder-squirrel-windows@26.0.12)(electron@39.8.8)(esbuild@0.27.0)(rxjs@7.8.2)(typescript@5.9.3):
|
||||
nx-electron@22.0.0(patch_hash=f4bbde1778360c4c462b255bec47a337c0465d59cdcab14ecb601161f3467002)(@nx/devkit@22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))))(@nx/workspace@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))(@swc/core@1.15.8(@swc/helpers@0.5.18))(electron-builder-squirrel-windows@26.0.12)(electron@39.8.8)(esbuild@0.27.0)(rxjs@7.8.2)(typescript@5.9.3):
|
||||
dependencies:
|
||||
'@nx/devkit': 22.7.1(nx@22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18)))
|
||||
'@nx/workspace': 22.7.1(@swc-node/register@1.11.1(@swc/core@1.15.8(@swc/helpers@0.5.18))(@swc/types@0.1.25)(typescript@5.9.3))(@swc/core@1.15.8(@swc/helpers@0.5.18))
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import fs from 'node:fs';
|
||||
import { createRequire } from 'node:module';
|
||||
import { dirname, join } from 'node:path';
|
||||
import test from 'node:test';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const currentDir = dirname(fileURLToPath(import.meta.url));
|
||||
const require = createRequire(import.meta.url);
|
||||
const electronBuilderConfig = JSON.parse(
|
||||
fs.readFileSync(
|
||||
join(currentDir, '..', '..', 'electron-builder.json'),
|
||||
@@ -22,3 +24,19 @@ test('Linux package identity does not expose the internal Electron backend proje
|
||||
'iptvnator'
|
||||
);
|
||||
});
|
||||
|
||||
test('nx-electron packaging does not copy duplicate root package metadata', () => {
|
||||
const nxElectronExecutorPath = require.resolve(
|
||||
'nx-electron/src/executors/package/executor.js'
|
||||
);
|
||||
const nxElectronExecutor = fs.readFileSync(
|
||||
nxElectronExecutorPath,
|
||||
'utf8'
|
||||
);
|
||||
|
||||
assert.doesNotMatch(nxElectronExecutor, /['"]\.\/package\.json['"]/);
|
||||
assert.match(
|
||||
nxElectronExecutor,
|
||||
/filter:\s*\[['"]index\.js['"],\s*['"]package\.json['"]\]/
|
||||
);
|
||||
});
|
||||
Reference in new issue
Block a user