chore: update nx

This commit is contained in:
tomasklim
2023-11-02 10:16:10 +01:00
committed by Tomáš Klíma
parent 4229fd483b
commit 7fa4c19c20
8 changed files with 104 additions and 204 deletions

1
.gitignore vendored
View File

@@ -36,6 +36,7 @@ __pycache__/
.eslintcache
.stylelintcache
*.tsbuildinfo
.nx
# Vagrant
.vagrant

View File

@@ -161,4 +161,5 @@ packages/suite-data/files/translations/master.json
packages/suite-data/files/videos/lottie/*.json
# js files which look like ts files
packages/protobuf/scripts/**
packages/protobuf/scripts/**
/.nx/cache

39
nx.json
View File

@@ -1,21 +1,4 @@
{
"tasksRunnerOptions": {
"default": {
"runner": "nx-cloud",
"options": {
"cacheableOperations": [
"lint",
"test:unit",
"type-check",
"lint:js",
"lint:styles",
"build:lib"
],
"accessToken": "NmE2NmFlYTUtN2JhZi00ZmQ3LWEyYzMtYWRkNzc3MTg0YmUyfHJlYWQ=",
"parallel": 3
}
}
},
"extends": "nx/presets/npm.json",
"namedInputs": {
"sharedGlobals": [
@@ -35,7 +18,8 @@
"{workspaceRoot}/tsconfig.json",
"{workspaceRoot}/tsconfig.lib.json"
],
"outputs": ["{projectRoot}/lib", "{projectRoot}/build"]
"outputs": ["{projectRoot}/lib", "{projectRoot}/build"],
"cache": true
},
"type-check": {
"dependsOn": ["^build:lib", "^type-check"],
@@ -44,7 +28,8 @@
"{workspaceRoot}/tsconfig.json",
"{workspaceRoot}/tsconfig.lib.json"
],
"outputs": ["{projectRoot}/libDev"]
"outputs": ["{projectRoot}/libDev"],
"cache": true
},
"test:unit": {
"dependsOn": ["^build:lib"],
@@ -52,17 +37,25 @@
"^prod",
"{workspaceRoot}/jest.config.base.js",
"{workspaceRoot}/jest.config.native.js"
]
],
"cache": true
},
"lint:js": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.js"]
"inputs": ["default", "{workspaceRoot}/.eslintrc.js"],
"cache": true
},
"lint:styles": {
"inputs": ["default"]
"inputs": ["default"],
"cache": true
},
"lint": {
"cache": true
}
},
"affected": {
"defaultBase": "origin/develop"
},
"$schema": "./node_modules/nx/schemas/nx-schema.json"
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"nxCloudAccessToken": "NmE2NmFlYTUtN2JhZi00ZmQ3LWEyYzMtYWRkNzc3MTg0YmUyfHJlYWQ=",
"parallel": 3
}

View File

@@ -129,8 +129,7 @@
"jest-expo": "^49.0.0",
"metro-react-native-babel-preset": "0.76.4",
"npm-run-all": "^4.1.5",
"nx": "^16.3.2",
"nx-cloud": "16.0.5",
"nx": "^17.0.2",
"patch-package": "7.0.0",
"prettier": "3.0.3",
"prettier-eslint": "^15.0.1",

View File

@@ -48,9 +48,9 @@
"targets": {
"build:lib": {
"outputs": [
"./tmp",
"./files/browser-detection",
"./files/guide"
"{projectRoot}/tmp",
"{projectRoot}/files/browser-detection",
"{projectRoot}/files/guide"
]
}
}

View File

@@ -39,7 +39,7 @@ import { getPrettierConfig } from './utils/getPrettierConfig';
// NOTE: Workspace keys must be sorted due to file systems being a part of the equation...
Object.keys(workspaces)
.sort()
.forEach(workspaceName => {
.forEach(async workspaceName => {
const workspace = workspaces[workspaceName];
if (ignoreGlobs.some(path => minimatch(workspace.location, path))) {
@@ -90,8 +90,8 @@ import { getPrettierConfig } from './utils/getPrettierConfig';
if (isTesting) {
if (
serializeConfig(workspaceConfig.references ?? []) !==
serializeConfig(nextWorkspaceReferences)
(await serializeConfig(workspaceConfig.references ?? [])) !==
(await serializeConfig(nextWorkspaceReferences))
) {
console.error(
chalk.red(
@@ -109,7 +109,7 @@ import { getPrettierConfig } from './utils/getPrettierConfig';
workspaceConfig.references = nextWorkspaceReferences;
if (!readOnlyGlobs.some(path => minimatch(workspace.location, path))) {
fs.writeFileSync(workspaceConfigPath, serializeConfig(workspaceConfig));
fs.writeFileSync(workspaceConfigPath, await serializeConfig(workspaceConfig));
}
});
})();

View File

@@ -42,7 +42,7 @@
"targets": {
"build:lib": {
"outputs": [
"./files",
"{projectRoot}/files",
"{workspaceRoot}/suite-common/suite-types/src/messageSystem.ts"
]
}

246
yarn.lock
View File

@@ -4457,107 +4457,88 @@ __metadata:
languageName: node
linkType: hard
"@nrwl/nx-cloud@npm:16.0.5":
version: 16.0.5
resolution: "@nrwl/nx-cloud@npm:16.0.5"
"@nrwl/tao@npm:17.0.2":
version: 17.0.2
resolution: "@nrwl/tao@npm:17.0.2"
dependencies:
nx-cloud: 16.0.5
checksum: 8766f7387de69e9a2e968a858e47423c0164ee193219e1590e3ae4f54e64dfe5a202cfda157df2000362e1b6f8f5185d76247fc7732db28182dd7b2aeb0408aa
languageName: node
linkType: hard
"@nrwl/tao@npm:16.3.2":
version: 16.3.2
resolution: "@nrwl/tao@npm:16.3.2"
dependencies:
nx: 16.3.2
nx: 17.0.2
tslib: ^2.3.0
bin:
tao: index.js
checksum: 85f6c83170b0beccee7d86ae7cc3a09154d003be4fb9ab7b34f66044b71161d439766b6b19ef63424671780285476bad3375306c7e2af099d82c39d755997678
checksum: 91ba92dee8b6010d8a221202f18653097cc7ca4b6dfb4d7302565c4a6a2f58e2ef9939f6e6ffbe72194bfa190afe8ba12080c8b4cc78f09705edbf8ae7add38f
languageName: node
linkType: hard
"@nx/nx-darwin-arm64@npm:16.3.2":
version: 16.3.2
resolution: "@nx/nx-darwin-arm64@npm:16.3.2"
"@nx/nx-darwin-arm64@npm:17.0.2":
version: 17.0.2
resolution: "@nx/nx-darwin-arm64@npm:17.0.2"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
"@nx/nx-darwin-x64@npm:16.3.2":
version: 16.3.2
resolution: "@nx/nx-darwin-x64@npm:16.3.2"
"@nx/nx-darwin-x64@npm:17.0.2":
version: 17.0.2
resolution: "@nx/nx-darwin-x64@npm:17.0.2"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
"@nx/nx-freebsd-x64@npm:16.3.2":
version: 16.3.2
resolution: "@nx/nx-freebsd-x64@npm:16.3.2"
"@nx/nx-freebsd-x64@npm:17.0.2":
version: 17.0.2
resolution: "@nx/nx-freebsd-x64@npm:17.0.2"
conditions: os=freebsd & cpu=x64
languageName: node
linkType: hard
"@nx/nx-linux-arm-gnueabihf@npm:16.3.2":
version: 16.3.2
resolution: "@nx/nx-linux-arm-gnueabihf@npm:16.3.2"
"@nx/nx-linux-arm-gnueabihf@npm:17.0.2":
version: 17.0.2
resolution: "@nx/nx-linux-arm-gnueabihf@npm:17.0.2"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard
"@nx/nx-linux-arm64-gnu@npm:16.3.2":
version: 16.3.2
resolution: "@nx/nx-linux-arm64-gnu@npm:16.3.2"
"@nx/nx-linux-arm64-gnu@npm:17.0.2":
version: 17.0.2
resolution: "@nx/nx-linux-arm64-gnu@npm:17.0.2"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard
"@nx/nx-linux-arm64-musl@npm:16.3.2":
version: 16.3.2
resolution: "@nx/nx-linux-arm64-musl@npm:16.3.2"
"@nx/nx-linux-arm64-musl@npm:17.0.2":
version: 17.0.2
resolution: "@nx/nx-linux-arm64-musl@npm:17.0.2"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard
"@nx/nx-linux-x64-gnu@npm:16.3.2":
version: 16.3.2
resolution: "@nx/nx-linux-x64-gnu@npm:16.3.2"
"@nx/nx-linux-x64-gnu@npm:17.0.2":
version: 17.0.2
resolution: "@nx/nx-linux-x64-gnu@npm:17.0.2"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard
"@nx/nx-linux-x64-musl@npm:16.3.2":
version: 16.3.2
resolution: "@nx/nx-linux-x64-musl@npm:16.3.2"
"@nx/nx-linux-x64-musl@npm:17.0.2":
version: 17.0.2
resolution: "@nx/nx-linux-x64-musl@npm:17.0.2"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard
"@nx/nx-win32-arm64-msvc@npm:16.3.2":
version: 16.3.2
resolution: "@nx/nx-win32-arm64-msvc@npm:16.3.2"
"@nx/nx-win32-arm64-msvc@npm:17.0.2":
version: 17.0.2
resolution: "@nx/nx-win32-arm64-msvc@npm:17.0.2"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard
"@nx/nx-win32-x64-msvc@npm:16.3.2":
version: 16.3.2
resolution: "@nx/nx-win32-x64-msvc@npm:16.3.2"
"@nx/nx-win32-x64-msvc@npm:17.0.2":
version: 17.0.2
resolution: "@nx/nx-win32-x64-msvc@npm:17.0.2"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
"@parcel/watcher@npm:2.0.4":
version: 2.0.4
resolution: "@parcel/watcher@npm:2.0.4"
dependencies:
node-addon-api: ^3.2.1
node-gyp: latest
node-gyp-build: ^4.3.0
checksum: 890bdc69a52942791b276caa2cd65ef816576d6b5ada91aa28cf302b35d567c801dafe167f2525dcb313f5b420986ea11bd56228dd7ddde1116944d8f924a0a1
languageName: node
linkType: hard
"@pkgjs/parseargs@npm:^0.11.0":
version: 0.11.0
resolution: "@pkgjs/parseargs@npm:0.11.0"
@@ -11834,13 +11815,13 @@ __metadata:
languageName: node
linkType: hard
"@yarnpkg/parsers@npm:^3.0.0-rc.18":
version: 3.0.0-rc.39
resolution: "@yarnpkg/parsers@npm:3.0.0-rc.39"
"@yarnpkg/parsers@npm:3.0.0-rc.46":
version: 3.0.0-rc.46
resolution: "@yarnpkg/parsers@npm:3.0.0-rc.46"
dependencies:
js-yaml: ^3.10.0
tslib: ^2.4.0
checksum: b54fb3694bd09e09142d5a8d607240a8389ce3ccf44a70808ac770c178bb527948c3805a230b6fa55753f95574c93773a853a37ece978e323c9f2d229fd82252
checksum: 35dfd1b1ac7ed9babf231721eb90b58156e840e575f6792a8e5ab559beaed6e2d60833b857310e67d6282c9406357648df2f510e670ec37ef4bd41657f329a51
languageName: node
linkType: hard
@@ -12750,18 +12731,7 @@ __metadata:
languageName: node
linkType: hard
"axios@npm:1.1.3":
version: 1.1.3
resolution: "axios@npm:1.1.3"
dependencies:
follow-redirects: ^1.15.0
form-data: ^4.0.0
proxy-from-env: ^1.1.0
checksum: cab3b17bf6092c9387f7023d699db093cfa23650b56c4422cd474d124b78b2e3b5a520f932c330664a58ab85b867b1c25a95cace475ef72d236888c852b84e6d
languageName: node
linkType: hard
"axios@npm:^1.0.0, axios@npm:^1.5.1":
"axios@npm:^1.5.1":
version: 1.5.1
resolution: "axios@npm:1.5.1"
dependencies:
@@ -16713,7 +16683,7 @@ __metadata:
languageName: node
linkType: hard
"dotenv-expand@npm:^10.0.0":
"dotenv-expand@npm:^10.0.0, dotenv-expand@npm:~10.0.0":
version: 10.0.0
resolution: "dotenv-expand@npm:10.0.0"
checksum: 2a38b470efe0abcb1ac8490421a55e1d764dc9440fd220942bce40965074f3fb00b585f4346020cb0f0f219966ee6b4ee5023458b3e2953fe5b3214de1b314ee
@@ -16727,7 +16697,7 @@ __metadata:
languageName: node
linkType: hard
"dotenv@npm:^16.0.0":
"dotenv@npm:^16.0.0, dotenv@npm:~16.3.1":
version: 16.3.1
resolution: "dotenv@npm:16.3.1"
checksum: 15d75e7279018f4bafd0ee9706593dd14455ddb71b3bcba9c52574460b7ccaf67d5cf8b2c08a5af1a9da6db36c956a04a1192b101ee102a3e0cf8817bbcf3dfd
@@ -16741,13 +16711,6 @@ __metadata:
languageName: node
linkType: hard
"dotenv@npm:~10.0.0":
version: 10.0.0
resolution: "dotenv@npm:10.0.0"
checksum: f412c5fe8c24fbe313d302d2500e247ba8a1946492db405a4de4d30dd0eb186a88a43f13c958c5a7de303938949c4231c56994f97d05c4bc1f22478d631b4005
languageName: node
linkType: hard
"dropbox@npm:^10.34.0":
version: 10.34.0
resolution: "dropbox@npm:10.34.0"
@@ -19098,19 +19061,6 @@ __metadata:
languageName: node
linkType: hard
"fast-glob@npm:3.2.7":
version: 3.2.7
resolution: "fast-glob@npm:3.2.7"
dependencies:
"@nodelib/fs.stat": ^2.0.2
"@nodelib/fs.walk": ^1.2.3
glob-parent: ^5.1.2
merge2: ^1.3.0
micromatch: ^4.0.4
checksum: 2f4708ff112d2b451888129fdd9a0938db88b105b0ddfd043c064e3c4d3e20eed8d7c7615f7565fee660db34ddcf08a2db1bf0ab3c00b87608e4719694642d78
languageName: node
linkType: hard
"fast-glob@npm:^3.0.3, fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.5, fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.1":
version: 3.3.1
resolution: "fast-glob@npm:3.3.1"
@@ -22562,7 +22512,7 @@ __metadata:
languageName: node
linkType: hard
"jest-diff@npm:^29.5.0, jest-diff@npm:^29.7.0":
"jest-diff@npm:^29.4.1, jest-diff@npm:^29.5.0, jest-diff@npm:^29.7.0":
version: 29.7.0
resolution: "jest-diff@npm:29.7.0"
dependencies:
@@ -26713,7 +26663,7 @@ __metadata:
languageName: node
linkType: hard
"node-addon-api@npm:^3.0.0, node-addon-api@npm:^3.2.1":
"node-addon-api@npm:^3.0.0":
version: 3.2.1
resolution: "node-addon-api@npm:3.2.1"
dependencies:
@@ -26792,7 +26742,7 @@ __metadata:
languageName: node
linkType: hard
"node-gyp-build@npm:^4.2.0, node-gyp-build@npm:^4.2.2, node-gyp-build@npm:^4.3.0, node-gyp-build@npm:^4.5.0, node-gyp-build@npm:^4.6.0":
"node-gyp-build@npm:^4.2.0, node-gyp-build@npm:^4.2.2, node-gyp-build@npm:^4.5.0, node-gyp-build@npm:^4.6.0":
version: 4.6.1
resolution: "node-gyp-build@npm:4.6.1"
bin:
@@ -26861,7 +26811,7 @@ __metadata:
languageName: node
linkType: hard
"node-machine-id@npm:^1.1.12":
"node-machine-id@npm:1.1.12":
version: 1.1.12
resolution: "node-machine-id@npm:1.1.12"
checksum: e23088a0fb4a77a1d6484b7f09a22992fd3e0054d4f2e427692b4c7081e6cf30118ba07b6113b6c89f1ce46fd26ec5ab1d76dcaf6c10317717889124511283a5
@@ -27057,65 +27007,46 @@ __metadata:
languageName: node
linkType: hard
"nx-cloud@npm:16.0.5":
version: 16.0.5
resolution: "nx-cloud@npm:16.0.5"
"nx@npm:17.0.2, nx@npm:^17.0.2":
version: 17.0.2
resolution: "nx@npm:17.0.2"
dependencies:
"@nrwl/nx-cloud": 16.0.5
axios: 1.1.3
chalk: ^4.1.0
dotenv: ~10.0.0
fs-extra: ^11.1.0
node-machine-id: ^1.1.12
open: ~8.4.0
strip-json-comments: ^3.1.1
tar: 6.1.11
yargs-parser: ">=21.1.1"
bin:
nx-cloud: bin/nx-cloud.js
checksum: 56455af6c74a3a472a09c11bd837fc6e2d594d58fdbf1fc9012a61a7b516a76f09b4fabdb87de3dd967d939da04c3784e9ca7e8bff4409e1c9069a68bdc54423
languageName: node
linkType: hard
"nx@npm:16.3.2, nx@npm:^16.3.2":
version: 16.3.2
resolution: "nx@npm:16.3.2"
dependencies:
"@nrwl/tao": 16.3.2
"@nx/nx-darwin-arm64": 16.3.2
"@nx/nx-darwin-x64": 16.3.2
"@nx/nx-freebsd-x64": 16.3.2
"@nx/nx-linux-arm-gnueabihf": 16.3.2
"@nx/nx-linux-arm64-gnu": 16.3.2
"@nx/nx-linux-arm64-musl": 16.3.2
"@nx/nx-linux-x64-gnu": 16.3.2
"@nx/nx-linux-x64-musl": 16.3.2
"@nx/nx-win32-arm64-msvc": 16.3.2
"@nx/nx-win32-x64-msvc": 16.3.2
"@parcel/watcher": 2.0.4
"@nrwl/tao": 17.0.2
"@nx/nx-darwin-arm64": 17.0.2
"@nx/nx-darwin-x64": 17.0.2
"@nx/nx-freebsd-x64": 17.0.2
"@nx/nx-linux-arm-gnueabihf": 17.0.2
"@nx/nx-linux-arm64-gnu": 17.0.2
"@nx/nx-linux-arm64-musl": 17.0.2
"@nx/nx-linux-x64-gnu": 17.0.2
"@nx/nx-linux-x64-musl": 17.0.2
"@nx/nx-win32-arm64-msvc": 17.0.2
"@nx/nx-win32-x64-msvc": 17.0.2
"@yarnpkg/lockfile": ^1.1.0
"@yarnpkg/parsers": ^3.0.0-rc.18
"@yarnpkg/parsers": 3.0.0-rc.46
"@zkochan/js-yaml": 0.0.6
axios: ^1.0.0
axios: ^1.5.1
chalk: ^4.1.0
cli-cursor: 3.1.0
cli-spinners: 2.6.1
cliui: ^7.0.2
dotenv: ~10.0.0
cliui: ^8.0.1
dotenv: ~16.3.1
dotenv-expand: ~10.0.0
enquirer: ~2.3.6
fast-glob: 3.2.7
figures: 3.2.0
flat: ^5.0.2
fs-extra: ^11.1.0
glob: 7.1.4
ignore: ^5.0.4
jest-diff: ^29.4.1
js-yaml: 4.1.0
jsonc-parser: 3.2.0
lines-and-columns: ~2.0.3
minimatch: 3.0.5
node-machine-id: 1.1.12
npm-run-path: ^4.0.1
open: ^8.4.0
semver: 7.3.4
semver: 7.5.3
string-width: ^4.2.3
strong-log-transformer: ^2.1.0
tar-stream: ~2.2.0
@@ -27126,8 +27057,8 @@ __metadata:
yargs: ^17.6.2
yargs-parser: 21.1.1
peerDependencies:
"@swc-node/register": ^1.4.2
"@swc/core": ^1.2.173
"@swc-node/register": ^1.6.7
"@swc/core": ^1.3.85
dependenciesMeta:
"@nx/nx-darwin-arm64":
optional: true
@@ -27156,7 +27087,8 @@ __metadata:
optional: true
bin:
nx: bin/nx.js
checksum: 627decdb89cea60f45ab035b33a53f2e3170f24c0eed07cfbec59eeeda4a6d62b57738e5f34fd1cdcdc00dcff83bb4d1022fe892c69e89420182d50ff0f6b547
nx-cloud: bin/nx-cloud.js
checksum: 5ce77397ee5919c673448fc933b43a82031acb39dc3ffc1f453fe6bc49b4daefa319f0981205ab130d0fc36ea48028d8b6fa26cd8a817009d3b4d7c378f6fdfa
languageName: node
linkType: hard
@@ -27393,7 +27325,7 @@ __metadata:
languageName: node
linkType: hard
"open@npm:^8.0.4, open@npm:^8.0.9, open@npm:^8.3.0, open@npm:^8.4.0, open@npm:~8.4.0":
"open@npm:^8.0.4, open@npm:^8.0.9, open@npm:^8.3.0, open@npm:^8.4.0":
version: 8.4.2
resolution: "open@npm:8.4.2"
dependencies:
@@ -31355,17 +31287,6 @@ __metadata:
languageName: node
linkType: hard
"semver@npm:7.3.4":
version: 7.3.4
resolution: "semver@npm:7.3.4"
dependencies:
lru-cache: ^6.0.0
bin:
semver: bin/semver.js
checksum: 96451bfd7cba9b60ee87571959dc47e87c95b2fe58a9312a926340fee9907fc7bc062c352efdaf5bb24b2dff59c145e14faf7eb9d718a84b4751312531b39f43
languageName: node
linkType: hard
"semver@npm:7.5.3":
version: 7.5.3
resolution: "semver@npm:7.5.3"
@@ -33051,20 +32972,6 @@ __metadata:
languageName: node
linkType: hard
"tar@npm:6.1.11":
version: 6.1.11
resolution: "tar@npm:6.1.11"
dependencies:
chownr: ^2.0.0
fs-minipass: ^2.0.0
minipass: ^3.0.0
minizlib: ^2.1.1
mkdirp: ^1.0.3
yallist: ^4.0.0
checksum: a04c07bb9e2d8f46776517d4618f2406fb977a74d914ad98b264fc3db0fe8224da5bec11e5f8902c5b9bcb8ace22d95fbe3c7b36b8593b7dfc8391a25898f32f
languageName: node
linkType: hard
"tar@npm:^4.4.8":
version: 4.4.19
resolution: "tar@npm:4.4.19"
@@ -33638,8 +33545,7 @@ __metadata:
jest-expo: ^49.0.0
metro-react-native-babel-preset: 0.76.4
npm-run-all: ^4.1.5
nx: ^16.3.2
nx-cloud: 16.0.5
nx: ^17.0.2
patch-package: 7.0.0
prettier: 3.0.3
prettier-eslint: ^15.0.1
@@ -35883,7 +35789,7 @@ __metadata:
languageName: node
linkType: hard
"yargs-parser@npm:21.1.1, yargs-parser@npm:>=21.1.1, yargs-parser@npm:^21.0.1, yargs-parser@npm:^21.1.1":
"yargs-parser@npm:21.1.1, yargs-parser@npm:^21.0.1, yargs-parser@npm:^21.1.1":
version: 21.1.1
resolution: "yargs-parser@npm:21.1.1"
checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c