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

chore: update nx to 18 #2023

Merged
merged 3 commits into from
Feb 28, 2024
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
7 changes: 0 additions & 7 deletions apps/generate-ui-v2-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@
}
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/generate-ui-v2-e2e/**/*.{js,ts}"]
}
},
"serve": {
"executor": "@nx/web:file-server",
"options": {
Expand Down
1 change: 1 addition & 0 deletions apps/generate-ui-v2/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ export default {
},
moduleFileExtensions: ['ts', 'js', 'html'],
coverageDirectory: '../../coverage/apps/generate-ui-v2',
passWithNoTests: true,
};
14 changes: 0 additions & 14 deletions apps/generate-ui-v2/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,6 @@
}
}
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/generate-ui-v2/**/*.ts"]
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "apps/generate-ui-v2/jest.config.ts"
}
}
},
"tags": ["type:generate-ui"]
Expand Down
2 changes: 1 addition & 1 deletion apps/generate-ui-v2/src/components/button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class Button extends EditorContext(LitElement) {
@property()
color: string;
@property({ type: Boolean })
applyFillColor: boolean = false;
applyFillColor = false;

render() {
return this.editor === 'vscode'
Expand Down
8 changes: 6 additions & 2 deletions apps/generate-ui-v2/src/components/cwd-breadcrumb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
export class CwdBreadcrumb extends GeneratorContextContext(
EditorContext(LitElement)
) {
@state() _path: string = '';
@state() _path = '';
@state() isEditable = false;

set path(value: string) {
Expand Down Expand Up @@ -67,7 +67,11 @@ export class CwdBreadcrumb extends GeneratorContextContext(
>
<span class="pr-2"> Working Directory: </span>
<span
@click="${hasPathSegments ? this.resetPath : () => {}}"
@click="${hasPathSegments
? this.resetPath
: () => {
return;
}}"
class="${hasPathSegments
? 'hover:text-primary cursor-pointer underline'
: ''}"
Expand Down
2 changes: 1 addition & 1 deletion apps/generate-ui-v2/src/components/icon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class Icon extends EditorContext(LitElement) {
color = '';

@property({ type: Boolean })
applyFillColor: boolean = false;
applyFillColor = false;

render() {
if (this.editor === 'intellij') {
Expand Down
25 changes: 0 additions & 25 deletions apps/generate-ui/jest.config.ts

This file was deleted.

16 changes: 0 additions & 16 deletions apps/generate-ui/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,22 +87,6 @@
}
},
"outputs": ["{options.outputPath}"]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"apps/generate-ui/src/**/*.ts",
"apps/generate-ui/src/**/*.html"
]
}
},
"test": {
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "apps/generate-ui/jest.config.ts"
},
"outputs": ["{workspaceRoot}/coverage/apps/generate-ui"]
}
},
"implicitDependencies": ["generate-ui-styles"],
Expand Down
3 changes: 3 additions & 0 deletions apps/intellij/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
"command": "./gradlew :apps:intellij:check"
}
},
"lint": {
"executor": "nx:noop"
},
"x-lint": {
"//": "Run inspections take a long time on the CI. Disable for now",
"executor": "nx:run-commands",
Expand Down
1 change: 1 addition & 0 deletions apps/nxls/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ export default {
},
moduleFileExtensions: ['ts', 'js', 'html'],
coverageDirectory: '../../coverage/apps/nxls',
passWithNoTests: true,
};
17 changes: 2 additions & 15 deletions apps/nxls/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
"externalDependencies": "all",
"target": "node",
"optimization": true,
"extractLicenses": true
"extractLicenses": true,
"webpackConfig": "apps/nxls/webpack.config.js"
}
},
"build": {
Expand Down Expand Up @@ -97,20 +98,6 @@
}
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/nxls/**/*.ts"]
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/apps/nxls"],
"options": {
"jestConfig": "apps/nxls/jest.config.ts"
}
},
"semantic-release": {
"executor": "@theunderscorer/nx-semantic-release:semantic-release",
"options": {
Expand Down
8 changes: 8 additions & 0 deletions apps/nxls/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const { composePlugins, withNx } = require('@nx/webpack');

// Nx plugins for webpack.
module.exports = composePlugins(withNx(), (config) => {
// Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file.
// See: https://nx.dev/recipes/webpack/webpack-config-setup
return config;
});
7 changes: 0 additions & 7 deletions apps/vscode-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@
"sourceRoot": "apps/vscode-e2e/src",
"projectType": "application",
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/vscode-e2e/**/*.ts"]
}
},
"_e2e": {
"executor": "nx:run-commands",
"options": {
Expand Down
14 changes: 0 additions & 14 deletions apps/vscode/jest.config.js

This file was deleted.

6 changes: 0 additions & 6 deletions apps/vscode/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,6 @@
},
"dependsOn": ["^build"]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["apps/vscode/**/*.ts"]
}
},
"package": {
"executor": "nx:run-commands",
"dependsOn": ["build", "^build"],
Expand Down
19 changes: 1 addition & 18 deletions libs/generate-ui/components/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,6 @@
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"sourceRoot": "libs/generate-ui/components/src",
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"libs/generate-ui/components/src/**/*.ts",
"libs/generate-ui/components/src/**/*.html"
]
}
},
"test": {
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "libs/generate-ui/components/jest.config.ts"
},
"outputs": ["{workspaceRoot}/coverage/libs/generate-ui/components"]
}
},
"targets": {},
"tags": ["type:generate-ui"]
}
18 changes: 0 additions & 18 deletions libs/generate-ui/feature-task-execution-form/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,6 @@
"projectType": "library",
"sourceRoot": "libs/generate-ui/feature-task-execution-form/src",
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"libs/generate-ui/feature-task-execution-form/src/**/*.ts",
"libs/generate-ui/feature-task-execution-form/src/**/*.html"
]
}
},
"test": {
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "libs/generate-ui/feature-task-execution-form/jest.config.ts"
},
"outputs": [
"{workspaceRoot}/coverage/libs/generate-ui/feature-task-execution-form"
]
},
"storybook": {
"executor": "@storybook/angular:start-storybook",
"options": {
Expand Down
6 changes: 5 additions & 1 deletion libs/generate-ui/styles/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"sourceRoot": "libs/generate-ui/styles/src",
"targets": {},
"targets": {
"lint": {
"executor": "nx:noop"
}
},
"generators": {},
"tags": ["type:generate-ui"]
}
21 changes: 1 addition & 20 deletions libs/language-server/capabilities/code-completion/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,6 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/language-server/capabilities/code-completion/src",
"projectType": "library",
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"libs/language-server/capabilities/code-completion/**/*.ts"
]
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": [
"{workspaceRoot}/coverage/libs/language-server/capabilities/code-completion"
],
"options": {
"jestConfig": "libs/language-server/capabilities/code-completion/jest.config.ts"
}
}
},
"targets": {},
"tags": ["type:lsp"]
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { configureJsonLanguageService } from '@nx-console/language-server/utils';
import {
configureJsonLanguageService,
getLanguageModelCache,
} from '@nx-console/language-server/utils';
import {
CompletionType,
EnhancedJsonSchema,
} from '@nx-console/shared/json-schema';
import * as workspace from '@nx-console/language-server/workspace';
import type * as workspace from '@nx-console/language-server/workspace';
import { vol } from 'memfs';
import {
ClientCapabilities,
Expand Down Expand Up @@ -135,6 +138,7 @@ describe('getCompletionItems', () => {

afterAll(() => {
vol.reset();
getLanguageModelCache().dispose();
});

it('should return all completion items without a glob', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ export default {
moduleFileExtensions: ['ts', 'js', 'html'],
coverageDirectory:
'../../../../coverage/libs/language-server/capabilities/definition',
passWithNoTests: true,
};
19 changes: 1 addition & 18 deletions libs/language-server/capabilities/definition/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,6 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/language-server/capabilities/definition/src",
"projectType": "library",
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"libs/language-server/capabilities/definition/**/*.ts"
]
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "libs/language-server/capabilities/definition/jest.config.ts"
}
}
},
"targets": {},
"tags": ["type:lsp"]
}
21 changes: 1 addition & 20 deletions libs/language-server/capabilities/document-links/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,6 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/language-server/capabilities/document-links/src",
"projectType": "library",
"targets": {
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"libs/language-server/capabilities/document-links/**/*.ts"
]
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": [
"{workspaceRoot}/coverage/libs/language-server/capabilities/document-links"
],
"options": {
"jestConfig": "libs/language-server/capabilities/document-links/jest.config.ts"
}
}
},
"targets": {},
"tags": ["type:lsp"]
}
Loading
Loading