Skip to content
Draft
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
8 changes: 4 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: PR

on:
pull_request:
branches: [main]
branches: [main, v3]
push:
branches: [main]
branches: [main, v3]

concurrency:
# For PRs, use the ref (branch) in the concurrency group so that new pushes cancel any old runs.
Expand Down Expand Up @@ -33,6 +33,7 @@ jobs:
- run: yarn --frozen-lockfile

- run: yarn checkchange
if: ${{ github.ref != 'refs/heads/v3' && github.base_ref != 'v3' }}

- run: yarn format:check
if: ${{ matrix.os == 'ubuntu-latest' }}
Expand All @@ -44,7 +45,6 @@ jobs:
- name: Check for modified files
uses: microsoft/beachball-actions/check-for-modified-files@cf7d34819ad50dce8894b3ff99a2a7899aefee3d # v3

# The docs have a separate installation using Node 22 due to needing newer dependencies
docs:
name: build docs

Expand All @@ -55,7 +55,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
with:
node-version-file: docs/.nvmrc
node-version-file: .nvmrc

- name: Install docs dependencies
working-directory: docs
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ jobs:
NPM_AUTHTOKEN: ${{ secrets.NPM_AUTHTOKEN }}
REPO_PAT: ${{ secrets.REPO_PAT }}

# The docs have a separate installation using Node 22 due to needing newer dependencies
docs:
name: build docs

Expand All @@ -63,7 +62,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
with:
node-version-file: docs/.nvmrc
node-version-file: .nvmrc

- name: Install docs dependencies
working-directory: docs
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ temp
.temp
.cache

docs/.yarn/*
!docs/.yarn/releases
.yarn/*
!.yarn/releases
docs/.yarn

# Binary files
*.tgz
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14
22
File renamed without changes.
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
yarnPath: .yarn/releases/yarn-4.13.0.cjs
nodeLinker: node-modules
17 changes: 17 additions & 0 deletions beachball.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// @ts-check
/** @type {import('beachball').BeachballConfig} */
const config = {
groupChanges: true,
branch: 'main',
// disallowedChangeTypes: ['major'],
ignorePatterns: [
'.*ignore',
'api-extractor.json',
'jest.config.js',
'**/__tests__/**',
'**/*.spec.ts',
'**/*.test.ts',
],
};

module.exports = config;
18 changes: 18 additions & 0 deletions change/change-b53cee3e-dbda-4d36-a7b4-5029f7ca0478.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"changes": [
{
"type": "major",
"comment": "Require Node 22",
"packageName": "just-scripts",
"email": "elcraig@microsoft.com",
"dependentChangeType": "patch"
},
{
"type": "major",
"comment": "Require Node 22",
"packageName": "just-task",
"email": "elcraig@microsoft.com",
"dependentChangeType": "patch"
}
]
}
11 changes: 11 additions & 0 deletions change/change-c8c3ae81-323a-4196-857c-ff2199df8f10.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "just-scripts",
"type": "patch",
"dependentChangeType": "patch",
"comment": "Replace `run-parallel-limit` with `p-limit` for concurrency limiting in `cleanTask`, `copyTask`, and `sassTask`",
"email": "198982749+Copilot@users.noreply.github.com"
}
]
}
1 change: 0 additions & 1 deletion docs/.nvmrc

This file was deleted.

