@public-ui/kolibri-cli 3.0.7-rc.0 → 3.0.7-rc.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/info/index.js +2 -2
- package/dist/migrate/index.js +1 -1
- package/dist/migrate/runner/tasks/common/HandleDependencyTask.js +1 -1
- package/dist/migrate/runner/tasks/v1/button.js +1 -1
- package/dist/migrate/runner/tasks/v1/index.js +2 -2
- package/dist/migrate/runner/tasks/v1/input-email.js +1 -1
- package/dist/migrate/runner/tasks/v1/input-number.js +1 -1
- package/dist/migrate/runner/tasks/v1/input-password.js +1 -1
- package/dist/migrate/runner/tasks/v1/input-text.js +1 -1
- package/dist/migrate/runner/tasks/v1/link.js +1 -1
- package/dist/migrate/runner/tasks/v1/select.js +1 -1
- package/dist/migrate/runner/tasks/v3/all-input.js +1 -1
- package/dist/migrate/runner/tasks/v3/index.js +3 -3
- package/dist/migrate/runner/tasks/v3/toaster.js +1 -1
- package/dist/migrate/runner/tasks/v4/index.js +4 -0
- package/dist/migrate/runner/tasks/v4/toast.js +56 -0
- package/dist/migrate/runner/tasks/v4/toaster.js +68 -0
- package/package.json +13 -11
package/dist/info/index.js
CHANGED
|
@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.default = default_1;
|
|
7
|
-
const os_1 = __importDefault(require("os"));
|
|
8
7
|
const child_process_1 = require("child_process");
|
|
9
|
-
const path_1 = __importDefault(require("path"));
|
|
10
8
|
const fs_1 = __importDefault(require("fs"));
|
|
9
|
+
const os_1 = __importDefault(require("os"));
|
|
10
|
+
const path_1 = __importDefault(require("path"));
|
|
11
11
|
// Function to get the binary version
|
|
12
12
|
const getBinaryVersion = (command) => {
|
|
13
13
|
try {
|
package/dist/migrate/index.js
CHANGED
|
@@ -15,10 +15,10 @@ const task_runner_1 = require("./runner/task-runner");
|
|
|
15
15
|
const tasks_1 = require("./runner/tasks");
|
|
16
16
|
const test_1 = require("./runner/tasks/test");
|
|
17
17
|
const v1_1 = require("./runner/tasks/v1");
|
|
18
|
+
const assets_1 = require("./runner/tasks/v1/assets");
|
|
18
19
|
const v2_1 = require("./runner/tasks/v2");
|
|
19
20
|
const v3_1 = require("./runner/tasks/v3");
|
|
20
21
|
const v4_1 = require("./runner/tasks/v4");
|
|
21
|
-
const assets_1 = require("./runner/tasks/v1/assets");
|
|
22
22
|
const reuse_1 = require("./shares/reuse");
|
|
23
23
|
const types_1 = require("./types");
|
|
24
24
|
const currentVersionOfPublicUi = (0, reuse_1.getVersionOfPublicUiComponents)();
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.HandleDependencyTask = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
|
-
const abstract_task_1 = require("../../abstract-task");
|
|
6
5
|
const reuse_1 = require("../../../shares/reuse");
|
|
6
|
+
const abstract_task_1 = require("../../abstract-task");
|
|
7
7
|
class HandleDependencyTask extends abstract_task_1.AbstractTask {
|
|
8
8
|
command;
|
|
9
9
|
dependencies;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ButtonRenamePropertyIconToIcons = exports.ButtonRenamePropertyIconOnlyToHideLabel = exports.ButtonRefactorPropertyIconAlign = exports.ButtonRemovePropertyAriaLabel = exports.ButtonRemovePropertyAriaCurrent = void 0;
|
|
4
|
+
const RefactorPropertyIconAlign_1 = require("../common/RefactorPropertyIconAlign");
|
|
4
5
|
const RemovePropertyNameTask_1 = require("../common/RemovePropertyNameTask");
|
|
5
6
|
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
6
|
-
const RefactorPropertyIconAlign_1 = require("../common/RefactorPropertyIconAlign");
|
|
7
7
|
exports.ButtonRemovePropertyAriaCurrent = RemovePropertyNameTask_1.RemovePropertyNameTask.getInstance('kol-button', '_aria-current', '^1');
|
|
8
8
|
exports.ButtonRemovePropertyAriaLabel = RemovePropertyNameTask_1.RemovePropertyNameTask.getInstance('kol-button', '_aria-label', '^1');
|
|
9
9
|
exports.ButtonRefactorPropertyIconAlign = RefactorPropertyIconAlign_1.RefactorPropertyIconAlign.getInstance('kol-button');
|
|
@@ -7,6 +7,7 @@ const RefactorPropertyLabelReplaceFalse_1 = require("../common/RefactorPropertyL
|
|
|
7
7
|
const RenameSlotNameTask_1 = require("../common/RenameSlotNameTask");
|
|
8
8
|
const abbr_1 = require("./abbr");
|
|
9
9
|
const accordion_1 = require("./accordion");
|
|
10
|
+
const alert_1 = require("./alert");
|
|
10
11
|
const badge_1 = require("./badge");
|
|
11
12
|
const breadcrumb_1 = require("./breadcrumb");
|
|
12
13
|
const button_1 = require("./button");
|
|
@@ -38,12 +39,11 @@ const select_1 = require("./select");
|
|
|
38
39
|
const skip_nav_1 = require("./skip-nav");
|
|
39
40
|
const span_1 = require("./span");
|
|
40
41
|
const split_button_1 = require("./split-button");
|
|
42
|
+
const symbol_1 = require("./symbol");
|
|
41
43
|
const table_1 = require("./table");
|
|
42
44
|
const tabs_1 = require("./tabs");
|
|
43
45
|
const toast_1 = require("./toast");
|
|
44
46
|
const version_1 = require("./version");
|
|
45
|
-
const alert_1 = require("./alert");
|
|
46
|
-
const symbol_1 = require("./symbol");
|
|
47
47
|
exports.v1Tasks = [];
|
|
48
48
|
exports.v1Tasks.push(abbr_1.AbbrRenamePropertyAlignToTooltipAlign);
|
|
49
49
|
exports.v1Tasks.push(abbr_1.AbbrRenamePropertyTitleToLabel);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InputEmailRemovePropertySize = exports.InputEmailRenamePropertyIconToIcons = exports.InputEmailRenamePropertyListToSuggestions = void 0;
|
|
4
|
-
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
5
4
|
const RemovePropertyNameTask_1 = require("../common/RemovePropertyNameTask");
|
|
5
|
+
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
6
6
|
exports.InputEmailRenamePropertyListToSuggestions = RenamePropertyNameTask_1.RenamePropertyNameTask.getInstance('kol-input-email', '_list', '_suggestions', '^1');
|
|
7
7
|
exports.InputEmailRenamePropertyIconToIcons = RenamePropertyNameTask_1.RenamePropertyNameTask.getInstance('kol-input-email', '_icon', '_icons', '^1');
|
|
8
8
|
exports.InputEmailRemovePropertySize = RemovePropertyNameTask_1.RemovePropertyNameTask.getInstance('kol-input-email', '_size', '^1');
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InputNumberRemovePropertyType = exports.InputNumberRenamePropertyIconToIcons = exports.InputNumberRenamePropertyListToSuggestions = void 0;
|
|
4
|
-
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
5
4
|
const RemovePropertyNameTask_1 = require("../common/RemovePropertyNameTask");
|
|
5
|
+
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
6
6
|
exports.InputNumberRenamePropertyListToSuggestions = RenamePropertyNameTask_1.RenamePropertyNameTask.getInstance('kol-input-number', '_list', '_suggestions', '^1');
|
|
7
7
|
// @todo export const InputNumberRemovePropertyType = RemovePropertyNameTask.getInstance('kol-input-number', '_type', '^1');
|
|
8
8
|
exports.InputNumberRenamePropertyIconToIcons = RenamePropertyNameTask_1.RenamePropertyNameTask.getInstance('kol-input-number', '_icon', '_icons', '^1');
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InputPasswordRemovePropertySize = exports.InputPasswordRenamePropertyIconToIcons = void 0;
|
|
4
|
-
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
5
4
|
const RemovePropertyNameTask_1 = require("../common/RemovePropertyNameTask");
|
|
5
|
+
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
6
6
|
exports.InputPasswordRenamePropertyIconToIcons = RenamePropertyNameTask_1.RenamePropertyNameTask.getInstance('kol-input-password', '_icon', '_icons', '^1');
|
|
7
7
|
exports.InputPasswordRemovePropertySize = RemovePropertyNameTask_1.RemovePropertyNameTask.getInstance('kol-input-password', '_size', '^1');
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InputTextRemovePropertySize = exports.InputTextRenamePropertyIconToIcons = exports.InputTextRenamePropertyListToSuggestions = void 0;
|
|
4
|
-
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
5
4
|
const RemovePropertyNameTask_1 = require("../common/RemovePropertyNameTask");
|
|
5
|
+
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
6
6
|
exports.InputTextRenamePropertyListToSuggestions = RenamePropertyNameTask_1.RenamePropertyNameTask.getInstance('kol-input-text', '_list', '_suggestions', '^1');
|
|
7
7
|
exports.InputTextRenamePropertyIconToIcons = RenamePropertyNameTask_1.RenamePropertyNameTask.getInstance('kol-input-text', '_icon', '_icons', '^1');
|
|
8
8
|
exports.InputTextRemovePropertySize = RemovePropertyNameTask_1.RemovePropertyNameTask.getInstance('kol-input-text', '_size', '^1');
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.LinkRemovePropertyUseCase = exports.LinkRemovePropertyStealth = exports.LinkRemovePropertySelector = exports.LinkRenamePropertyIconOnlyToHideLabel = exports.LinkRefactorPropertyIconAlign = exports.LinkRenamePropertyIconToIcons = exports.LinkRemovePropertyDisabled = exports.LinkRemovePropertyAriaSelected = exports.LinkRemovePropertyAriaLabel = exports.LinkRemovePropertyAriaExpanded = exports.LinkRenamePropertyAriaCurrentToListenAriaCurrent = exports.LinkRemovePropertyAriaControls = void 0;
|
|
4
|
+
const RefactorPropertyIconAlign_1 = require("../common/RefactorPropertyIconAlign");
|
|
4
5
|
const RemovePropertyNameTask_1 = require("../common/RemovePropertyNameTask");
|
|
5
6
|
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
6
|
-
const RefactorPropertyIconAlign_1 = require("../common/RefactorPropertyIconAlign");
|
|
7
7
|
exports.LinkRemovePropertyAriaControls = RemovePropertyNameTask_1.RemovePropertyNameTask.getInstance('kol-link', '_aria-controls', '^1');
|
|
8
8
|
exports.LinkRenamePropertyAriaCurrentToListenAriaCurrent = RenamePropertyNameTask_1.RenamePropertyNameTask.getInstance('kol-link', '_aria-current', '_listen-aria-current', '^1');
|
|
9
9
|
exports.LinkRemovePropertyAriaExpanded = RemovePropertyNameTask_1.RemovePropertyNameTask.getInstance('kol-link', '_aria-expanded', '^1');
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SelectRemovePropertySize = exports.SelectRenamePropertyIconToIcons = exports.SelectRenamePropertyListToOptions = exports.SelectRenamePropertyHeightToRows = void 0;
|
|
4
|
-
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
5
4
|
const RemovePropertyNameTask_1 = require("../common/RemovePropertyNameTask");
|
|
5
|
+
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
6
6
|
exports.SelectRenamePropertyHeightToRows = RenamePropertyNameTask_1.RenamePropertyNameTask.getInstance('kol-select', '_height', '_rows', '^1');
|
|
7
7
|
exports.SelectRenamePropertyListToOptions = RenamePropertyNameTask_1.RenamePropertyNameTask.getInstance('kol-select', '_list', '_options', '^1');
|
|
8
8
|
exports.SelectRenamePropertyIconToIcons = RenamePropertyNameTask_1.RenamePropertyNameTask.getInstance('kol-select', '_icon', '_icons', '^1');
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AllInputTasks = void 0;
|
|
4
|
-
const RemovePropertyNameTask_1 = require("../common/RemovePropertyNameTask");
|
|
5
4
|
const RefactorPropertyErrorToMsg_1 = require("../common/RefactorPropertyErrorToMsg");
|
|
5
|
+
const RemovePropertyNameTask_1 = require("../common/RemovePropertyNameTask");
|
|
6
6
|
const RenamePropertyNameTask_1 = require("../common/RenamePropertyNameTask");
|
|
7
7
|
const INPUT_COMPONENTS = [
|
|
8
8
|
'kol-combobox',
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.v3Tasks = void 0;
|
|
4
|
-
const textarea_1 = require("./textarea");
|
|
5
4
|
const abbr_1 = require("./abbr");
|
|
6
|
-
const modal_1 = require("./modal");
|
|
7
|
-
const input_file_1 = require("./input-file");
|
|
8
5
|
const all_input_1 = require("./all-input");
|
|
6
|
+
const input_file_1 = require("./input-file");
|
|
7
|
+
const modal_1 = require("./modal");
|
|
8
|
+
const textarea_1 = require("./textarea");
|
|
9
9
|
const toaster_1 = require("./toaster");
|
|
10
10
|
exports.v3Tasks = [];
|
|
11
11
|
exports.v3Tasks.push(textarea_1.TextareaUpdatePropertyValue_Resize_Both);
|
|
@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.ToasterRenameProperties = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const types_1 = require("../../../../types");
|
|
9
|
-
const fileExtensions = [...types_1.FILE_EXTENSIONS];
|
|
10
9
|
const reuse_1 = require("../../../shares/reuse");
|
|
11
10
|
const abstract_task_1 = require("../../abstract-task");
|
|
11
|
+
const fileExtensions = [...types_1.FILE_EXTENSIONS];
|
|
12
12
|
class ToasterRenamePropertiesTask extends abstract_task_1.AbstractTask {
|
|
13
13
|
constructor() {
|
|
14
14
|
super('toaster-rename-properties', 'Rename Toaster properties `alertVariant` to `variant` and `defaultAlertType` to `defaultVariant`', fileExtensions, '>=2 <4');
|
|
@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.v4Tasks = void 0;
|
|
4
4
|
const id_1 = require("./id");
|
|
5
5
|
const msg_1 = require("./msg");
|
|
6
|
+
const toast_1 = require("./toast");
|
|
7
|
+
const toaster_1 = require("./toaster");
|
|
6
8
|
exports.v4Tasks = [];
|
|
7
9
|
exports.v4Tasks.push(...id_1.RemoveIdPropTasks);
|
|
8
10
|
exports.v4Tasks.push(...msg_1.RemoveMsgPropsTasks);
|
|
11
|
+
exports.v4Tasks.push(toast_1.RemoveToastVariantTask.getInstance('^4'));
|
|
12
|
+
exports.v4Tasks.push(toaster_1.RemoveToasterGetInstanceOptionsTask.getInstance('^4'));
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.RemoveToastVariantTask = void 0;
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const reuse_1 = require("../../../shares/reuse");
|
|
9
|
+
const abstract_task_1 = require("../../abstract-task");
|
|
10
|
+
// Toast migration should cover JavaScript/TypeScript files where toast services are used
|
|
11
|
+
const TOAST_FILE_EXTENSIONS = ['js', 'jsx', 'ts', 'tsx', 'vue'];
|
|
12
|
+
class RemoveToastVariantTask extends abstract_task_1.AbstractTask {
|
|
13
|
+
toastEnqueueVariantRegExp;
|
|
14
|
+
toastObjectVariantRegExp;
|
|
15
|
+
constructor(identifier, versionRange, dependentTasks, options) {
|
|
16
|
+
super(identifier, 'Remove "variant" property from Toast objects in enqueue() calls', TOAST_FILE_EXTENSIONS, versionRange, dependentTasks, options);
|
|
17
|
+
// Match variant property in enqueue() calls - multiline support
|
|
18
|
+
this.toastEnqueueVariantRegExp = /(\benqueue\s*\(\s*\{[\s\S]*?)(\s*,?\s*variant\s*:\s*['"]\w+['"][\s\S]*?(?=\s*[,}]))([,\s]*[\s\S]*?\})/g;
|
|
19
|
+
// Match variant property in toast objects - multiline support
|
|
20
|
+
this.toastObjectVariantRegExp = /(\{\s*[\s\S]*?)(\s*,?\s*variant\s*:\s*['"]\w+['"][\s\S]*?(?=\s*[,}]))([,\s]*[\s\S]*?\})/g;
|
|
21
|
+
}
|
|
22
|
+
static getInstance(versionRange, dependentTasks, options) {
|
|
23
|
+
const identifier = `remove-toast-variant-${versionRange}`;
|
|
24
|
+
return new RemoveToastVariantTask(identifier, versionRange, dependentTasks, options);
|
|
25
|
+
}
|
|
26
|
+
run(baseDir) {
|
|
27
|
+
this.transpileFiles(baseDir);
|
|
28
|
+
}
|
|
29
|
+
transpileFiles(baseDir) {
|
|
30
|
+
(0, reuse_1.filterFilesByExt)(baseDir, TOAST_FILE_EXTENSIONS).forEach((file) => {
|
|
31
|
+
const content = fs_1.default.readFileSync(file, 'utf8');
|
|
32
|
+
let newContent = content;
|
|
33
|
+
let modified = false;
|
|
34
|
+
// Simple RegEx to match variant lines
|
|
35
|
+
const variantLineRegExp = /^(\s*)variant\s*:\s*['"]\w+['"],?\s*$/gm;
|
|
36
|
+
// Check if the file likely contains toast-related code
|
|
37
|
+
if (content.includes('enqueue') || (content.includes('type:') && content.includes('variant:'))) {
|
|
38
|
+
newContent = newContent.replace(variantLineRegExp, () => {
|
|
39
|
+
modified = true;
|
|
40
|
+
return ''; // Remove the entire line
|
|
41
|
+
});
|
|
42
|
+
// Clean up potential comma issues after removing lines
|
|
43
|
+
newContent = newContent.replace(/,(\s*\n\s*\})/g, '$1'); // Comma before closing brace
|
|
44
|
+
newContent = newContent.replace(/\{(\s*\n\s*,)/g, '{$1'.replace(',', '')); // Comma after opening brace
|
|
45
|
+
newContent = newContent.replace(/,(\s*\n\s*,)/g, '$1'); // Double commas
|
|
46
|
+
// Remove excessive empty lines
|
|
47
|
+
newContent = newContent.replace(/\n\s*\n\s*\n/g, '\n\n');
|
|
48
|
+
}
|
|
49
|
+
if (modified && (0, reuse_1.getRemoveMode)()) {
|
|
50
|
+
reuse_1.MODIFIED_FILES.add(file);
|
|
51
|
+
fs_1.default.writeFileSync(file, newContent);
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
exports.RemoveToastVariantTask = RemoveToastVariantTask;
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.RemoveToasterGetInstanceOptionsTask = void 0;
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const reuse_1 = require("../../../shares/reuse");
|
|
9
|
+
const abstract_task_1 = require("../../abstract-task");
|
|
10
|
+
// ToasterService migration should cover JavaScript/TypeScript files where the service is used
|
|
11
|
+
const TOASTER_FILE_EXTENSIONS = ['js', 'jsx', 'ts', 'tsx', 'vue'];
|
|
12
|
+
class RemoveToasterGetInstanceOptionsTask extends abstract_task_1.AbstractTask {
|
|
13
|
+
getInstanceOptionsRegExp;
|
|
14
|
+
constructor(identifier, versionRange, dependentTasks, options) {
|
|
15
|
+
super(identifier, 'Remove "defaultVariant" option from ToasterService.getInstance() calls', TOASTER_FILE_EXTENSIONS, versionRange, dependentTasks, options);
|
|
16
|
+
// Match ToasterService.getInstance(document, { defaultVariant: '...' })
|
|
17
|
+
// This regex captures the service call and removes the options parameter if it only contains defaultVariant
|
|
18
|
+
this.getInstanceOptionsRegExp = /(\bToasterService\.getInstance\s*\(\s*[^,)]+)(\s*,\s*\{\s*defaultVariant\s*:\s*['"]\w+['"]\s*\})(\s*\))/g;
|
|
19
|
+
}
|
|
20
|
+
static getInstance(versionRange, dependentTasks, options) {
|
|
21
|
+
const identifier = `remove-toaster-get-instance-options-${versionRange}`;
|
|
22
|
+
return new RemoveToasterGetInstanceOptionsTask(identifier, versionRange, dependentTasks, options);
|
|
23
|
+
}
|
|
24
|
+
run(baseDir) {
|
|
25
|
+
this.transpileFiles(baseDir);
|
|
26
|
+
}
|
|
27
|
+
transpileFiles(baseDir) {
|
|
28
|
+
(0, reuse_1.filterFilesByExt)(baseDir, TOASTER_FILE_EXTENSIONS).forEach((file) => {
|
|
29
|
+
const content = fs_1.default.readFileSync(file, 'utf8');
|
|
30
|
+
let newContent = content;
|
|
31
|
+
let modified = false;
|
|
32
|
+
// Remove defaultVariant options from ToasterService.getInstance() calls
|
|
33
|
+
newContent = newContent.replace(this.getInstanceOptionsRegExp, (match, before, optionsParam, after) => {
|
|
34
|
+
modified = true;
|
|
35
|
+
// Simply remove the options parameter entirely
|
|
36
|
+
return before + after;
|
|
37
|
+
});
|
|
38
|
+
// Also handle more complex cases where there might be other options mixed in
|
|
39
|
+
// Match any options object that contains defaultVariant and remove just that property
|
|
40
|
+
const complexOptionsRegExp = /(\bToasterService\.getInstance\s*\(\s*[^,)]+\s*,\s*\{[^}]*?)(?:,\s*)?defaultVariant\s*:\s*['"]\w+['"](?:,\s*)?([^}]*\})/g;
|
|
41
|
+
newContent = newContent.replace(complexOptionsRegExp, (match, before, after) => {
|
|
42
|
+
// Only modify if we haven't already handled this with the simpler regex
|
|
43
|
+
if (!this.getInstanceOptionsRegExp.test(match)) {
|
|
44
|
+
modified = true;
|
|
45
|
+
// Clean up potential double commas
|
|
46
|
+
const cleanBefore = before.replace(/,\s*$/, '');
|
|
47
|
+
const cleanAfter = after.replace(/^\s*,/, '');
|
|
48
|
+
// Check if the options object would be empty after removing defaultVariant
|
|
49
|
+
if (cleanAfter.trim() === '}' && cleanBefore.trim().endsWith('{')) {
|
|
50
|
+
// Remove the entire options parameter
|
|
51
|
+
return cleanBefore.replace(/\s*,\s*\{\s*$/, '');
|
|
52
|
+
}
|
|
53
|
+
// Add comma if needed between remaining properties
|
|
54
|
+
if (cleanBefore.trim() !== '{' && cleanAfter.trim() !== '}' && !cleanBefore.endsWith(',') && !cleanAfter.startsWith(',')) {
|
|
55
|
+
return cleanBefore + ',' + cleanAfter;
|
|
56
|
+
}
|
|
57
|
+
return cleanBefore + cleanAfter;
|
|
58
|
+
}
|
|
59
|
+
return match;
|
|
60
|
+
});
|
|
61
|
+
if (modified && (0, reuse_1.getRemoveMode)()) {
|
|
62
|
+
reuse_1.MODIFIED_FILES.add(file);
|
|
63
|
+
fs_1.default.writeFileSync(file, newContent);
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
exports.RemoveToasterGetInstanceOptionsTask = RemoveToasterGetInstanceOptionsTask;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@public-ui/kolibri-cli",
|
|
3
|
-
"version": "3.0.7-rc.
|
|
3
|
+
"version": "3.0.7-rc.6",
|
|
4
4
|
"license": "EUPL-1.2",
|
|
5
5
|
"homepage": "https://public-ui.github.io",
|
|
6
6
|
"repository": {
|
|
@@ -27,7 +27,8 @@
|
|
|
27
27
|
"gradient-string": "3.0.0",
|
|
28
28
|
"loglevel": "1.9.2",
|
|
29
29
|
"prettier": "3.6.2",
|
|
30
|
-
"
|
|
30
|
+
"prettier-plugin-organize-imports": "4.3.0",
|
|
31
|
+
"semver": "7.7.3",
|
|
31
32
|
"typed-bem": "1.0.2"
|
|
32
33
|
},
|
|
33
34
|
"devDependencies": {
|
|
@@ -35,7 +36,7 @@
|
|
|
35
36
|
"@typescript-eslint/eslint-plugin": "7.18.0",
|
|
36
37
|
"@typescript-eslint/parser": "7.18.0",
|
|
37
38
|
"cpy-cli": "6.0.0",
|
|
38
|
-
"cross-env": "10.
|
|
39
|
+
"cross-env": "10.1.0",
|
|
39
40
|
"eslint": "8.57.1",
|
|
40
41
|
"eslint-config-prettier": "9.1.2",
|
|
41
42
|
"eslint-plugin-html": "8.1.3",
|
|
@@ -43,13 +44,13 @@
|
|
|
43
44
|
"eslint-plugin-json": "3.1.0",
|
|
44
45
|
"eslint-plugin-jsx-a11y": "6.10.2",
|
|
45
46
|
"eslint-plugin-react": "7.37.5",
|
|
46
|
-
"knip": "5.
|
|
47
|
-
"mocha": "11.7.
|
|
47
|
+
"knip": "5.65.0",
|
|
48
|
+
"mocha": "11.7.4",
|
|
48
49
|
"nodemon": "3.1.10",
|
|
49
50
|
"rimraf": "6.0.1",
|
|
50
51
|
"ts-node": "10.9.2",
|
|
51
|
-
"typescript": "5.9.
|
|
52
|
-
"@public-ui/components": "3.0.7-rc.
|
|
52
|
+
"typescript": "5.9.3",
|
|
53
|
+
"@public-ui/components": "3.0.7-rc.6"
|
|
53
54
|
},
|
|
54
55
|
"files": [
|
|
55
56
|
"dist"
|
|
@@ -61,11 +62,12 @@
|
|
|
61
62
|
"lint": "pnpm lint:eslint && pnpm lint:tsc",
|
|
62
63
|
"lint:eslint": "eslint src",
|
|
63
64
|
"lint:tsc": "tsc --noemit",
|
|
64
|
-
"
|
|
65
|
+
"pretest": "pnpm build",
|
|
65
66
|
"restart": "pnpm reset && pnpm start",
|
|
66
|
-
"
|
|
67
|
-
"watch": "nodemon --ignore package.json src/index.ts migrate --ignore-uncommitted-changes --test-tasks test",
|
|
67
|
+
"start": "rimraf test && cpy \"../../samples/react/src/components\" test/src && cpy \"../../samples/react/public/*.html\" test/ && ts-node src/index.ts migrate --ignore-uncommitted-changes --test-tasks test",
|
|
68
68
|
"test": "pnpm test:unit",
|
|
69
|
-
"test:unit": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha --require ts-node/register test/**/*.ts --no-experimental-strip-types"
|
|
69
|
+
"test:unit": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha --require ts-node/register test/**/*.ts --no-experimental-strip-types",
|
|
70
|
+
"unused": "knip",
|
|
71
|
+
"watch": "nodemon --ignore package.json src/index.ts migrate --ignore-uncommitted-changes --test-tasks test"
|
|
70
72
|
}
|
|
71
73
|
}
|