Skip to content

new process document #1981

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
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
12 changes: 2 additions & 10 deletions lib/l10n-en_GB.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,9 @@ export const messages = {
'sotd.stability.no-cr-review':
'No wide review link for Candidate Recommendation',
'sotd.stability.wrong-cr-review-link':
"Wrong wide review link for Candidate Recommendation, link should be 'https://www.w3.org/policies/process/20231103/#dfn-wide-review'",
"Wrong wide review link for Candidate Recommendation, link should be 'https://www.w3.org/policies/process/20250818/#dfn-wide-review'",
'sotd.stability.no-licensing-link':
"Wrong royalty-free licensing link for CR and REC, link should be ${licensingLink} with text '${licensingText}'",
// sotd/review-end
'sotd.review-end.not-found': 'No review end date found.',
'sotd.review-end.found': 'Review end date found: ${date}',
// sotd/candidate-review-end
'sotd.candidate-review-end.not-found':
'No minimal review end for candidate document date found.',
Expand Down Expand Up @@ -262,11 +259,6 @@ export const messages = {
'The process document (${process}) you are using is deprecated.',
'sotd.process-document.previous-not-allowed':
'The process document (${process}) you are using is no longer allowed.',
// sotd/ac-review
'sotd.ac-review.found':
'Found a link to an online questionnaire: ${link}. Does this link provide access to the review form?',
'sotd.ac-review.not-found':
'Did not find information about a forum for AC Representative feedback.',
// sotd/diff
'sotd.diff.note': false,
// sotd/rescind
Expand All @@ -278,7 +270,7 @@ export const messages = {
'Deliverer not found. An attribute <code>data-deliverer</code> must be in the SotD',
// sotd/new-features
'sotd.new-features.no-link':
'The paragraph on future updates to the recommendation should include a link to the new features: https://www.w3.org/policies/process/20231103/#allow-new-features',
'The paragraph on future updates to the recommendation should include a link to the new features: https://www.w3.org/policies/process/20250818/#allow-new-features',
'sotd.new-features.no-warning':
"<strong style='font-size: 20px;'>If it is the intention to incorporate new features in future updates of the Recommendation, please make sure to identify the document as intending to allow new features.</strong>",
// structure/canonical
Expand Down
2 changes: 2 additions & 0 deletions lib/profiles/TR/Recommendation/CR.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as candidateReviewEnd from '../../../rules/sotd/candidate-review-end.js';
import * as newFeatures from '../../../rules/sotd/new-features.js';
import { insertAfter } from '../../profileUtil.js';
import {
config as baseConfig,
Expand All @@ -15,5 +16,6 @@ export const config = {
};

export const rules = insertAfter(baseRules, 'sotd.process-document', [
newFeatures,
candidateReviewEnd,
]);
6 changes: 5 additions & 1 deletion lib/profiles/TR/Recommendation/CRD.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as draftStability from '../../../rules/sotd/draft-stability.js';
import * as newFeatures from '../../../rules/sotd/new-features.js';
import { insertAfter } from '../../profileUtil.js';
import {
config as baseConfig,
Expand All @@ -14,4 +15,7 @@ export const config = {
styleSheet: 'W3C-CRD',
};

export const rules = insertAfter(baseRules, 'sotd.pp', [draftStability]);
export const rules = insertAfter(baseRules, 'sotd.pp', [
newFeatures,
draftStability,
]);
24 changes: 0 additions & 24 deletions lib/profiles/TR/Recommendation/PR.js

This file was deleted.

164 changes: 34 additions & 130 deletions lib/rules.json

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions lib/rules/metadata/process.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,5 @@ export function check(sr, done) {
if (!processDocumentHref) {
return done();
}
const process =
processDocumentHref === 'https://www.w3.org/2023/Process-20231103/'
? 'https://www.w3.org/policies/process/20231103/'
: processDocumentHref;
return done({ process });
return done({ process: processDocumentHref });
}
26 changes: 0 additions & 26 deletions lib/rules/sotd/ac-review.js

This file was deleted.

13 changes: 4 additions & 9 deletions lib/rules/sotd/new-features.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,18 @@ export const { name } = self;
*/
export function check(sr, done) {
const sotd = sr.getSotDSection();
const docType =
sr.config.status === 'PR' ? 'specification' : 'Recommendation';
const docType = `${sr.config.status !== 'REC' ? 'upcoming ' : ''}Recommendation`;
const warning = new RegExp(
`Future updates to this ${docType} may incorporate new features.`
);
const linkTxt = 'new features';
const linkHrefOld =
'https://www.w3.org/2023/Process-20231103/#allow-new-features';
const linkHrefNew =
'https://www.w3.org/policies/process/20231103/#allow-new-features';
const linkHref =
'https://www.w3.org/policies/process/20250818/#allow-new-features';

if (sotd && sr.norm(sotd.textContent).match(warning)) {
const foundLink = Array.prototype.some.call(
sotd.querySelectorAll('a'),
a =>
sr.norm(a.textContent) === linkTxt &&
[linkHrefNew, linkHrefOld].includes(a.href)
a => sr.norm(a.textContent) === linkTxt && a.href === linkHref
);
if (!foundLink) {
sr.error(self, 'no-link');
Expand Down
13 changes: 5 additions & 8 deletions lib/rules/sotd/process-document.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ export function check(sr, done) {
const sotd = sr.getSotDSection();
const BOILERPLATE_PREFIX = 'This document is governed by the ';
const BOILERPLATE_SUFFIX = ' W3C Process Document.';
const newProc = '03 November 2023';
const newProcOldUri = 'https://www.w3.org/2023/Process-20231103/';
const newProcNewUri = 'https://www.w3.org/policies/process/20231103/';
const previousProc = '12 June 2023';
const previousProcUri = 'https://www.w3.org/2023/Process-20230612/';
const newProc = '18 August 2025';
const newProcUri = 'https://www.w3.org/policies/process/20250818/';
const previousProc = '03 November 2023';
const previousProcUri = 'https://www.w3.org/policies/process/20231103/';
let previousAllowed;

const boilerplate = BOILERPLATE_PREFIX + newProc + BOILERPLATE_SUFFIX;
Expand All @@ -45,9 +44,7 @@ export function check(sr, done) {
if (
sr.norm(p.textContent) === boilerplate &&
link &&
[newProcOldUri, newProcNewUri].includes(
link.getAttribute('href')
)
newProcUri === link.getAttribute('href')
) {
if (found)
sr.error(self, 'multiple-times', { process: newProc });
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/sotd/publish.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export async function check(sr, done) {
},
doAfter() {
baseURL =
/^https:\/\/www.w3.org\/(2023\/Process-|policies\/process\/)20231103\//;
/^https:\/\/www.w3.org\/policies\/process\/20250818\//;
},
});

Expand Down
30 changes: 0 additions & 30 deletions lib/rules/sotd/review-end.js

This file was deleted.

6 changes: 2 additions & 4 deletions lib/rules/sotd/stability.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,8 @@ export async function check(sr, done) {
);
if (!review) sr.error(self, 'no-cr-review');
else if (
![
'https://www.w3.org/2023/Process-20231103/#dfn-wide-review',
'https://www.w3.org/policies/process/20231103/#dfn-wide-review',
].includes(review.href)
review.href !==
'https://www.w3.org/policies/process/20250818/#dfn-wide-review'
)
sr.error(self, 'wrong-cr-review-link');
}
Expand Down
2 changes: 1 addition & 1 deletion test/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ describe('API', () => {
query = request('metadata?file=test/docs/metadata/ttml-imsc1.html');
// @TODO: parse result as an Object (it's JSON) instead of a String.
return expect(query)
.to.eventually.match(/"profile":\s*"pr"/i)
.to.eventually.match(/"profile":\s*"rec"/i)
.and.to.eventually.match(/"docDate":\s*"2016-3-8"/i);
});
});
Expand Down
35 changes: 0 additions & 35 deletions test/data/TR/Recommendation/PR.js

This file was deleted.

3 changes: 0 additions & 3 deletions test/data/goodDocuments.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ export const goodDocuments = {
FPWD: {
url: 'doc-views/TR/Recommendation/FPWD?type=good',
},
PR: {
url: 'doc-views/TR/Recommendation/PR?type=good',
},
REC: {
url: 'doc-views/TR/Recommendation/REC?type=good',
},
Expand Down
54 changes: 0 additions & 54 deletions test/doc-views/TR/Recommendation/PR.js

This file was deleted.

2 changes: 1 addition & 1 deletion test/doc-views/TR/Recommendation/REC.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export default {
showProposedAdd: true,
},
processHTML:
'03 November 2023 <abbr title="World Wide Web Consortium">W3C</abbr> Process Document',
'18 August 2025 <abbr title="World Wide Web Consortium">W3C</abbr> Process Document',
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions test/doc-views/TR/TRBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export function buildCommonViewData(base) {
sotd: {
...base.sotd,
processLink:
'https://www.w3.org/wrong/link/2023/Process-20231103/',
'https://www.w3.org/wrong/link/2023/Process-20250818/',
},
},
duplicatedProcess: {
Expand Down Expand Up @@ -151,7 +151,7 @@ export function buildCommonViewData(base) {
sotd: {
...base.sotd,
trackLink:
'https://www.w3.org/policies/process/20231103/#wrong-url',
'https://www.w3.org/policies/process/20250818/#wrong-url',
},
},
noHomepageLink: {
Expand Down
6 changes: 3 additions & 3 deletions test/doc-views/layout/spec.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
</p>
{{#if sotd.rec.showProposedAdd}}
<p>
It includes <a href="https://www.w3.org/policies/process/20231103/#proposed-addition">proposed addition</a>, introducing new features since the Previous Recommendation.
It includes <a href="https://www.w3.org/policies/process/20250818/#proposed-addition">proposed addition</a>, introducing new features since the Previous Recommendation.
</p>
{{/if}}
{{#if sotd.rec.showAddition}}
Expand Down Expand Up @@ -243,11 +243,11 @@
{{> patent-policy}}

<p>
This document <span class="handlebars-data">{{sotd.processTextPrefix}}</span>{{! is governed by the}} <a id="w3c_process_revision" href="{{sotd.processLink}}"><span class="handlebars-data">{{{sotd.processHTML}}}{{! 03 November 2023 W3C Process Document }}</span></a>.
This document <span class="handlebars-data">{{sotd.processTextPrefix}}</span>{{! is governed by the}} <a id="w3c_process_revision" href="{{sotd.processLink}}"><span class="handlebars-data">{{{sotd.processHTML}}}{{! 18 August 2025 W3C Process Document }}</span></a>.
</p>
{{#if sotd.duplicateProcess}}
<p>
This document <span class="handlebars-data">{{sotd.processTextPrefix}}</span>{{! is governed by the}} <a id="w3c_process_revision" href="{{sotd.processLink}}"><span class="handlebars-data">{{{sotd.processHTML}}}{{! 03 November 2023 W3C Process Document }}</span></a>.
This document <span class="handlebars-data">{{sotd.processTextPrefix}}</span>{{! is governed by the}} <a id="w3c_process_revision" href="{{sotd.processLink}}"><span class="handlebars-data">{{{sotd.processHTML}}}{{! 18 August 2025 W3C Process Document }}</span></a>.
</p>
{{/if}}
{{#if sotd.newFeatures.show}}
Expand Down
Loading