2 changes: 1 addition & 1 deletion docs/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
yarnPath: .yarn/releases/yarn-4.13.0.cjs
yarnPath: ../.yarn/releases/yarn-4.13.0.cjs
nodeLinker: node-modules
6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"name": "@microsoft/just-docs",
"version": "1.0.0",
"private": true,
"description": "just doc site, with newer node version",
"description": "just doc site",
"engines": {
"node": ">=22"
"node": ">=22.18.0"
},
"scripts": {
"build": "vuepress build . --dest dist",
"dev": "vuepress dev ."
},
"devDependencies": {
"@types/node": "22",
"@types/node": "^22.0.0",
"@vuepress/bundler-vite": "^2.0.0-rc.26",
"@vuepress/plugin-search": "^2.0.0-rc.120",
"@vuepress/theme-default": "^2.0.0-rc.120",
Expand Down
4 changes: 2 additions & 2 deletions docs/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@microsoft/just-docs@workspace:."
dependencies:
"@types/node": "npm:22"
"@types/node": "npm:^22.0.0"
"@vuepress/bundler-vite": "npm:^2.0.0-rc.26"
"@vuepress/plugin-search": "npm:^2.0.0-rc.120"
"@vuepress/theme-default": "npm:^2.0.0-rc.120"
Expand Down Expand Up @@ -912,7 +912,7 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:22":
"@types/node@npm:^22.0.0":
version: 22.19.15
resolution: "@types/node@npm:22.19.15"
dependencies:
Expand Down
81 changes: 32 additions & 49 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,84 +7,67 @@
"type": "git",
"url": "https://github.com/microsoft/just"
},
"workspaces": {
"packages": [
"packages/*",
"scripts"
]
},
"scripts": {
"api": "yarn lage api",
"api:update": "yarn lage api:update",
"build": "yarn lage build",
"api": "lage api",
"api:update": "lage api:update",
"build": "lage build",
"postbuild": "node ./scripts/copyReadme.js",
"change": "beachball change",
"checkchange": "beachball check",
"lage": "cross-env NODE_OPTIONS=\"--experimental-abortcontroller\" lage",
"format": "prettier --write .",
"format:check": "prettier --check .",
"release": "beachball publish",
"start": "yarn lage start",
"test": "yarn lage test",
"prelint": "syncpack list-mismatches",
"lint": "eslint packages --ext .ts,.js"
"start": "lage start",
"test": "lage test",
"lint:code": "eslint packages --ext .ts,.js",
"lint:deps": "syncpack lint",
"lint": "yarn lint:deps && yarn lint:code"
},
"engines": {
"node": ">=14"
"node": ">=22.18.0"
},
"devDependencies": {
"@microsoft/api-extractor": "7.52.9",
"@microsoft/api-extractor": "^7.57.7",
"@types/fs-extra": "^11.0.0",
"@types/jest": "^29.4.0",
"@types/jest": "^30.0.0",
"@types/mock-fs": "^4.13.1",
"@types/node": "^14.18.37",
"@types/node": "^22.0.0",
"@types/semver": "^7.3.13",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
"beachball": "^2.31.11",
"cross-env": "^7.0.3",
"beachball": "^2.63.1",
"eslint": "^8.35.0",
"jest": "^29.5.0",
"lage": "2.4.0",
"jest": "^30.0.0",
"lage": "^2.15.1",
"mock-fs": "^5.2.0",
"prettier": "~3.8.0",
"syncpack": "^9.0.0",
"ts-jest": "~29.2.5",
"typescript": "~4.5.0"
"syncpack": "^14.0.0",
"ts-jest": "~29.4.6",
"typescript": "~5.9.0"
},
"resolutions": {
"es5-ext": "0.10.53",
"kind-of": "^6.0.3",
"**/@types/glob/@types/minimatch": "^3.0.0",
"**/@types/minimatch/minimatch": "^3.0.0",
"**/@types/chokidar/chokidar": "^3.0.0",
"@types/node": "^14.0.0"
"@types/glob/@types/minimatch": "^3.0.0",
"@types/minimatch/minimatch": "^3.0.0",
"@types/chokidar/chokidar": "^3.0.0",
"@types/node": "^22.0.0"
},
"rationale": {
"devDependencies": {
"@microsoft/api-extractor": "Pin to newest version that supports node 14"
},
"resolutions": {
"**/@types/glob/@types/minimatch": "pin to installed minimatch version, not *",
"**/@types/minimatch/minimatch": "pin to version matching other minimatch deps, not *",
"**/@types/chokidar/chokidar": "pin to version matching other chokidar deps, not *"
"@types/glob/@types/minimatch": "pin to installed minimatch version, not *",
"@types/minimatch/minimatch": "pin to version matching other minimatch deps, not *",
"@types/chokidar/chokidar": "pin to version matching other chokidar deps, not *"
}
},
"beachball": {
"groupChanges": true,
"ignorePatterns": [
".*ignore",
"api-extractor.json",
"jest.config.js",
"**/__tests__/**",
"**/*.spec.ts",
"**/*.test.ts"
]
},
"syncpack": {
"dependencyTypes": [
"dev",
"prod"
]
},
"workspaces": {
"packages": [
"packages/*",
"scripts"
]
}
"packageManager": "yarn@4.13.0"
}
4 changes: 2 additions & 2 deletions packages/just-example-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
},
"license": "MIT",
"engines": {
"node": ">=14"
"node": ">=22.18.0"
},
"devDependencies": {
"just-scripts": ">=2.5.0 <3.0.0",
"just-scripts": "workspace:^",
"ts-node": "^10.8.0"
}
}
6 changes: 2 additions & 4 deletions packages/just-scripts/etc/just-scripts.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

