From 0b923dc1e30e2ba006fd17fb66ad9ed515c86925 Mon Sep 17 00:00:00 2001 From: Aryan Jasala Date: Fri, 2 Oct 2026 00:50:59 +0530 Subject: [PATCH 1/4] chore(deps): install the @rtcamp packages from npm @rtcamp/eslint-config, @rtcamp/stylelint-config and @rtcamp/wp-tooling are published, so package.json asks for ^1.1.0, ^1.1.0 and ^2.0.0 instead of the npm/* git branches, and the Tailwind feature adds @rtcamp/tailwind-config ^1.1.0. The lockfile now records registry tarballs with integrity hashes instead of git+ssh URLs. --- .npmrc | 4 ++-- bin/scaffold.config.js | 3 +-- docs/internal/README.md | 2 +- docs/internal/maintenance.md | 2 +- package-lock.json | 27 +++++++++++++++------------ package.json | 6 +++--- 6 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.npmrc b/.npmrc index f63ce15d..1f486ec1 100644 --- a/.npmrc +++ b/.npmrc @@ -1,4 +1,4 @@ save-exact = true -; The @rtcamp packages resolve from git branch refs in package.json, not from a -; registry, so no scope registry or token is needed. +; The @rtcamp packages are public on the npm registry, so no scope registry or +; token is needed. diff --git a/bin/scaffold.config.js b/bin/scaffold.config.js index f07a90be..ded5bddf 100644 --- a/bin/scaffold.config.js +++ b/bin/scaffold.config.js @@ -74,8 +74,7 @@ module.exports = { }, ], devDependencies: { - '@rtcamp/tailwind-config': - 'github:rtCamp/wp-tooling#npm/tailwind-config', + '@rtcamp/tailwind-config': '^1.1.0', tailwindcss: '^4.3.0', '@tailwindcss/postcss': '^4.3.0', }, diff --git a/docs/internal/README.md b/docs/internal/README.md index 334edd09..28b81240 100644 --- a/docs/internal/README.md +++ b/docs/internal/README.md @@ -15,6 +15,6 @@ Documentation and smoke results must identify the theme commit and installed dep ## Temporary procedure status -The registry-bypass pilot from the former `docs/internal-testing.md` is retired: the current [npm declaration](../../package.json) uses GitHub's `npm/wp-tooling` branch, and [Composer](../../composer.json) resolves the framework through VCS. Local source overrides are only for deliberate dependency development. +The registry-bypass pilot from the former `docs/internal-testing.md` is retired: the [npm declaration](../../package.json) installs `@rtcamp/wp-tooling` from the npm registry, and [Composer](../../composer.json) resolves the framework through VCS. Local source overrides are only for deliberate dependency development. The remaining [validation workarounds](maintenance.md#temporary-validation-procedures) have an applicable revision and a retirement condition. Recheck their status when the theme or its dependencies change. diff --git a/docs/internal/maintenance.md b/docs/internal/maintenance.md index 5664f124..2c5edd74 100644 --- a/docs/internal/maintenance.md +++ b/docs/internal/maintenance.md @@ -57,7 +57,7 @@ git clone https://github.com/rtCamp/wp-tooling.git '/absolute/path/to/wp-tooling git clone https://github.com/rtCamp/wp-primitives.git '/absolute/path/to/wp-primitives' ``` -In the dependency checkout, select and record the revision under test. The tooling override below needs the source monorepo's `node-packages/wp-tooling/` directory; the `npm/wp-tooling` distribution branch has a different layout. Follow the [tooling](https://github.com/rtCamp/wp-tooling/blob/main/CONTRIBUTING.md#development-setup) or [framework](https://github.com/rtCamp/wp-primitives/blob/main/CONTRIBUTING.md#development-setup) maintainer guide for that package's setup and checks. +In the dependency checkout, select and record the revision under test. The tooling override below needs the source monorepo's `node-packages/wp-tooling/` directory; the published npm package has a different layout. Follow the [tooling](https://github.com/rtCamp/wp-tooling/blob/main/CONTRIBUTING.md#development-setup) or [framework](https://github.com/rtCamp/wp-primitives/blob/main/CONTRIBUTING.md#development-setup) maintainer guide for that package's setup and checks. From the disposable theme directory, point only the tooling declaration at your checkout: diff --git a/package-lock.json b/package-lock.json index 650db942..5aad68e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,9 +14,9 @@ "devDependencies": { "@babel/core": "7.29.7", "@eslint-community/eslint-plugin-eslint-comments": "4.7.2", - "@rtcamp/eslint-config": "github:rtCamp/wp-tooling#npm/eslint-config", - "@rtcamp/stylelint-config": "github:rtCamp/wp-tooling#npm/stylelint-config", - "@rtcamp/wp-tooling": "github:rtCamp/wp-tooling#npm/wp-tooling", + "@rtcamp/eslint-config": "^1.1.0", + "@rtcamp/stylelint-config": "^1.1.0", + "@rtcamp/wp-tooling": "^2.0.0", "@wordpress/babel-preset-default": "8.47.0", "@wordpress/browserslist-config": "6.47.0", "@wordpress/env": "11.7.0", @@ -7178,12 +7178,13 @@ } }, "node_modules/@rtcamp/eslint-config": { - "version": "0.1.0", - "resolved": "git+ssh://git@github.com/rtCamp/wp-tooling.git#c5f84e64e223d72619c1f29f20c796c8e641c54f", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@rtcamp/eslint-config/-/eslint-config-1.1.0.tgz", + "integrity": "sha512-z5TYMqH3lgzdadNC+7HQXSzg2kMcFvlBo9VWYtBNN2MdQS9HA2f3Ls33C1A1oK7Q3QNniOeulJBxDYDutICwSw==", "dev": true, "license": "GPL-2.0-or-later", "engines": { - "node": ">=22" + "node": ">=22.19" }, "peerDependencies": { "@eslint-community/eslint-plugin-eslint-comments": "^4.7.1", @@ -7199,12 +7200,13 @@ } }, "node_modules/@rtcamp/stylelint-config": { - "version": "0.1.0", - "resolved": "git+ssh://git@github.com/rtCamp/wp-tooling.git#ab475616bfde91a7fb3b498bac1d80c4ab71b43d", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@rtcamp/stylelint-config/-/stylelint-config-1.1.0.tgz", + "integrity": "sha512-TK62HGXais+HwcGOBpPLwTJuEBEL9g8sOeo138aFOpB+MGX7zOrQHsiW7ih7rDIc+mwSlBTCz7+mvZhAFZ3NUA==", "dev": true, "license": "GPL-2.0-or-later", "engines": { - "node": ">=22" + "node": ">=22.19" }, "peerDependencies": { "@wordpress/stylelint-config": "^23.37.0", @@ -7213,15 +7215,16 @@ } }, "node_modules/@rtcamp/wp-tooling": { - "version": "1.0.0", - "resolved": "git+ssh://git@github.com/rtCamp/wp-tooling.git#18d003c8a1963f818767976dc4072d73183b9df2", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@rtcamp/wp-tooling/-/wp-tooling-2.0.0.tgz", + "integrity": "sha512-b7pUXr79aM4q8OG69CzNC4F9DMNmQHZDSwUyo3LiHY6dxUciTQLYmSxeaCE9HuFzMkts2YSXr55xcqJkMYkXSw==", "dev": true, "license": "GPL-2.0-or-later", "bin": { "wp-tooling": "bin/wp-tooling.js" }, "engines": { - "node": ">=22" + "node": ">=22.19" } }, "node_modules/@rtsao/scc": { diff --git a/package.json b/package.json index ad372a7d..f64d8f3e 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,9 @@ "devDependencies": { "@babel/core": "7.29.7", "@eslint-community/eslint-plugin-eslint-comments": "4.7.2", - "@rtcamp/eslint-config": "github:rtCamp/wp-tooling#npm/eslint-config", - "@rtcamp/stylelint-config": "github:rtCamp/wp-tooling#npm/stylelint-config", - "@rtcamp/wp-tooling": "github:rtCamp/wp-tooling#npm/wp-tooling", + "@rtcamp/eslint-config": "^1.1.0", + "@rtcamp/stylelint-config": "^1.1.0", + "@rtcamp/wp-tooling": "^2.0.0", "@wordpress/babel-preset-default": "8.47.0", "@wordpress/browserslist-config": "6.47.0", "@wordpress/env": "11.7.0", From 6f3ef8fc908793e324f346b0b9f0ee41094a57a4 Mon Sep 17 00:00:00 2001 From: Aryan Jasala Date: Fri, 2 Oct 2026 00:53:17 +0530 Subject: [PATCH 2/4] chore: rename the Composer package to rtcamp/theme-elementary Matches the repository name. bin/scaffold.config.js keeps the placeholder identity in sync, so npm run init still replaces it with rtcamp/. composer.lock only gets the new content-hash. --- bin/scaffold.config.js | 2 +- composer.json | 2 +- composer.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/scaffold.config.js b/bin/scaffold.config.js index ded5bddf..e0b4300c 100644 --- a/bin/scaffold.config.js +++ b/bin/scaffold.config.js @@ -22,7 +22,7 @@ module.exports = { source: { name: 'Elementary Theme', namespace: 'rtCamp\\Theme\\Elementary', - package: 'rtcamp/elementary', + package: 'rtcamp/theme-elementary', }, // Derive the namespace and composer package from the chosen name. diff --git a/composer.json b/composer.json index ce85204e..eb5a9d9b 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "rtcamp/elementary", + "name": "rtcamp/theme-elementary", "description": "A starter theme that facilitates a quick head start for developing new block-based themes along with a bunch of developer-friendly features.", "type": "wordpress-theme", "homepage": "https://rtcamp.com/", diff --git a/composer.lock b/composer.lock index 1e32864f..1811fa35 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3cb15141c1588adc39299cb7e20fe01a", + "content-hash": "9cbc7cc2771fbb841747579c7086f717", "packages": [ { "name": "rtcamp/wp-primitives", From 899c0ba61f5220c7e864d48e21064f2b9f7efb24 Mon Sep 17 00:00:00 2001 From: Aryan Jasala Date: Fri, 2 Oct 2026 00:54:26 +0530 Subject: [PATCH 3/4] chore(deps): resolve the rtcamp Composer packages from Packagist rtcamp/wp-primitives, rtcamp/wp-phpcs and rtcamp/wp-phpstan are on Packagist, so composer.json drops their GitHub VCS repositories. The lock re-resolves them from Packagist: wp-primitives stays at v2.0.0, and wp-phpcs and wp-phpstan move to v1.0.1 (README, licence and package metadata only). --- composer.json | 17 -------- composer.lock | 89 ++++++++++++++++++----------------------- docs/internal/README.md | 2 +- 3 files changed, 41 insertions(+), 67 deletions(-) diff --git a/composer.json b/composer.json index eb5a9d9b..3d7655fe 100644 --- a/composer.json +++ b/composer.json @@ -4,23 +4,6 @@ "type": "wordpress-theme", "homepage": "https://rtcamp.com/", "license": "GPL-2.0-or-later", - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/rtCamp/wp-primitives.git", - "no-api": true - }, - { - "type": "vcs", - "url": "https://github.com/rtCamp/wp-phpcs.git", - "no-api": true - }, - { - "type": "vcs", - "url": "https://github.com/rtCamp/wp-phpstan.git", - "no-api": true - } - ], "require": { "php": ">=8.2", "rtcamp/wp-primitives": "^2.0" diff --git a/composer.lock b/composer.lock index 1811fa35..146d217d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9cbc7cc2771fbb841747579c7086f717", + "content-hash": "d378f98e212306678211685c07df4b4a", "packages": [ { "name": "rtcamp/wp-primitives", @@ -46,30 +46,7 @@ "rtCamp\\WPPrimitives\\": "inc/" } }, - "autoload-dev": { - "psr-4": { - "rtCamp\\WPPrimitives\\Tests\\": "tests/" - } - }, - "scripts": { - "lint": [ - "phpcs" - ], - "lint:fix": [ - "phpcbf" - ], - "analyse": [ - "phpstan analyse --memory-limit=1G" - ], - "test": [ - "phpunit" - ], - "check": [ - "@lint", - "@analyse", - "@test" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-2.0-or-later" ], @@ -91,9 +68,9 @@ "wordpress-theme" ], "support": { + "docs": "https://opensource.rtcamp.com/wp-primitives/", "issues": "https://github.com/rtCamp/wp-primitives/issues", - "source": "https://github.com/rtCamp/wp-primitives", - "docs": "https://opensource.rtcamp.com/wp-primitives/" + "source": "https://github.com/rtCamp/wp-primitives" }, "time": "2026-10-01T16:46:31+00:00" } @@ -2002,16 +1979,16 @@ }, { "name": "rtcamp/wp-phpcs", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/rtCamp/wp-phpcs.git", - "reference": "c109b87a2c784f3834068c9d63aea96178c46159" + "reference": "c209e4385f9cf0cb673b09c10af8f713a4116c09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rtCamp/wp-phpcs/zipball/c109b87a2c784f3834068c9d63aea96178c46159", - "reference": "c109b87a2c784f3834068c9d63aea96178c46159", + "url": "https://api.github.com/repos/rtCamp/wp-phpcs/zipball/c209e4385f9cf0cb673b09c10af8f713a4116c09", + "reference": "c209e4385f9cf0cb673b09c10af8f713a4116c09", "shasum": "" }, "require": { @@ -2026,32 +2003,44 @@ "phpunit/phpunit": "^11.5" }, "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-2.0-or-later" ], + "authors": [ + { + "name": "rtCamp", + "homepage": "https://rtcamp.com" + } + ], "description": "rtCamp PHP_CodeSniffer standards for WordPress projects (rtCampWP + rtCampWP-Basic).", + "homepage": "https://github.com/rtCamp/wp-tooling/tree/main/composer-packages/phpcs", "keywords": [ - "WordPress", "phpcs", "standards", "static analysis", "vipcs", + "wordpress", "wpcs" ], - "time": "2026-07-29T22:18:33+00:00" + "support": { + "issues": "https://github.com/rtCamp/wp-tooling/issues", + "source": "https://github.com/rtCamp/wp-tooling/tree/main/composer-packages/phpcs" + }, + "time": "2026-10-01T18:10:21+00:00" }, { "name": "rtcamp/wp-phpstan", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/rtCamp/wp-phpstan.git", - "reference": "8f5f0acb1d02ccdd24fd2fa25e59d669e843dcf1" + "reference": "3252dfb4264f3de4a574201ee7f6ec3c0ad2bc26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rtCamp/wp-phpstan/zipball/8f5f0acb1d02ccdd24fd2fa25e59d669e843dcf1", - "reference": "8f5f0acb1d02ccdd24fd2fa25e59d669e843dcf1", + "url": "https://api.github.com/repos/rtCamp/wp-phpstan/zipball/3252dfb4264f3de4a574201ee7f6ec3c0ad2bc26", + "reference": "3252dfb4264f3de4a574201ee7f6ec3c0ad2bc26", "shasum": "" }, "require": { @@ -2063,27 +2052,29 @@ "phpunit/phpunit": "^11.5" }, "type": "library", - "autoload-dev": { - "psr-4": { - "rtCamp\\WPPhpstan\\Tests\\": "tests/" - } - }, - "scripts": { - "test": [ - "phpunit" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-2.0-or-later" ], + "authors": [ + { + "name": "rtCamp", + "homepage": "https://rtcamp.com" + } + ], "description": "rtCamp PHPStan configuration and baseline for WordPress projects.", + "homepage": "https://github.com/rtCamp/wp-tooling/tree/main/composer-packages/phpstan", "keywords": [ - "phpstan", + "PHPStan", "rtcamp", "static analysis", "wordpress" ], - "time": "2026-07-29T22:18:33+00:00" + "support": { + "issues": "https://github.com/rtCamp/wp-tooling/issues", + "source": "https://github.com/rtCamp/wp-tooling/tree/main/composer-packages/phpstan" + }, + "time": "2026-10-01T18:10:21+00:00" }, { "name": "sebastian/cli-parser", diff --git a/docs/internal/README.md b/docs/internal/README.md index 28b81240..afe14bf1 100644 --- a/docs/internal/README.md +++ b/docs/internal/README.md @@ -15,6 +15,6 @@ Documentation and smoke results must identify the theme commit and installed dep ## Temporary procedure status -The registry-bypass pilot from the former `docs/internal-testing.md` is retired: the [npm declaration](../../package.json) installs `@rtcamp/wp-tooling` from the npm registry, and [Composer](../../composer.json) resolves the framework through VCS. Local source overrides are only for deliberate dependency development. +The registry-bypass pilot from the former `docs/internal-testing.md` is retired: the [npm declaration](../../package.json) installs `@rtcamp/wp-tooling` from the npm registry, and [Composer](../../composer.json) resolves the framework from Packagist. Local source overrides are only for deliberate dependency development. The remaining [validation workarounds](maintenance.md#temporary-validation-procedures) have an applicable revision and a retirement condition. Recheck their status when the theme or its dependencies change. From d882537b8ca3273b5fe695eb25d7e9f861101444 Mon Sep 17 00:00:00 2001 From: Aryan Jasala Date: Fri, 2 Oct 2026 01:08:39 +0530 Subject: [PATCH 4/4] fix(stylelint): ignore JSON files The shared Lint CSS job passes package.json and package-lock.json to Stylelint when they change, and Stylelint failed on them with CssSyntaxError. Ignore **/*.json like the plugin does. --- .stylelintrc.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.stylelintrc.json b/.stylelintrc.json index f86e79ed..35472649 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -2,6 +2,7 @@ "extends": "@rtcamp/stylelint-config", "ignoreFiles": [ "**/*.js", + "**/*.json", "**/*.php" ], "rules": {