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: 2 additions & 2 deletions .moon/toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ $schema: 'https://moonrepo.dev/schemas/toolchain.json'

# https://moonrepo.dev/docs/config/workspace#node
node:
version: '22.14.0'
version: '22.17.0'
packageManager: 'yarn'
yarn:
version: '4.7.0'
version: '4.9.2'

# Do not add an engines constraint as its abrasive for open source.
addEnginesConstraint: false
Expand Down
6 changes: 3 additions & 3 deletions .prototools
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
moon = "1.36.0"
node = "22.14.0"
yarn = "4.7.0"
moon = "1.39.0"
node = "22.17.0"
yarn = "4.9.2"
935 changes: 0 additions & 935 deletions .yarn/releases/yarn-4.7.0.cjs

This file was deleted.

942 changes: 942 additions & 0 deletions .yarn/releases/yarn-4.9.2.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ logFilters:

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.7.0.cjs
yarnPath: .yarn/releases/yarn-4.9.2.cjs
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
"packages/*"
],
"devDependencies": {
"@babel/core": "^7.27.1",
"@moonrepo/cli": "^1.38.5",
"@babel/core": "^7.28.0",
"@moonrepo/cli": "^1.39.0",
"@moonrepo/dev": "workspace:*",
"eslint": "^9.27.0",
"jest": "^29.7.0",
"jest-circus": "^29.7.0",
"lerna": "^8.2.2",
"packemon": "^4.1.1",
"prettier": "^3.5.3",
"eslint": "^9.32.0",
"jest": "^30.0.5",
"jest-circus": "^30.0.5",
"lerna": "^8.2.3",
"packemon": "^4.1.2",
"prettier": "^3.6.2",
"typescript": "^5.8.3"
},
"packageManager": "yarn@4.7.0"
"packageManager": "yarn@4.9.2"
}
2 changes: 1 addition & 1 deletion packages/babel-preset/moon.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
type: 'library'
layer: 'library'
6 changes: 3 additions & 3 deletions packages/babel-preset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@
},
"dependencies": {
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.27.1",
"@babel/plugin-proposal-decorators": "^7.28.0",
"@babel/plugin-proposal-export-default-from": "^7.27.1",
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/preset-env": "^7.27.2",
"@babel/preset-env": "^7.28.0",
"@babel/preset-react": "^7.27.1",
"@babel/preset-typescript": "^7.27.1",
"babel-plugin-conditional-invariant": "^4.0.1",
"babel-plugin-env-constants": "^4.0.1",
"babel-preset-solid": "^1.9.6"
},
"devDependencies": {
"@babel/core": "^7.27.1"
"@babel/core": "^7.28.0"
},
"funding": {
"type": "ko-fi",
Expand Down
2 changes: 1 addition & 1 deletion packages/dev/moon.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
type: 'library'
layer: 'library'
2 changes: 1 addition & 1 deletion packages/eslint-config/moon.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: 'library'
layer: 'library'

dependsOn:
- 'dev'
18 changes: 9 additions & 9 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,28 @@
"eslint": "^9.0.0"
},
"dependencies": {
"@eslint/compat": "^1.2.9",
"@eslint/compat": "^1.3.1",
"@moonrepo/dev": "^3.1.0",
"@typescript-eslint/eslint-plugin": "^8.32.1",
"@typescript-eslint/parser": "^8.32.1",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^10.1.5",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-compat": "^6.0.2",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jest": "^28.11.0",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-jest": "^29.0.1",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-n": "^17.18.0",
"eslint-plugin-n": "^17.21.0",
"eslint-plugin-promise": "^7.2.1",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-react-perf": "^3.3.3",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-solid": "^0.14.5",
"eslint-plugin-unicorn": "^56.0.1",
"globals": "^16.1.0"
"globals": "^16.3.0"
},
"devDependencies": {
"eslint": "^9.27.0"
"eslint": "^9.32.0"
},
"funding": {
"type": "ko-fi",
Expand Down
1 change: 0 additions & 1 deletion packages/eslint-config/src/module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { builtinModules } from 'module';
import type eslint from 'eslint';
// @ts-expect-error Not typed
import * as importPlugin from 'eslint-plugin-import';
import simpleImportSortPlugin from 'eslint-plugin-simple-import-sort';
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-preset/moon.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: 'library'
layer: 'library'

dependsOn:
- 'dev'
Expand Down
10 changes: 5 additions & 5 deletions packages/jest-preset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
"node": ">=18.12.0"
},
"peerDependencies": {
"jest": ">=26.0.0"
"jest": ">=30.0.0"
},
"dependencies": {
"@moonrepo/dev": "^3.1.0",
"@types/jest": "^29.5.12",
"jest-circus": "^29.7.0",
"jest-environment-jsdom": "^29.7.0"
"@types/jest": "^30.0.0",
"jest-circus": "^30.0.5",
"jest-environment-jsdom": "^30.0.5"
},
"devDependencies": {
"jest": "^29.7.0"
"jest": "^30.0.5"
},
"funding": {
"type": "ko-fi",
Expand Down
2 changes: 1 addition & 1 deletion packages/prettier-config/moon.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: 'library'
layer: 'library'

toolchain:
typescript: false
Expand Down
2 changes: 1 addition & 1 deletion packages/tsconfig/moon.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: 'library'
layer: 'library'

toolchain:
typescript: false
Expand Down
4 changes: 4 additions & 0 deletions packages/vscode-extension/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.15.1

- Added support for project `layer` in moon v1.39.

## 0.15.0

- Added MCP support. Requires VS Code v1.102.0.
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-extension/moon.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
stack: 'frontend'
type: 'tool'
layer: 'tool'
tags: ['extension']

project:
Expand Down
4 changes: 2 additions & 2 deletions packages/vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -357,11 +357,11 @@
"semver": "^7.7.2"
},
"devDependencies": {
"@moonrepo/types": "^1.30.1",
"@moonrepo/types": "^1.31.0",
"@types/semver": "^7.7.0",
"@types/vscode": "1.102.0",
"@vscode/test-electron": "^2.5.2",
"@vscode/vsce": "^3.6.0",
"esbuild": "^0.25.6"
"esbuild": "^0.25.8"
}
}
17 changes: 9 additions & 8 deletions packages/vscode-extension/src/projectsView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import vscode, {
} from 'vscode';
import type {
LanguageType,
LayerType,
Project,
ProjectType,
StackType,
Task as ProjectTask,
Task,
Expand Down Expand Up @@ -184,19 +184,19 @@ class ProjectCategoryItem extends TreeItem {
this.projects = projects.map((project) => new ProjectItem(context, this, project));

let stack: StackType = 'unknown';
let type: ProjectType = 'unknown';
let layer: LayerType = 'unknown';
let label = '';

// moon >= v1.22
if (category.includes('+')) {
[stack, type] = category.split('+') as [StackType, ProjectType];
[stack, layer] = category.split('+') as [StackType, LayerType];
}
// moon < v1.22
else {
type = category as ProjectType;
layer = category as LayerType;
}

if (stack === 'unknown' && type === 'unknown') {
if (stack === 'unknown' && layer === 'unknown') {
label = 'other';
} else {
if (stack !== 'unknown') {
Expand All @@ -218,7 +218,7 @@ class ProjectCategoryItem extends TreeItem {
label += ' ';
}

switch (type) {
switch (layer) {
case 'application':
label += 'applications';
break;
Expand Down Expand Up @@ -385,8 +385,9 @@ export class ProjectsProvider implements vscode.TreeDataProvider<TreeItem> {

this.projects!.forEach((project) => {
const stack: string = project.config.stack || 'unknown';
const type: string = project.config.type || 'unknown';
const key = `${stack}+${type}`;
// @ts-expect-error TODO `type` is deprecated!
const layer: string = project.config.layer || project.config.type || 'unknown';
const key = `${stack}+${layer}`;

if (key === 'unknown+unknown') {
uncategorized.push(project);
Expand Down
Loading