Skip to content

Commit fae4fb9

Browse files
committed
Text updates after TW Review
1 parent 7ea9453 commit fae4fb9

File tree

6 files changed

+16
-17
lines changed

6 files changed

+16
-17
lines changed

packages/devextreme-cli/src/applications/application.angular.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ const migrateConfigComponents = async(options = {}) => {
190190
await runCommand('npm', ['install', '-g', `${collectionName}@${schematicsVersion}`], { stdio: 'inherit' });
191191
console.log('Installation completed successfully.');
192192
} catch(error) {
193-
console.error('Failed to install devextreme-schematics. Please install it manually:');
193+
console.error('Failed to install devextreme-schematics. Please install manually:');
194194
console.error(`npm install -g ${collectionName}@${schematicsVersion}`);
195195
process.exit(1);
196196
}

packages/devextreme-cli/src/commands.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@
5454
"usage": "devextreme migrate <change name> [options]",
5555
"arguments": [{
5656
"name": "angular-config-components",
57-
"description": "Migrate DevExtreme configuration components to the latest version.",
57+
"description": "Migrate to the latest DevExtreme configuration components.",
5858
"options": [{
5959
"name": "--include",
60-
"description": "Glob patterns of template files to include (default: **/*.html). You can pass multiple patterns as a comma-separated string (e.g. \"**/a.html,**/b.html\") or as an array (e.g. [\"**/a.html\",\"**/b.html\"])."
60+
"description": "Template file glob patterns to include (default: **/*.html). You can pass multiple patterns as a comma-separated string (e.g. \"**/a.html,**/b.html\") or as an array (e.g. [\"**/a.html\",\"**/b.html\"])."
6161
}, {
6262
"name": "--script-include",
63-
"description": "Glob patterns for TypeScript/JavaScript files to scan for inline @Component({ template }) (default: **/*.ts,**/*.js). You can pass multiple patterns as a comma-separated string or as an array. Set to empty to disable."
63+
"description": "TypeScript/JavaScript file glob patterns to scan for inline templates (default: **/*.ts,**/*.js). You can pass multiple patterns as a comma-separated string or as an array. Pass an empty value ('' or []) to disable."
6464
}, {
6565
"name": "--dry",
66-
"description": "Run in dry mode to preview changes without applying them (default: false)"
66+
"description": "Run in dry mode to preview changes without applying them (default: false)."
6767
}]
6868
}]
6969
}, {

packages/devextreme-schematics/src/collection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"schema": "./add-view/schema.json"
2727
},
2828
"migrate-config-components": {
29-
"description": "Migrate DevExtreme configuration components to the latest version.",
29+
"description": "Migrate to the latest DevExtreme configuration components.",
3030
"factory": "./migrate-config-components/index#migrateConfigComponents",
3131
"schema": "./migrate-config-components/schema.json"
3232
}

packages/devextreme-schematics/src/migrate-config-components/mappings/deprecated-config-map.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"_generated": true,
33
"_description": "Mapping: host component -> { _hostSelector?: string, generic config selector : component-specific selector }",
4-
"_note": "Do not edit manually; run scripts/generate-deprecated-config-map.mjs",
4+
"_note": "Do not edit manually. Run scripts/generate-deprecated-config-map.mjs to generate a new map.",
55
"DxAccordionComponent": {
66
"_hostSelector": "dx-accordion",
77
"dxi-item": "dxi-accordion-item"

packages/devextreme-schematics/src/migrate-config-components/schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json-schema.org/schema",
33
"$id": "SchematicsDevextremeMigrateConfigComponents",
4-
"title": "Migrate deprecated config components to new ones",
4+
"title": "Migrate to the latest DevExtreme configuration components.",
55
"type": "object",
66
"properties": {
77
"include": {
@@ -16,7 +16,7 @@
1616
{ "type": "array", "items": { "type": "string" } },
1717
{ "type": "string" }
1818
],
19-
"description": "Glob(s) for TS/JS files to scan for inline @Component({ template }) (default: ['**/*.ts','**/*.js']; set to [] to disable)"
19+
"description": "Glob(s) of TS/JS files to scan for inline templates (default: ['**/*.ts','**/*.js']; set empty ('' or []) to disable)"
2020
},
2121
"dry": {
2222
"oneOf": [

packages/devextreme-schematics/src/migrate-config-components/template-migrator.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ for (const p of tsResolutionPaths) {
1717
ts = require(require.resolve('typescript', { paths: [p] }));
1818
break;
1919
} catch (err) {
20-
tsResolutionErrors.push(`Failed to resolve TypeScript from ${p}: ${err?.message || err}`);
20+
tsResolutionErrors.push(`Failed to import TypeScript from ${p}: ${err?.message || err}`);
2121
}
2222
}
2323
if (!ts) {
2424
try {
2525
// tslint:disable-next-line:no-var-requires
2626
ts = require('typescript');
2727
} catch (err) {
28-
tsResolutionErrors.push(`Failed to require global TypeScript: ${err?.message || err}`);
28+
tsResolutionErrors.push(`Failed to import TypeScript: ${err?.message || err}`);
2929
}
3030
}
3131

@@ -98,14 +98,13 @@ export async function applyInlineComponentTemplateMigrations(
9898
}
9999
if (!ts) {
100100
exec.logger.warn(
101-
'[config-migrator] Skipping inline template migration (TypeScript not available).\n' +
101+
'[config-migrator] Failed to import TypeScript. Skipping inline template migration.\n' +
102102
'Resolution attempts and errors:\n' +
103103
tsResolutionErrors.map(e => ' - ' + e).join('\n') + '\n' +
104-
'How to fix:\n' +
105-
' 1. Install "typescript" in your project root: `npm install typescript --save-dev`\n' +
106-
' 2. If using the CLI globally, run: `npm install -g typescript`\n' +
107-
' 3. If you use npx, add typescript to your workspace or global node_modules.\n' +
108-
' 4. See README for troubleshooting global CLI usage and npm linking issues.'
104+
'To resolve this issue, perform one of the following steps:\n' +
105+
' 1. Install the "typescript" package in your project root: `npm install typescript --save-dev`\n' +
106+
' 2. Install the "typescript" package globally on your machine: `npm install -g typescript`\n' +
107+
'Refer to the README for further troubleshooting information.'
109108
);
110109
return;
111110
}

0 commit comments

Comments
 (0)