```ts

/// <reference types="node" />

import type * as ApiExtractorTypes from '@microsoft/api-extractor';
import type { BuildOptions } from 'esbuild';
import { Configuration } from 'webpack';
Expand Down Expand Up @@ -458,7 +456,7 @@ export interface TsLoaderOptions {
}

// @public (undocumented)
export const tsOverlay: (overlayOptions?: TsOverlayOptions | undefined) => Partial<Configuration>;
export const tsOverlay: (overlayOptions?: TsOverlayOptions) => Partial<Configuration>;

// @public (undocumented)
export interface TsOverlayOptions {
Expand Down Expand Up @@ -509,7 +507,7 @@ export { webpackMerge }

// @public (undocumented)
export const webpackOverlays: {
typescript: (overlayOptions?: TsOverlayOptions | undefined) => Partial<Configuration>;
typescript: (overlayOptions?: TsOverlayOptions) => Partial<Configuration>;
html: (options: any) => Partial<Configuration>;
styles: () => Partial<Configuration>;
file: () => Partial<Configuration>;
Expand Down
22 changes: 8 additions & 14 deletions packages/just-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,25 @@
"license": "MIT",
"author": "",
"main": "./lib/index.js",
"bin": {
"just-scripts": "bin/just-scripts.js"
},
"bin": "bin/just-scripts.js",
"scripts": {
"api": "api-extractor run",
"api:update": "api-extractor run --local",
"build": "tsc",
"start": "tsc -w --preserveWatchOutput",
"start-test": "jest --watch",
"test": "jest",
"test:update": "jest --updateSnapshot"
"api": "yarn run -T api-extractor run",
"api:update": "yarn run -T api-extractor run --local",
"build": "yarn run -T tsc",
"test": "yarn run -T jest"
},
"engines": {
"node": ">=14"
"node": ">=22.18.0"
},
"dependencies": {
"chalk": "^4.0.0",
"cross-spawn": "^7.0.6",
"diff-match-patch": "1.0.5",
"fs-extra": "^11.0.0",
"glob": "^7.1.3",
"just-task": "^1.13.0",
"just-task": "workspace:^",
"p-limit": "^7.3.0",
"prompts": "^2.4.0",
"run-parallel-limit": "^1.0.6",
"semver": "^7.0.0",
"supports-color": "^8.1.0",
"webpack-merge": "^5.7.3"
Expand All @@ -44,7 +39,6 @@
"@types/diff-match-patch": "^1.0.32",
"@types/glob": "^7.2.0",
"@types/prompts": "^2.4.2",
"@types/run-parallel-limit": "^1.0.0",
"@types/supports-color": "^8.1.1",
"@types/webpack": "^4.41.33",
"async-done": "^2.0.0",
Expand Down
Loading
Loading