Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: Update to latest nx #19078

Merged
merged 10 commits into from
Sep 7, 2022
4 changes: 2 additions & 2 deletions code/frameworks/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"@angular/forms": "^13.3.6",
"@angular/platform-browser": "^13.3.6",
"@angular/platform-browser-dynamic": "^13.3.6",
"@nrwl/workspace": "^14.1.4",
"@nrwl/workspace": "14.6.1",
"@types/autoprefixer": "^9.7.2",
"@types/tmp": "^0.2.3",
"cross-spawn": "^7.0.3",
Expand All @@ -108,7 +108,7 @@
"@angular/platform-browser": ">=6.0.0",
"@angular/platform-browser-dynamic": ">=6.0.0",
"@babel/core": "*",
"@nrwl/workspace": ">=11.1.0",
"@nrwl/workspace": "14.6.1",
"rxjs": "^6.0.0 || ^7.4.0",
"typescript": "^4.0.0",
"zone.js": "^0.8.29 || ^0.9.0 || ^0.10.0 || ^0.11.0"
Expand Down
100 changes: 100 additions & 0 deletions code/migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
"migrations": [
{
"version": "12.5.0-beta.1",
"description": "Rename the workspace-schematic script into workspace-generator script",
"factory": "./src/migrations/update-12-5-0/add-target-dependencies",
"cli": "nx",
"package": "@nrwl/workspace",
"name": "add-target-dependencies"
},
{
"version": "13.0.0-beta.1",
"description": "Add default base to nx.json if its not currently set",
"factory": "./src/migrations/update-13-0-0/set-default-base-if-not-set",
"cli": "nx",
"package": "@nrwl/workspace",
"name": "set-default-base-if-not-set"
},
{
"version": "13.0.0-beta.4",
"description": "Move global settings into nx.json, and project specific settings into workspace.json",
"cli": "nx",
"implementation": "./src/migrations/update-13-0-0/config-locations/config-locations",
"package": "@nrwl/workspace",
"name": "13-0-0-config-locations"
},
{
"version": "13.2.0",
"description": "Set --parallel=1 for existing repos to preserve the existing behavior",
"cli": "nx",
"implementation": "./src/migrations/update-13-2-0/set-parallel-default",
"package": "@nrwl/workspace",
"name": "set-parallel-default"
},
{
"version": "13.3.0-beta.0",
"description": "@nrwl/workspace:tsc is now @nrwl/js:tsc",
"cli": "nx",
"implementation": "./src/migrations/update-13-3-0/update-tsc-executor-location",
"package": "@nrwl/workspace",
"name": "13-3-0-tsc-location"
},
{
"version": "13.6.0-beta.0",
"description": "Remove old options that are no longer used",
"cli": "nx",
"implementation": "./src/migrations/update-13-6-0/remove-old-task-runner-options",
"package": "@nrwl/workspace",
"name": "13-6-0-remove-old-task-runner-options"
},
{
"version": "13.9.0-beta.0",
"description": "Replace @nrwl/tao with nx",
"cli": "nx",
"implementation": "./src/migrations/update-13-9-0/replace-tao-with-nx",
"package": "@nrwl/workspace",
"name": "13-9-0-replace-tao-with-nx"
},
{
"version": "13.10.0-beta.0",
"description": "Update the decorate-angular-cli script to require nx instead of @nrwl/cli",
"cli": "nx",
"implementation": "./src/migrations/update-13-10-0/update-decorate-cli",
"package": "@nrwl/workspace",
"name": "13-10-0-update-decorate-cli"
},
{
"version": "13.10.0-beta.0",
"description": "Update the tasks runner property to import it from the nx package instead of @nrwl/worksapce",
"cli": "nx",
"implementation": "./src/migrations/update-13-10-0/update-tasks-runner",
"package": "@nrwl/workspace",
"name": "13-10-0-update-tasks-runner"
},
{
"version": "14.0.0-beta.0",
"description": "Changes the presets in nx.json to come from the nx package",
"cli": "nx",
"implementation": "./src/migrations/update-14-0-0/change-nx-json-presets",
"package": "@nrwl/workspace",
"name": "14-0-0-change-nx-json-presets"
},
{
"version": "14.0.0-beta.0",
"description": "Migrates from @nrwl/workspace:run-script to nx:run-script",
"cli": "nx",
"implementation": "./src/migrations/update-14-0-0/change-npm-script-executor",
"package": "@nrwl/workspace",
"name": "14-0-0-change-npm-script-executor"
},
{
"version": "14.2.0",
"description": "Explicitly enable sourceAnalysis for all workspaces extending from npm.json or core.json (this was default behavior prior to 14.2)",
"cli": "nx",
"implementation": "./src/migrations/update-14-2-0/enable-source-analysis",
"package": "@nrwl/workspace",
"name": "14-2-0-enable-source-analysis"
}
]
}
131 changes: 22 additions & 109 deletions code/nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,121 +11,34 @@
"runner": "@nrwl/nx-cloud",
"options": {
"cacheableOperations": ["build", "test", "lint", "package", "prepare"],
"strictlyOrderedTargets": ["build", "package", "prepare"],
"accessToken": "NGVmYTkxMmItYzY3OS00MjkxLTk1ZDktZDFmYTFmNmVlNGY4fHJlYWQ=",
"canTrackAnalytics": false,
"showUsageWarnings": true
"showUsageWarnings": true,
"parallel": 1
}
}
},
"projects": {
"@storybook/addon-a11y": { "implicitDependencies": [] },
"@storybook/addon-actions": { "implicitDependencies": [] },
"@storybook/addon-backgrounds": { "implicitDependencies": [] },
"@storybook/addon-controls": { "implicitDependencies": [] },
"@storybook/addon-docs": { "implicitDependencies": [] },
"@storybook/addon-essentials": { "implicitDependencies": [] },
"@storybook/addon-highlight": { "implicitDependencies": [] },
"@storybook/addon-interactions": { "implicitDependencies": [] },
"@storybook/addon-jest": { "implicitDependencies": [] },
"@storybook/addon-links": { "implicitDependencies": [] },
"@storybook/addon-measure": { "implicitDependencies": [] },
"@storybook/addon-outline": { "implicitDependencies": [] },
"@storybook/addon-storyshots": { "implicitDependencies": [] },
"@storybook/addon-storyshots-puppeteer": { "implicitDependencies": [] },
"@storybook/addon-storysource": { "implicitDependencies": [] },
"@storybook/addon-toolbars": { "implicitDependencies": [] },
"@storybook/addon-viewport": { "implicitDependencies": [] },

"angular-cli": { "implicitDependencies": [] },
"cra-kitchen-sink": { "implicitDependencies": [] },
"cra-ts-essentials": { "implicitDependencies": [] },
"cra-ts-kitchen-sink": { "implicitDependencies": [] },
"ember-example": { "implicitDependencies": [] },
"html-kitchen-sink": { "implicitDependencies": [] },
"official-storybook": { "implicitDependencies": [] },
"preact-example": { "implicitDependencies": [] },
"@storybook/example-react-ts": { "implicitDependencies": [] },
"server-kitchen-sink": { "implicitDependencies": [] },
"standalone-preview": { "implicitDependencies": [] },
"svelte-example": { "implicitDependencies": [] },
"vue-3-cli-example": { "implicitDependencies": [] },
"vue-cli-example": { "implicitDependencies": [] },
"vue-example": { "implicitDependencies": [] },
"web-components-kitchen-sink": { "implicitDependencies": [] },
"@storybook/external-docs": { "implicitDependencies": [] },
"@storybook/example-doc-blocks": { "implicitDependencies": [] },

"@storybook/angular": { "implicitDependencies": [] },
"@storybook/docs-tools": { "implicitDependencies": [] },
"@storybook/ember": { "implicitDependencies": [] },
"@storybook/html": { "implicitDependencies": [] },
"@storybook/preact": { "implicitDependencies": [] },
"@storybook/react": { "implicitDependencies": [] },
"@storybook/server": { "implicitDependencies": [] },
"@storybook/svelte": { "implicitDependencies": [] },
"@storybook/vue": { "implicitDependencies": [] },
"@storybook/vue3": { "implicitDependencies": [] },
"@storybook/web-components": { "implicitDependencies": [] },

"@storybook/preset-html-webpack": { "implicitDependencies": [] },
"@storybook/preset-preact-webpack": { "implicitDependencies": [] },
"@storybook/preset-react-webpack": { "implicitDependencies": [] },
"@storybook/preset-server-webpack": { "implicitDependencies": [] },
"@storybook/preset-svelte-webpack": { "implicitDependencies": [] },
"@storybook/preset-vue-webpack": { "implicitDependencies": [] },
"@storybook/preset-vue3-webpack": { "implicitDependencies": [] },
"@storybook/preset-web-components-webpack": { "implicitDependencies": [] },

"@storybook/core-webpack": { "implicitDependencies": [] },
"@storybook/core-vite": { "implicitDependencies": [] },
"@storybook/core-client": { "implicitDependencies": [] },
"@storybook/core-common": { "implicitDependencies": [] },
"@storybook/core-events": { "implicitDependencies": [] },
"@storybook/core-server": { "implicitDependencies": [] },
"@storybook/csf-tools": { "implicitDependencies": [] },

"@storybook/builder-manager": { "implicitDependencies": [] },
"@storybook/addons": { "implicitDependencies": [] },
"@storybook/api": { "implicitDependencies": [] },
"@storybook/builder-vite": { "implicitDependencies": [] },
"@storybook/builder-webpack5": { "implicitDependencies": [] },
"@storybook/channel-postmessage": { "implicitDependencies": [] },
"@storybook/channel-websocket": { "implicitDependencies": [] },
"@storybook/channels": { "implicitDependencies": [] },
"@storybook/cli": { "implicitDependencies": [] },
"sb": { "implicitDependencies": [] },
"storybook": { "implicitDependencies": [] },
"@storybook/client-api": { "implicitDependencies": [] },
"@storybook/client-logger": { "implicitDependencies": [] },
"@storybook/codemod": { "implicitDependencies": [] },
"@storybook/components": { "implicitDependencies": [] },
"@storybook/instrumenter": { "implicitDependencies": [] },
"@storybook/node-logger": { "implicitDependencies": [] },
"@storybook/postinstall": { "implicitDependencies": [] },
"@storybook/store": { "implicitDependencies": [] },
"@storybook/router": { "implicitDependencies": [] },
"@storybook/source-loader": { "implicitDependencies": [] },
"@storybook/telemetry": { "implicitDependencies": [] },
"@storybook/theming": { "implicitDependencies": [] },
"@storybook/ui": { "implicitDependencies": [] },
"@storybook/preview-web": { "implicitDependencies": [] },
"@storybook/blocks": { "implicitDependencies": [] },

"@storybook/html-webpack5": { "implicitDependencies": [] },
"@storybook/preact-webpack5": { "implicitDependencies": [] },
"@storybook/react-webpack5": { "implicitDependencies": [] },
"@storybook/server-webpack5": { "implicitDependencies": [] },
"@storybook/svelte-webpack5": { "implicitDependencies": [] },
"@storybook/vue-webpack5": { "implicitDependencies": [] },
"@storybook/vue3-webpack5": { "implicitDependencies": [] },
"@storybook/web-components-webpack5": { "implicitDependencies": [] },

"@storybook/react-vite": { "implicitDependencies": [] },
"@storybook/vue3-vite": { "implicitDependencies": [] },
"@storybook/svelte-vite": { "implicitDependencies": [] }
},
"affected": {
"defaultBase": "next"
},
"targetDependencies": {
"build": [
{
"target": "build",
"projects": "dependencies"
}
],
"package": [
{
"target": "package",
"projects": "dependencies"
}
],
"prepare": [
{
"target": "prepare",
"projects": "dependencies"
}
]
}
}
14 changes: 7 additions & 7 deletions code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"defaults"
],
"resolutions": {
"@nrwl/cli": "12.3.4",
"@nrwl/cli": "14.6.1",
"@typescript-eslint/eslint-plugin": "^5.15.0",
"@typescript-eslint/experimental-utils": "5.3.0",
"@typescript-eslint/parser": "^5.15.0",
Expand Down Expand Up @@ -150,10 +150,9 @@
"@emotion/jest": "^11.8.0",
"@linear/sdk": "^1.21.0",
"@nicolo-ribaudo/chokidar-2": "^2.1.8",
"@nrwl/cli": "12.3.4",
"@nrwl/nx-cloud": "12.1.1",
"@nrwl/tao": "12.3.4",
"@nrwl/workspace": "12.3.4",
"@nrwl/cli": "14.6.1",
"@nrwl/nx-cloud": "14.6.0",
"@nrwl/workspace": "14.6.1",
"@playwright/test": "^1.24.2",
"@rollup/plugin-babel": "^5.3.1",
"@rollup/plugin-commonjs": "^21.0.1",
Expand Down Expand Up @@ -324,10 +323,11 @@
"node-fetch": "^2.6.1",
"node-gyp": "^8.4.0",
"npmlog": "^5.0.1",
"nx": "14.6.1",
"p-limit": "^3.1.0",
"playwright": "^1.24.2",
"postcss-loader": "^6.2.1",
"prettier": ">=2.2.1 <=2.3.0",
"prettier": "2.7.1",
"process": "^0.11.10",
"prompts": "^2.4.0",
"raf": "^3.4.1",
Expand All @@ -351,7 +351,7 @@
"ts-jest": "^26.4.4",
"ts-node": "^10.4.0",
"tsup": "^6.2.2",
"typescript": "~4.6.3",
"typescript": "4.7.4",
"util": "^0.12.4",
"wait-on": "^5.2.1",
"web-component-analyzer": "^1.1.6",
Expand Down
Loading