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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,6 @@ out-tsc

# Generated Docusaurus files
.docusaurus/
.cache-loader/
.cache-loader/
.cursor/rules/nx-rules.mdc
.github/instructions/nx.instructions.md
144 changes: 139 additions & 5 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,147 @@
{
"migrations": [
{
"version": "21.0.0-beta.8",
"description": "Removes the legacy cache configuration from nx.json",
"implementation": "./src/migrations/update-21-0-0/remove-legacy-cache",
"package": "nx",
"name": "remove-legacy-cache"
},
{
"version": "21.0.0-beta.8",
"description": "Removes the legacy cache configuration from nx.json",
"implementation": "./src/migrations/update-21-0-0/remove-custom-tasks-runner",
"package": "nx",
"name": "remove-custom-tasks-runner"
},
{
"version": "21.0.0-beta.11",
"description": "Updates release version config based on the breaking changes in Nx v21",
"implementation": "./src/migrations/update-21-0-0/release-version-config-changes",
"package": "nx",
"name": "release-version-config-changes"
},
{
"version": "21.0.0-beta.11",
"description": "Updates release changelog config based on the breaking changes in Nx v21",
"implementation": "./src/migrations/update-21-0-0/release-changelog-config-changes",
"package": "nx",
"name": "release-changelog-config-changes"
},
{
"version": "21.1.0-beta.2",
"description": "Adds **/nx-rules.mdc and **/nx.instructions.md to .gitignore if not present",
"implementation": "./src/migrations/update-21-1-0/add-gitignore-entry",
"package": "nx",
"name": "21-1-0-add-ignore-entries-for-nx-rule-files"
},
{
"cli": "nx",
"version": "20.4.0-beta.1",
"requires": { "@angular/core": ">=19.1.0" },
"description": "Update the @angular/cli package version to ~19.1.0.",
"factory": "./src/migrations/update-20-4-0/update-angular-cli",
"version": "20.5.0-beta.5",
"requires": { "@angular/core": ">=19.2.0" },
"description": "Update the @angular/cli package version to ~19.2.0.",
"factory": "./src/migrations/update-20-5-0/update-angular-cli",
"package": "@nx/angular",
"name": "update-angular-cli-version-19-2-0"
},
{
"cli": "nx",
"version": "21.0.0-beta.3",
"description": "Set the `continuous` option to `true` for continuous tasks.",
"factory": "./src/migrations/update-21-0-0/set-continuous-option",
"package": "@nx/angular",
"name": "set-continuous-option"
},
{
"cli": "nx",
"version": "21.2.0-beta.3",
"requires": { "@angular/core": ">=20.0.0" },
"description": "Update the @angular/cli package version to ~20.0.0.",
"factory": "./src/migrations/update-21-2-0/update-angular-cli",
"package": "@nx/angular",
"name": "update-angular-cli-version-20-0-0"
},
{
"version": "21.2.0-beta.3",
"requires": { "@angular/core": ">=20.0.0" },
"description": "Migrate imports of `provideServerRendering` from `@angular/platform-server` to `@angular/ssr`.",
"factory": "./src/migrations/update-21-2-0/migrate-provide-server-rendering-import",
"package": "@nx/angular",
"name": "update-angular-cli-version-19-1-0"
"name": "migrate-provide-server-rendering-import"
},
{
"version": "21.2.0-beta.3",
"requires": { "@angular/core": ">=20.0.0" },
"description": "Replace `provideServerRouting` and `provideServerRoutesConfig` with `provideServerRendering` using `withRoutes`.",
"factory": "./src/migrations/update-21-2-0/replace-provide-server-routing",
"package": "@nx/angular",
"name": "replace-provide-server-routing"
},
{
"version": "21.2.0-beta.3",
"requires": { "@angular/core": ">=20.0.0" },
"description": "Update the generator defaults to maintain the previous style guide behavior.",
"factory": "./src/migrations/update-21-2-0/set-generator-defaults-for-previous-style-guide",
"package": "@nx/angular",
"name": "set-generator-defaults-for-previous-style-guide"
},
{
"version": "21.2.0-beta.3",
"requires": { "@angular/core": ">=20.0.0" },
"description": "Update 'moduleResolution' to 'bundler' in TypeScript configurations. You can read more about this here: https://www.typescriptlang.org/tsconfig/#moduleResolution.",
"factory": "./src/migrations/update-21-2-0/update-module-resolution",
"package": "@nx/angular",
"name": "update-module-resolution"
},
{
"version": "20.0.0",
"description": "Replaces usages of the deprecated InjectFlags enum",
"factory": "./bundles/inject-flags.cjs#migrate",
"package": "@angular/core",
"name": "inject-flags"
},
{
"version": "20.0.0",
"description": "Replaces usages of the deprecated TestBed.get method with TestBed.inject",
"factory": "./bundles/test-bed-get.cjs#migrate",
"package": "@angular/core",
"name": "test-bed-get"
},
{
"version": "20.0.0",
"description": "Converts the entire application to block control flow syntax",
"factory": "./bundles/control-flow-migration.cjs#migrate",
"optional": true,
"package": "@angular/core",
"name": "control-flow-migration"
},
{
"version": "20.0.0",
"description": "Moves imports of `DOCUMENT` from `@angular/common` to `@angular/core`",
"factory": "./bundles/document-core.cjs#migrate",
"package": "@angular/core",
"name": "document-core"
},
{
"version": "20.0.0-0",
"description": "Updates Angular Material to v20",
"factory": "./ng-update/index_bundled#updateToV20",
"package": "@angular/material",
"name": "migration-v20"
},
{
"version": "20.0.0-0",
"description": "Updates the Angular CDK to v20",
"factory": "./ng-update/index#updateToV20",
"package": "@angular/cdk",
"name": "migration-v20"
},
{
"version": "20.0.0-alpha.0",
"description": "Updates @angular-eslint to v20",
"factory": "./migrations/update-20-0-0/update-20-0-0",
"package": "angular-eslint",
"name": "update-20-0-0"
}
]
}
54 changes: 53 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,59 @@
"unitTestRunner": "none"
},
"@nx/angular:component": {
"style": "scss"
"style": "scss",
"type": "component"
},
"@schematics/angular:component": {
"type": "component"
},
"@nx/angular:directive": {
"type": "directive"
},
"@schematics/angular:directive": {
"type": "directive"
},
"@nx/angular:service": {
"type": "service"
},
"@schematics/angular:service": {
"type": "service"
},
"@nx/angular:scam": {
"type": "component"
},
"@nx/angular:scam-directive": {
"type": "directive"
},
"@nx/angular:guard": {
"typeSeparator": "."
},
"@schematics/angular:guard": {
"typeSeparator": "."
},
"@nx/angular:interceptor": {
"typeSeparator": "."
},
"@schematics/angular:interceptor": {
"typeSeparator": "."
},
"@nx/angular:module": {
"typeSeparator": "."
},
"@schematics/angular:module": {
"typeSeparator": "."
},
"@nx/angular:pipe": {
"typeSeparator": "."
},
"@schematics/angular:pipe": {
"typeSeparator": "."
},
"@nx/angular:resolver": {
"typeSeparator": "."
},
"@schematics/angular:resolver": {
"typeSeparator": "."
}
}
}
84 changes: 41 additions & 43 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@ngx-layout/source",
"description": "ngx-layout",
"version": "19.0.0",
"version": "20.0.0",
"homepage": "https://github.com/ngbracket/ngx-layout",
"bugs": "https://github.com/ngbracket/ngx-layout/issues",
"repository": {
Expand All @@ -27,7 +27,7 @@
"serve:universal-demo-app": "nx run universal-demo-app:serve-ssr",
"test": "nx test @ngbracket/ngx-layout",
"test:ssr": "webpack --config test/webpack-spec-ssr-bundle.js && jasmine --config=test/jasmine-ssr.json",
"lint": "stylelint projects/libs/**/*.scss --config=stylelint-config.json && tslint --project ./tsconfig.json --config tslint.json",
"lint": "stylelint projects/libs/**/*.scss --config=stylelint-config.json",
"release": "pnpm build && pnpm stamp",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
"serve:ssr:universal-demo-app": "node dist/universal-demo-app/server/server.mjs",
Expand All @@ -40,65 +40,63 @@
"nx": "nx"
},
"private": true,
"requiredAngularVersion": ">=19.0.0",
"requiredAngularVersion": ">=20.0.0",
"dependencies": {
"@angular/animations": "19.1.6",
"@angular/common": "19.1.6",
"@angular/compiler": "19.1.6",
"@angular/core": "19.1.6",
"@angular/forms": "19.1.6",
"@angular/material": "19.1.4",
"@angular/platform-browser": "19.1.6",
"@angular/platform-browser-dynamic": "19.1.6",
"@angular/platform-server": "19.1.6",
"@angular/router": "19.1.6",
"@angular/ssr": "19.1.7",
"@docusaurus/core": "3.4.0",
"@docusaurus/preset-classic": "3.4.0",
"@mdx-js/react": "^3.0.0",
"clsx": "^2.0.0",
"@angular/animations": "20.0.6",
"@angular/common": "20.0.6",
"@angular/compiler": "20.0.6",
"@angular/core": "20.0.6",
"@angular/forms": "20.0.6",
"@angular/material": "20.0.5",
"@angular/platform-browser": "20.0.6",
"@angular/platform-browser-dynamic": "20.0.6",
"@angular/platform-server": "20.0.6",
"@angular/router": "20.0.6",
"@angular/ssr": "20.0.5",
"express": "^4.21.2",
"prism-react-renderer": "^2.3.0",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"rxjs": "^7.8.1",
"tslib": "^2.8.1",
"zone.js": "^0.15.0"
"zone.js": "^0.15.0",
"@docusaurus/preset-classic": "3.4.0",
"@mdx-js/react": "^3.0.0",
"clsx": "^2.0.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "19.1.7",
"@angular-devkit/core": "19.1.7",
"@angular-devkit/schematics": "19.1.7",
"@angular/cdk": "19.1.4",
"@angular/cli": "~19.1.7",
"@angular/compiler-cli": "19.1.6",
"@angular/language-service": "19.1.6",
"@angular-devkit/build-angular": "20.0.5",
"@angular-devkit/core": "20.0.5",
"@angular-devkit/schematics": "20.0.5",
"@angular/cdk": "20.0.5",
"@angular/cli": "~20.0.0",
"@angular/compiler-cli": "20.0.6",
"@docusaurus/module-type-aliases": "3.4.0",
"@docusaurus/tsconfig": "3.4.0",
"@docusaurus/types": "3.4.0",
"@eslint/js": "^9.20.0",
"@ngtools/webpack": "^19.1.7",
"@nx-extend/docusaurus": "^3.1.1",
"@nx/angular": "20.4.4",
"@nx/eslint": "20.4.4",
"@nx/eslint-plugin": "20.4.4",
"@nx/js": "20.4.4",
"@nx/web": "20.4.4",
"@nx/workspace": "20.4.4",
"@schematics/angular": "19.1.7",
"@angular/language-service": "20.0.6",
"@ngtools/webpack": "^20.0.5",
"@nx/angular": "21.2.2",
"@nx/eslint": "21.2.2",
"@nx/eslint-plugin": "21.2.2",
"@nx/js": "21.2.2",
"@nx/web": "21.2.2",
"@nx/workspace": "21.2.2",
"@schematics/angular": "20.0.5",
"@swc-node/register": "~1.9.2",
"@swc/core": "~1.5.29",
"@swc/helpers": "~0.5.15",
"@types/express": "^4.17.21",
"@types/jasmine": "^5.1.6",
"@types/minimatch": "^5.1.2",
"@types/node": "^20.17.19",
"@typescript-eslint/utils": "^8.24.0",
"angular-eslint": "^19.1.0",
"@typescript-eslint/utils": "^8.33.1",
"angular-eslint": "20.1.1",
"autoprefixer": "^10.4.0",
"conventional-changelog-cli": "^4.1.0",
"eslint": "^9.20.1",
"eslint-config-prettier": "^9.1.0",
"eslint": "^9.28.0",
"eslint-config-prettier": "10.1.5",
"jasmine": "^5.6.0",
"jasmine-core": "^5.6.0",
"karma": "^6.4.4",
Expand All @@ -111,8 +109,8 @@
"karma-parallel": "^0.3.1",
"karma-sauce-launcher": "^4.3.6",
"minimatch": "^9.0.5",
"ng-packagr": "19.1.2",
"nx": "20.4.4",
"ng-packagr": "20.0.1",
"nx": "21.2.2",
"postcss": "^8.5.2",
"postcss-scss": "^4.0.9",
"postcss-url": "~10.1.3",
Expand All @@ -122,8 +120,8 @@
"ts-node": "^10.9.2",
"tslint": "^6.1.3",
"tsutils": "^3.21.0",
"typescript": "^5.7.3",
"typescript-eslint": "^8.24.0",
"typescript": "5.8.3",
"typescript-eslint": "^8.33.1",
"webpack": "^5.98.0",
"webpack-cli": "^5.1.4"
},
Expand Down
Loading
Loading