Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,11 @@
"migrations": [
Comment thread
Hotell marked this conversation as resolved.
Comment thread
Hotell marked this conversation as resolved.
Comment thread
Hotell marked this conversation as resolved.
{
"cli": "nx",
"version": "18.0.0-beta.2",
"description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace",
"implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
"x-repair-skip": true,
"package": "nx",
"name": "18.0.0-disable-adding-plugins-for-existing-workspaces"
},
{
"version": "18.1.0-beta.3",
"description": "Moves affected.defaultBase to defaultBase in `nx.json`",
"implementation": "./src/migrations/update-17-2-0/move-default-base",
"package": "nx",
"name": "move-default-base-to-nx-json-root"
"version": "19.1.0-beta.6",
"description": "Migrate no-extra-semi rules into user config, out of nx extendable configs",
"implementation": "./src/migrations/update-19-1-0-migrate-no-extra-semi/migrate-no-extra-semi",
"package": "@nx/eslint-plugin",
"name": "update-19-1-0-rename-no-extra-semi"
}
]
}
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@
"@microsoft/load-themed-styles": "1.10.26",
"@microsoft/loader-load-themed-styles": "2.0.17",
"@microsoft/tsdoc": "0.14.2",
"@nx/devkit": "19.0.8",
"@nx/eslint": "19.0.8",
"@nx/eslint-plugin": "19.0.8",
"@nx/jest": "19.0.8",
"@nx/js": "19.0.8",
"@nx/node": "19.0.8",
"@nx/plugin": "19.0.8",
"@nx/workspace": "19.0.8",
"@nx/devkit": "19.1.2",
"@nx/eslint": "19.1.2",
"@nx/eslint-plugin": "19.1.2",
"@nx/jest": "19.1.2",
"@nx/js": "19.1.2",
"@nx/node": "19.1.2",
"@nx/plugin": "19.1.2",
"@nx/workspace": "19.1.2",
"@octokit/rest": "18.12.0",
"@phenomnomnominal/tsquery": "6.1.3",
"@playwright/test": "1.44.0",
Expand Down Expand Up @@ -278,7 +278,7 @@
"monosize-bundler-webpack": "0.1.4",
"monosize-storage-azure": "0.0.14",
"node-plop": "0.25.0",
"nx": "19.0.8",
"nx": "19.1.2",
"p-queue": "6.6.2",
"parse-diff": "0.7.1",
"path-browserify": "1.0.1",
Expand Down
16 changes: 12 additions & 4 deletions scripts/monorepo/src/getDependencies.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ function collectDependencies(
return _acc;
}

/** @type {Dependency[]} */
const collectedDeps = [];

localDeps.forEach(dependency => {
const isDependencyAlreadyCollected = _acc.some(dep => dep.name === dependency.target);

Expand All @@ -123,16 +126,21 @@ function collectDependencies(
return;
}

_acc.push({
collectedDeps.push({
name: dependency.target,
dependencyType: dependency.dependencyType,
isTopLevel: _areTopLevelDeps,
});
});

// update main dep stack with actual collected deps
_acc.push(...collectedDeps);

if (!options.shallow) {
Comment thread
Hotell marked this conversation as resolved.
collectDependencies(dependency.target, projectGraph, options, _acc, false);
if (!options.shallow) {
for (const collectedDep of collectedDeps) {
collectDependencies(collectedDep.name, projectGraph, options, _acc, false);
}
});
}

return _acc;
}
Expand Down
50 changes: 25 additions & 25 deletions scripts/monorepo/src/getDependencies.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@ describe(`#getDependencies`, () => {
},
Object {
"dependencyType": "dependencies",
"isTopLevel": false,
"isTopLevel": true,
"name": "@fluentui/react-theme",
},
Object {
"dependencyType": "dependencies",
"isTopLevel": false,
"name": "@fluentui/tokens",
"isTopLevel": true,
"name": "@fluentui/react-utilities",
},
Object {
"dependencyType": "dependencies",
"isTopLevel": true,
"name": "@fluentui/react-utilities",
"name": "@fluentui/react-jsx-runtime",
},
Object {
"dependencyType": "dependencies",
"isTopLevel": false,
"name": "@fluentui/keyboard-keys",
"name": "@fluentui/tokens",
},
Object {
"dependencyType": "dependencies",
"isTopLevel": true,
"name": "@fluentui/react-jsx-runtime",
"isTopLevel": false,
"name": "@fluentui/keyboard-keys",
},
]
`);
Expand All @@ -49,19 +49,34 @@ describe(`#getDependencies`, () => {
Array [
Object {
"dependencyType": "devDependencies",
"isTopLevel": false,
"isTopLevel": true,
"name": "@fluentui/eslint-plugin",
},
Object {
"dependencyType": "devDependencies",
"isTopLevel": false,
"isTopLevel": true,
"name": "@fluentui/react-conformance",
},
Object {
"dependencyType": "devDependencies",
"isTopLevel": true,
"name": "@fluentui/react-conformance-griffel",
},
Object {
"dependencyType": "devDependencies",
"isTopLevel": true,
"name": "@fluentui/scripts-api-extractor",
},
Object {
"dependencyType": "devDependencies",
"isTopLevel": false,
"isTopLevel": true,
"name": "@fluentui/scripts-tasks",
},
Object {
"dependencyType": "devDependencies",
"isTopLevel": false,
"name": "@fluentui/scripts-jest",
},
Object {
"dependencyType": "dependencies",
"isTopLevel": false,
Expand All @@ -77,21 +92,6 @@ describe(`#getDependencies`, () => {
"isTopLevel": false,
"name": "@fluentui/scripts-prettier",
},
Object {
"dependencyType": "devDependencies",
"isTopLevel": false,
"name": "@fluentui/react-conformance",
},
Object {
"dependencyType": "devDependencies",
"isTopLevel": false,
"name": "@fluentui/scripts-jest",
},
Object {
"dependencyType": "devDependencies",
"isTopLevel": false,
"name": "@fluentui/react-conformance-griffel",
},
]
`);
});
Expand Down
2 changes: 1 addition & 1 deletion tools/workspace-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lint": "eslint --ext .ts,.js,.json ."
},
"dependencies": {
"@nx/devkit": "~19.0.8"
"@nx/devkit": "~19.1.2"
},
"devDependencies": {}
}
Loading