@grafana/create-plugin 2.0.2 → 2.0.3-canary.455.39386f5.0
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/bin/run.js +3 -3
- package/dist/commands/generate-actions/print-success-message.js +1 -1
- package/dist/commands/generate-actions/update-go-sdk-and-packages.js +3 -3
- package/dist/commands/generate.command.js +3 -3
- package/dist/commands/generate.plopfile.js +29 -29
- package/dist/commands/index.js +1 -1
- package/dist/commands/migrate.command.js +1 -1
- package/dist/commands/types.js +1 -1
- package/dist/commands/update.command.js +3 -3
- package/dist/commands/version.command.js +1 -1
- package/dist/constants.js +20 -20
- package/dist/utils/tests/utils.files.test.js +1 -1
- package/dist/utils/tests/utils.handlebars.test.js +1 -1
- package/dist/utils/tests/utils.npm.test.js +22 -22
- package/dist/utils/tests/utils.plugin.test.js +1 -1
- package/dist/utils/tests/utils.templates.test.js +1 -1
- package/dist/utils/utils.console.js +4 -4
- package/dist/utils/utils.files.js +8 -8
- package/dist/utils/utils.handlebars.js +7 -7
- package/dist/utils/utils.npm.js +13 -13
- package/dist/utils/utils.os.js +1 -1
- package/dist/utils/utils.packageManager.js +4 -4
- package/dist/utils/utils.path.js +2 -2
- package/dist/utils/utils.plugin.js +3 -3
- package/dist/utils/utils.templates.js +7 -7
- package/package.json +2 -2
- package/templates/common/package.json +5 -5
package/dist/bin/run.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
4
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
5
|
};
|
|
6
|
-
exports
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
var minimist_1 = __importDefault(require("minimist"));
|
|
8
8
|
var commands_1 = require("../commands");
|
|
9
9
|
var utils_os_1 = require("../utils/utils.os");
|
|
@@ -12,12 +12,12 @@ if ((0, utils_os_1.isUnsupportedPlatform)()) {
|
|
|
12
12
|
process.exit(1);
|
|
13
13
|
}
|
|
14
14
|
var args = process.argv.slice(2);
|
|
15
|
-
var argv = (0, minimist_1
|
|
15
|
+
var argv = (0, minimist_1.default)(args);
|
|
16
16
|
var commands = {
|
|
17
17
|
migrate: commands_1.migrate,
|
|
18
18
|
generate: commands_1.generate,
|
|
19
19
|
update: commands_1.update,
|
|
20
|
-
version: commands_1.version
|
|
20
|
+
version: commands_1.version,
|
|
21
21
|
};
|
|
22
22
|
var command = commands[argv._[0]] || commands.generate;
|
|
23
23
|
command(argv);
|
|
@@ -8,7 +8,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
8
8
|
}
|
|
9
9
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
10
10
|
};
|
|
11
|
-
exports
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.printGenerateSuccessMessage = void 0;
|
|
13
13
|
var utils_console_1 = require("../../utils/utils.console");
|
|
14
14
|
var utils_handlebars_1 = require("../../utils/utils.handlebars");
|
|
@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
38
38
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
39
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
40
|
};
|
|
41
|
-
exports
|
|
41
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
42
|
exports.updateGoSdkAndModules = void 0;
|
|
43
43
|
var utils_path_1 = require("../../utils/utils.path");
|
|
44
44
|
var which_1 = __importDefault(require("which"));
|
|
@@ -54,10 +54,10 @@ function updateGoSdkAndModules(_a) {
|
|
|
54
54
|
case 0:
|
|
55
55
|
exportPath = (0, utils_path_1.getExportPath)(pluginName, orgName, pluginType);
|
|
56
56
|
goModPath = "".concat(exportPath, "/go.mod");
|
|
57
|
-
if (!fs_1
|
|
57
|
+
if (!fs_1.default.existsSync(goModPath)) {
|
|
58
58
|
return [2, ''];
|
|
59
59
|
}
|
|
60
|
-
return [4, (0, which_1
|
|
60
|
+
return [4, (0, which_1.default)('go', { nothrow: true })];
|
|
61
61
|
case 1:
|
|
62
62
|
goBinaryPath = _c.sent();
|
|
63
63
|
if (!goBinaryPath) {
|
|
@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
38
38
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
39
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
40
|
};
|
|
41
|
-
exports
|
|
41
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
42
|
exports.generate = void 0;
|
|
43
43
|
var path_1 = __importDefault(require("path"));
|
|
44
44
|
var plop_1 = require("plop");
|
|
@@ -46,9 +46,9 @@ var generate = function (argv) { return __awaiter(void 0, void 0, void 0, functi
|
|
|
46
46
|
return __generator(this, function (_a) {
|
|
47
47
|
plop_1.Plop.launch({
|
|
48
48
|
cwd: argv.cwd,
|
|
49
|
-
configPath: path_1
|
|
49
|
+
configPath: path_1.default.join(__dirname, 'generate.plopfile.js'),
|
|
50
50
|
require: argv.require,
|
|
51
|
-
completion: argv.completion
|
|
51
|
+
completion: argv.completion,
|
|
52
52
|
}, function (env) { return (0, plop_1.run)(env, undefined, true); });
|
|
53
53
|
return [2];
|
|
54
54
|
});
|
|
@@ -22,7 +22,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
22
22
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
23
23
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
24
|
};
|
|
25
|
-
exports
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
var fs_1 = __importDefault(require("fs"));
|
|
27
27
|
var glob_1 = __importDefault(require("glob"));
|
|
28
28
|
var path_1 = __importDefault(require("path"));
|
|
@@ -49,7 +49,7 @@ function default_1(plop) {
|
|
|
49
49
|
return true;
|
|
50
50
|
}
|
|
51
51
|
return 'Plugin name is required';
|
|
52
|
-
}
|
|
52
|
+
},
|
|
53
53
|
},
|
|
54
54
|
{
|
|
55
55
|
name: 'orgName',
|
|
@@ -60,38 +60,38 @@ function default_1(plop) {
|
|
|
60
60
|
return true;
|
|
61
61
|
}
|
|
62
62
|
return 'Organization name is required';
|
|
63
|
-
}
|
|
63
|
+
},
|
|
64
64
|
},
|
|
65
65
|
{
|
|
66
66
|
name: 'pluginDescription',
|
|
67
67
|
type: 'input',
|
|
68
68
|
message: 'How would you describe your plugin?',
|
|
69
|
-
|
|
69
|
+
default: '',
|
|
70
70
|
},
|
|
71
71
|
{
|
|
72
72
|
name: 'pluginType',
|
|
73
73
|
type: 'list',
|
|
74
74
|
choices: [constants_1.PLUGIN_TYPES.app, constants_1.PLUGIN_TYPES.datasource, constants_1.PLUGIN_TYPES.panel, constants_1.PLUGIN_TYPES.scenes],
|
|
75
|
-
message: 'What type of plugin would you like?'
|
|
75
|
+
message: 'What type of plugin would you like?',
|
|
76
76
|
},
|
|
77
77
|
{
|
|
78
78
|
name: 'hasBackend',
|
|
79
79
|
type: 'confirm',
|
|
80
80
|
message: 'Do you want a backend part of your plugin?',
|
|
81
|
-
|
|
82
|
-
when: function (answers) { return answers.pluginType !== constants_1.PLUGIN_TYPES.panel; }
|
|
81
|
+
default: false,
|
|
82
|
+
when: function (answers) { return answers.pluginType !== constants_1.PLUGIN_TYPES.panel; },
|
|
83
83
|
},
|
|
84
84
|
{
|
|
85
85
|
name: 'hasGithubWorkflows',
|
|
86
86
|
type: 'confirm',
|
|
87
87
|
message: 'Do you want to add Github CI and Release workflows?',
|
|
88
|
-
|
|
88
|
+
default: false,
|
|
89
89
|
},
|
|
90
90
|
{
|
|
91
91
|
name: 'hasGithubLevitateWorkflow',
|
|
92
92
|
type: 'confirm',
|
|
93
93
|
message: 'Do you want to add a Github workflow for automatically checking "Grafana API compatibility" on PRs?',
|
|
94
|
-
|
|
94
|
+
default: false,
|
|
95
95
|
},
|
|
96
96
|
],
|
|
97
97
|
actions: function (_a) {
|
|
@@ -112,12 +112,12 @@ function default_1(plop) {
|
|
|
112
112
|
var commonActions = getActionsForTemplateFolder({
|
|
113
113
|
folderPath: constants_1.TEMPLATE_PATHS.common,
|
|
114
114
|
exportPath: exportPath,
|
|
115
|
-
templateData: templateData
|
|
115
|
+
templateData: templateData,
|
|
116
116
|
});
|
|
117
117
|
var pluginTypeSpecificActions = getActionsForTemplateFolder({
|
|
118
118
|
folderPath: constants_1.TEMPLATE_PATHS[pluginType],
|
|
119
119
|
exportPath: exportPath,
|
|
120
|
-
templateData: templateData
|
|
120
|
+
templateData: templateData,
|
|
121
121
|
});
|
|
122
122
|
var backendFolderPath = isAppType ? constants_1.TEMPLATE_PATHS.backendApp : constants_1.TEMPLATE_PATHS.backend;
|
|
123
123
|
var backendActions = hasBackend
|
|
@@ -135,29 +135,29 @@ function default_1(plop) {
|
|
|
135
135
|
? getActionsForTemplateFolder({
|
|
136
136
|
folderPath: constants_1.TEMPLATE_PATHS.ciWorkflows,
|
|
137
137
|
exportPath: exportPath,
|
|
138
|
-
templateData: templateData
|
|
138
|
+
templateData: templateData,
|
|
139
139
|
})
|
|
140
140
|
: [];
|
|
141
141
|
var isCompatibleWorkflowActions = hasGithubLevitateWorkflow
|
|
142
142
|
? getActionsForTemplateFolder({
|
|
143
143
|
folderPath: constants_1.TEMPLATE_PATHS.isCompatibleWorkflow,
|
|
144
144
|
exportPath: exportPath,
|
|
145
|
-
templateData: templateData
|
|
145
|
+
templateData: templateData,
|
|
146
146
|
})
|
|
147
147
|
: [];
|
|
148
148
|
var readmeActions = getActionsForReadme({ exportPath: exportPath, templateData: templateData });
|
|
149
149
|
return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], pluginActions, true), ciWorkflowActions, true), readmeActions, true), isCompatibleWorkflowActions, true), [
|
|
150
150
|
{
|
|
151
|
-
type: 'updateGoSdkAndModules'
|
|
151
|
+
type: 'updateGoSdkAndModules',
|
|
152
152
|
},
|
|
153
153
|
{
|
|
154
|
-
type: 'printSuccessMessage'
|
|
154
|
+
type: 'printSuccessMessage',
|
|
155
155
|
},
|
|
156
156
|
], false);
|
|
157
|
-
}
|
|
157
|
+
},
|
|
158
158
|
});
|
|
159
159
|
}
|
|
160
|
-
exports
|
|
160
|
+
exports.default = default_1;
|
|
161
161
|
function getActionsForReadme(_a) {
|
|
162
162
|
var exportPath = _a.exportPath, templateData = _a.templateData;
|
|
163
163
|
return [
|
|
@@ -169,43 +169,43 @@ function getActionsForReadme(_a) {
|
|
|
169
169
|
function replacePatternWithTemplateInReadme(pattern, partialsFile, exportPath, templateData) {
|
|
170
170
|
return {
|
|
171
171
|
type: 'modify',
|
|
172
|
-
path: path_1
|
|
172
|
+
path: path_1.default.join(exportPath, 'README.md'),
|
|
173
173
|
pattern: pattern,
|
|
174
174
|
template: undefined,
|
|
175
|
-
templateFile: path_1
|
|
176
|
-
data: __assign(__assign({}, constants_1.EXTRA_TEMPLATE_VARIABLES), templateData)
|
|
175
|
+
templateFile: path_1.default.join(constants_1.PARTIALS_DIR, partialsFile),
|
|
176
|
+
data: __assign(__assign({}, constants_1.EXTRA_TEMPLATE_VARIABLES), templateData),
|
|
177
177
|
};
|
|
178
178
|
}
|
|
179
179
|
function getActionsForTemplateFolder(_a) {
|
|
180
180
|
var folderPath = _a.folderPath, exportPath = _a.exportPath, templateData = _a.templateData;
|
|
181
|
-
var files = glob_1
|
|
181
|
+
var files = glob_1.default.sync("".concat(folderPath, "/**"), { dot: true });
|
|
182
182
|
if (templateData.packageManagerName !== 'pnpm') {
|
|
183
|
-
files = files.filter(function (file) { return path_1
|
|
183
|
+
files = files.filter(function (file) { return path_1.default.basename(file) !== 'npmrc'; });
|
|
184
184
|
}
|
|
185
185
|
function getExportFileName(f) {
|
|
186
|
-
if (path_1
|
|
186
|
+
if (path_1.default.basename(f) === 'gitignore') {
|
|
187
187
|
return '.gitignore';
|
|
188
188
|
}
|
|
189
|
-
if (path_1
|
|
189
|
+
if (path_1.default.basename(f) === 'npmrc') {
|
|
190
190
|
return '.npmrc';
|
|
191
191
|
}
|
|
192
|
-
return path_1
|
|
192
|
+
return path_1.default.extname(f) === '.hbs' ? path_1.default.basename(f, '.hbs') : path_1.default.basename(f);
|
|
193
193
|
}
|
|
194
194
|
function getExportPath(f) {
|
|
195
|
-
return path_1
|
|
195
|
+
return path_1.default.relative(folderPath, path_1.default.dirname(f));
|
|
196
196
|
}
|
|
197
197
|
return files.filter(isFile).map(function (f) { return ({
|
|
198
198
|
type: 'add',
|
|
199
199
|
templateFile: f,
|
|
200
|
-
path: path_1
|
|
200
|
+
path: path_1.default.join(exportPath, getExportPath(f), getExportFileName(f)),
|
|
201
201
|
force: constants_1.IS_DEV,
|
|
202
202
|
abortOnFail: false,
|
|
203
|
-
data: __assign(__assign({}, constants_1.EXTRA_TEMPLATE_VARIABLES), templateData)
|
|
203
|
+
data: __assign(__assign({}, constants_1.EXTRA_TEMPLATE_VARIABLES), templateData),
|
|
204
204
|
}); });
|
|
205
205
|
}
|
|
206
206
|
function isFile(path) {
|
|
207
207
|
try {
|
|
208
|
-
return fs_1
|
|
208
|
+
return fs_1.default.lstatSync(path).isFile();
|
|
209
209
|
}
|
|
210
210
|
catch (e) {
|
|
211
211
|
return false;
|
package/dist/commands/index.js
CHANGED
|
@@ -13,7 +13,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
13
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
|
-
exports
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./generate.command"), exports);
|
|
18
18
|
__exportStar(require("./update.command"), exports);
|
|
19
19
|
__exportStar(require("./migrate.command"), exports);
|
|
@@ -35,7 +35,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
-
exports
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.migrate = void 0;
|
|
40
40
|
var constants_1 = require("../constants");
|
|
41
41
|
var utils_console_1 = require("../utils/utils.console");
|
package/dist/commands/types.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
exports
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
@@ -35,7 +35,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
-
exports
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.update = void 0;
|
|
40
40
|
var constants_1 = require("../constants");
|
|
41
41
|
var utils_templates_1 = require("../utils/utils.templates");
|
|
@@ -65,7 +65,7 @@ var update = function () { return __awaiter(void 0, void 0, void 0, function ()
|
|
|
65
65
|
PROMPT_CHOICES = {
|
|
66
66
|
ALL: 'Yes, all of them',
|
|
67
67
|
ONLY_OUTDATED: 'Yes, but only the outdated ones',
|
|
68
|
-
NONE: 'No'
|
|
68
|
+
NONE: 'No',
|
|
69
69
|
};
|
|
70
70
|
return [4, (0, utils_console_1.selectPrompt)(constants_1.TEXT.updateNpmDependenciesPrompt + updatableText, [
|
|
71
71
|
PROMPT_CHOICES.ALL,
|
|
@@ -77,7 +77,7 @@ var update = function () { return __awaiter(void 0, void 0, void 0, function ()
|
|
|
77
77
|
if (shouldUpdateDeps && shouldUpdateDeps !== PROMPT_CHOICES.NONE) {
|
|
78
78
|
(0, utils_npm_1.updatePackageJson)({
|
|
79
79
|
onlyOutdated: shouldUpdateDeps === PROMPT_CHOICES.ONLY_OUTDATED,
|
|
80
|
-
ignoreGrafanaDependencies: true
|
|
80
|
+
ignoreGrafanaDependencies: true,
|
|
81
81
|
});
|
|
82
82
|
(0, utils_console_1.printSuccessMessage)(constants_1.TEXT.updateNpmDependenciesSuccess);
|
|
83
83
|
}
|
|
@@ -35,7 +35,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
-
exports
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.version = void 0;
|
|
40
40
|
var path_1 = require("path");
|
|
41
41
|
var fs_1 = require("fs");
|
package/dist/constants.js
CHANGED
|
@@ -2,26 +2,26 @@
|
|
|
2
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
|
-
exports
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.TEXT = exports.UDPATE_CONFIG = exports.MIGRATION_CONFIG = exports.GRAFANA_FE_PACKAGES = exports.EXTRA_TEMPLATE_VARIABLES = exports.PLUGIN_TYPES = exports.TEMPLATE_PATHS = exports.FIXTURES_PATH = exports.PARTIALS_DIR = exports.TEMPLATES_DIR = exports.DIST_DIR = exports.EXPORT_PATH_PREFIX = exports.DEV_EXPORT_DIR = exports.IS_DEV = void 0;
|
|
7
7
|
var path_1 = __importDefault(require("path"));
|
|
8
8
|
exports.IS_DEV = process.env.CREATE_PLUGIN_DEV !== undefined;
|
|
9
|
-
exports.DEV_EXPORT_DIR = path_1
|
|
9
|
+
exports.DEV_EXPORT_DIR = path_1.default.join(__dirname, '..', 'generated');
|
|
10
10
|
exports.EXPORT_PATH_PREFIX = exports.IS_DEV ? exports.DEV_EXPORT_DIR : process.cwd();
|
|
11
|
-
exports.DIST_DIR = path_1
|
|
12
|
-
exports.TEMPLATES_DIR = path_1
|
|
13
|
-
exports.PARTIALS_DIR = path_1
|
|
14
|
-
exports.FIXTURES_PATH = path_1
|
|
11
|
+
exports.DIST_DIR = path_1.default.join(__dirname, 'dist');
|
|
12
|
+
exports.TEMPLATES_DIR = path_1.default.join(__dirname, '..', 'templates');
|
|
13
|
+
exports.PARTIALS_DIR = path_1.default.join(exports.TEMPLATES_DIR, '_partials');
|
|
14
|
+
exports.FIXTURES_PATH = path_1.default.join(__dirname, '..', 'fixtures');
|
|
15
15
|
exports.TEMPLATE_PATHS = {
|
|
16
|
-
app: path_1
|
|
17
|
-
scenesapp: path_1
|
|
18
|
-
backend: path_1
|
|
19
|
-
backendApp: path_1
|
|
20
|
-
common: path_1
|
|
21
|
-
datasource: path_1
|
|
22
|
-
panel: path_1
|
|
23
|
-
ciWorkflows: path_1
|
|
24
|
-
isCompatibleWorkflow: path_1
|
|
16
|
+
app: path_1.default.join(exports.TEMPLATES_DIR, 'app'),
|
|
17
|
+
scenesapp: path_1.default.join(exports.TEMPLATES_DIR, 'scenes-app'),
|
|
18
|
+
backend: path_1.default.join(exports.TEMPLATES_DIR, 'backend'),
|
|
19
|
+
backendApp: path_1.default.join(exports.TEMPLATES_DIR, 'backend-app'),
|
|
20
|
+
common: path_1.default.join(exports.TEMPLATES_DIR, 'common'),
|
|
21
|
+
datasource: path_1.default.join(exports.TEMPLATES_DIR, 'datasource'),
|
|
22
|
+
panel: path_1.default.join(exports.TEMPLATES_DIR, 'panel'),
|
|
23
|
+
ciWorkflows: path_1.default.join(exports.TEMPLATES_DIR, 'github', 'ci'),
|
|
24
|
+
isCompatibleWorkflow: path_1.default.join(exports.TEMPLATES_DIR, 'github', 'is-compatible'),
|
|
25
25
|
};
|
|
26
26
|
var PLUGIN_TYPES;
|
|
27
27
|
(function (PLUGIN_TYPES) {
|
|
@@ -30,10 +30,10 @@ var PLUGIN_TYPES;
|
|
|
30
30
|
PLUGIN_TYPES["datasource"] = "datasource";
|
|
31
31
|
PLUGIN_TYPES["secretsmanager"] = "secretsmanager";
|
|
32
32
|
PLUGIN_TYPES["scenes"] = "scenesapp";
|
|
33
|
-
})(PLUGIN_TYPES
|
|
33
|
+
})(PLUGIN_TYPES || (exports.PLUGIN_TYPES = PLUGIN_TYPES = {}));
|
|
34
34
|
exports.EXTRA_TEMPLATE_VARIABLES = {
|
|
35
35
|
grafanaVersion: '10.0.3',
|
|
36
|
-
grafanaImage: 'grafana-enterprise'
|
|
36
|
+
grafanaImage: 'grafana-enterprise',
|
|
37
37
|
};
|
|
38
38
|
exports.GRAFANA_FE_PACKAGES = [
|
|
39
39
|
'@grafana/data',
|
|
@@ -57,10 +57,10 @@ exports.MIGRATION_CONFIG = {
|
|
|
57
57
|
filesToExist: ['CHANGELOG.md'],
|
|
58
58
|
filesToRemove: ['Dockerfile', 'docker-compose.yml', 'webpack/', '.webpack/', '.prettierrc'],
|
|
59
59
|
npmDependenciesToRemove: ['ts-loader', 'babel-loader', '@grafana/toolkit'],
|
|
60
|
-
devNpmDependenciesToRemove: ['@grafana/toolkit', '@grafana/runtime', '@grafana/data', '@grafana/ui']
|
|
60
|
+
devNpmDependenciesToRemove: ['@grafana/toolkit', '@grafana/runtime', '@grafana/data', '@grafana/ui'],
|
|
61
61
|
};
|
|
62
62
|
exports.UDPATE_CONFIG = {
|
|
63
|
-
filesToOverride: ['.config/']
|
|
63
|
+
filesToOverride: ['.config/'],
|
|
64
64
|
};
|
|
65
65
|
exports.TEXT = {
|
|
66
66
|
overrideFilesPrompt: '**The following files will be overriden, would you like to continue?**',
|
|
@@ -85,5 +85,5 @@ exports.TEXT = {
|
|
|
85
85
|
migrationCommandWarning: '**⚠️ Warning!**\nThis is going to change files in your current project to make it up-to-date with the latest plugin configuration.\nPlease make sure that you have backed up your changes.',
|
|
86
86
|
migrationCommandSuccess: "\n## What's next?\n * Run `yarn install` to install the latest dependencies.\n * Check your tsconfig.json. You might need to update if you had a custom configuration.\n * If you have a custom webpack configuration you might need to update it too.\n * Run `yarn build` and observe the output for any errors.\n * Test your plugin in grafana and make sure everything works as expected.\n\nSee instructions on how to customize your configuration here https://grafana.com/developers/plugin-tools/create-a-plugin/extend-a-plugin/extend-configurations\n ",
|
|
87
87
|
updateCommandWarning: '**⚠️ Warning!**\nThis is going to update files under the `.config/` folder.\nMake sure to commit your changes before running this script.',
|
|
88
|
-
updateCommandSuccess: '**Done.**\nIf you have any questions please open an issue/discussion in https://github.com/grafana/plugin-tools.'
|
|
88
|
+
updateCommandSuccess: '**Done.**\nIf you have any questions please open an issue/discussion in https://github.com/grafana/plugin-tools.',
|
|
89
89
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
exports
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var utils_npm_1 = require("../utils.npm");
|
|
4
4
|
describe('Utils / NPM', function () {
|
|
5
5
|
describe('getDepenciesToBeUpdated()', function () {
|
|
@@ -10,16 +10,16 @@ describe('Utils / NPM', function () {
|
|
|
10
10
|
'@types/minimist': '^1.6.2',
|
|
11
11
|
'@types/mkdirp': '^1.0.2',
|
|
12
12
|
'@types/semver': '^7.3.9',
|
|
13
|
-
'node-plop': '0.26.3'
|
|
13
|
+
'node-plop': '0.26.3',
|
|
14
14
|
}, {
|
|
15
15
|
'@grafana/tsconfig': '^2.0.0',
|
|
16
16
|
'@swc/core': '^1.2.162',
|
|
17
17
|
'@types/minimist': '^1.4.2',
|
|
18
18
|
'@types/mkdirp': '^1.0.2',
|
|
19
|
-
'@types/semver': '^7.3.9'
|
|
19
|
+
'@types/semver': '^7.3.9',
|
|
20
20
|
})).toEqual({
|
|
21
21
|
'@grafana/tsconfig': { prev: '^1.2.0-rc1', next: '^2.0.0' },
|
|
22
|
-
'@types/minimist': { prev: '^1.6.2', next: '^1.4.2' }
|
|
22
|
+
'@types/minimist': { prev: '^1.6.2', next: '^1.4.2' },
|
|
23
23
|
});
|
|
24
24
|
});
|
|
25
25
|
test('it should be possible to only update dependencies that are outdated', function () {
|
|
@@ -29,15 +29,15 @@ describe('Utils / NPM', function () {
|
|
|
29
29
|
'@types/minimist': '^1.6.2',
|
|
30
30
|
'@types/mkdirp': '^1.0.2',
|
|
31
31
|
'@types/semver': '^7.3.9',
|
|
32
|
-
'node-plop': '0.26.3'
|
|
32
|
+
'node-plop': '0.26.3',
|
|
33
33
|
}, {
|
|
34
34
|
'@grafana/tsconfig': '^2.0.0',
|
|
35
35
|
'@swc/core': '^1.2.162',
|
|
36
36
|
'@types/minimist': '^1.4.2',
|
|
37
37
|
'@types/mkdirp': '^1.0.2',
|
|
38
|
-
'@types/semver': '^7.3.9'
|
|
38
|
+
'@types/semver': '^7.3.9',
|
|
39
39
|
}, { onlyOutdated: true })).toEqual({
|
|
40
|
-
'@grafana/tsconfig': { prev: '^1.2.0-rc1', next: '^2.0.0' }
|
|
40
|
+
'@grafana/tsconfig': { prev: '^1.2.0-rc1', next: '^2.0.0' },
|
|
41
41
|
});
|
|
42
42
|
});
|
|
43
43
|
test('it should be able to override with using release channels like "latest"', function () {
|
|
@@ -47,17 +47,17 @@ describe('Utils / NPM', function () {
|
|
|
47
47
|
'@types/minimist': '^1.6.2',
|
|
48
48
|
'@types/mkdirp': '^1.0.2',
|
|
49
49
|
'@types/semver': '^7.3.9',
|
|
50
|
-
'node-plop': '0.26.3'
|
|
50
|
+
'node-plop': '0.26.3',
|
|
51
51
|
}, {
|
|
52
52
|
'@grafana/tsconfig': '^2.0.0',
|
|
53
53
|
'@swc/core': 'latest',
|
|
54
54
|
'@types/minimist': '^1.4.2',
|
|
55
55
|
'@types/mkdirp': '^1.0.2',
|
|
56
|
-
'@types/semver': '^7.3.9'
|
|
56
|
+
'@types/semver': '^7.3.9',
|
|
57
57
|
})).toEqual({
|
|
58
58
|
'@grafana/tsconfig': { prev: 'latest', next: '^2.0.0' },
|
|
59
59
|
'@swc/core': { prev: '^1.2.162', next: 'latest' },
|
|
60
|
-
'@types/minimist': { prev: '^1.6.2', next: '^1.4.2' }
|
|
60
|
+
'@types/minimist': { prev: '^1.6.2', next: '^1.4.2' },
|
|
61
61
|
});
|
|
62
62
|
});
|
|
63
63
|
});
|
|
@@ -69,31 +69,31 @@ describe('Utils / NPM', function () {
|
|
|
69
69
|
'@types/minimist': '^1.2.2',
|
|
70
70
|
'@types/mkdirp': '^1.0.2',
|
|
71
71
|
'@types/semver': '^7.3.9',
|
|
72
|
-
'node-plop': '0.26.3'
|
|
72
|
+
'node-plop': '0.26.3',
|
|
73
73
|
}, {
|
|
74
74
|
'@grafana/tsconfig': { prev: '^1.2.0-rc1', next: '^2.0.0' },
|
|
75
|
-
'@types/minimist': { prev: '^1.2.2', next: '^1.4.2' }
|
|
75
|
+
'@types/minimist': { prev: '^1.2.2', next: '^1.4.2' },
|
|
76
76
|
})).toEqual({
|
|
77
77
|
'@grafana/tsconfig': '^2.0.0',
|
|
78
78
|
'@swc/core': '^1.2.162',
|
|
79
79
|
'@types/minimist': '^1.4.2',
|
|
80
80
|
'@types/mkdirp': '^1.0.2',
|
|
81
81
|
'@types/semver': '^7.3.9',
|
|
82
|
-
'node-plop': '0.26.3'
|
|
82
|
+
'node-plop': '0.26.3',
|
|
83
83
|
});
|
|
84
84
|
});
|
|
85
85
|
test('it should add new depdendencies', function () {
|
|
86
86
|
expect((0, utils_npm_1.updateNpmDependencies)({
|
|
87
87
|
'@grafana/tsconfig': '^1.2.0-rc1',
|
|
88
|
-
'@swc/core': '^1.2.162'
|
|
88
|
+
'@swc/core': '^1.2.162',
|
|
89
89
|
}, {
|
|
90
90
|
'@grafana/tsconfig': { prev: '^1.2.0-rc1', next: '^1.2.0-rc1' },
|
|
91
91
|
'@swc/core': { prev: '^1.2.162', next: '^1.2.162' },
|
|
92
|
-
'@types/minimist': { prev: null, next: '^1.4.2' }
|
|
92
|
+
'@types/minimist': { prev: null, next: '^1.4.2' },
|
|
93
93
|
})).toEqual({
|
|
94
94
|
'@grafana/tsconfig': '^1.2.0-rc1',
|
|
95
95
|
'@swc/core': '^1.2.162',
|
|
96
|
-
'@types/minimist': '^1.4.2'
|
|
96
|
+
'@types/minimist': '^1.4.2',
|
|
97
97
|
});
|
|
98
98
|
});
|
|
99
99
|
test('it should override `latest` and other release channels', function () {
|
|
@@ -103,16 +103,16 @@ describe('Utils / NPM', function () {
|
|
|
103
103
|
'@types/minimist': '^1.2.2',
|
|
104
104
|
'@types/mkdirp': '^1.0.2',
|
|
105
105
|
'@types/semver': '^8.0.0',
|
|
106
|
-
'node-plop': '0.26.3'
|
|
106
|
+
'node-plop': '0.26.3',
|
|
107
107
|
}, {
|
|
108
|
-
'@grafana/tsconfig': { prev: 'latest', next: '^2.0.0' }
|
|
108
|
+
'@grafana/tsconfig': { prev: 'latest', next: '^2.0.0' },
|
|
109
109
|
})).toEqual({
|
|
110
110
|
'@grafana/tsconfig': '^2.0.0',
|
|
111
111
|
'@swc/core': '^1.2.162',
|
|
112
112
|
'@types/minimist': '^1.2.2',
|
|
113
113
|
'@types/mkdirp': '^1.0.2',
|
|
114
114
|
'@types/semver': '^8.0.0',
|
|
115
|
-
'node-plop': '0.26.3'
|
|
115
|
+
'node-plop': '0.26.3',
|
|
116
116
|
});
|
|
117
117
|
});
|
|
118
118
|
test('it should be able to override with using release channels like "latest"', function () {
|
|
@@ -122,16 +122,16 @@ describe('Utils / NPM', function () {
|
|
|
122
122
|
'@types/minimist': '^1.2.2',
|
|
123
123
|
'@types/mkdirp': '^1.0.2',
|
|
124
124
|
'@types/semver': '^8.0.0',
|
|
125
|
-
'node-plop': '0.26.3'
|
|
125
|
+
'node-plop': '0.26.3',
|
|
126
126
|
}, {
|
|
127
|
-
'@grafana/tsconfig': { prev: '', next: 'latest' }
|
|
127
|
+
'@grafana/tsconfig': { prev: '', next: 'latest' },
|
|
128
128
|
})).toEqual({
|
|
129
129
|
'@grafana/tsconfig': 'latest',
|
|
130
130
|
'@swc/core': '^1.2.162',
|
|
131
131
|
'@types/minimist': '^1.2.2',
|
|
132
132
|
'@types/mkdirp': '^1.0.2',
|
|
133
133
|
'@types/semver': '^8.0.0',
|
|
134
|
-
'node-plop': '0.26.3'
|
|
134
|
+
'node-plop': '0.26.3',
|
|
135
135
|
});
|
|
136
136
|
});
|
|
137
137
|
});
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
exports
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.selectPrompt = exports.confirmPrompt = exports.printSuccessMessage = exports.printMessage = exports.displayArrayAsList = exports.displayAsMarkdown = void 0;
|
|
4
4
|
var marked = require('marked').marked;
|
|
5
5
|
var TerminalRenderer = require('marked-terminal');
|
|
6
6
|
var _a = require('enquirer'), Confirm = _a.Confirm, Select = _a.Select;
|
|
7
7
|
marked.setOptions({
|
|
8
|
-
renderer: new TerminalRenderer()
|
|
8
|
+
renderer: new TerminalRenderer(),
|
|
9
9
|
});
|
|
10
10
|
function displayAsMarkdown(msg) {
|
|
11
11
|
return marked(msg);
|
|
@@ -26,7 +26,7 @@ exports.printSuccessMessage = printSuccessMessage;
|
|
|
26
26
|
function confirmPrompt(message) {
|
|
27
27
|
var prompt = new Confirm({
|
|
28
28
|
name: 'question',
|
|
29
|
-
message: displayAsMarkdown(message)
|
|
29
|
+
message: displayAsMarkdown(message),
|
|
30
30
|
});
|
|
31
31
|
return prompt.run();
|
|
32
32
|
}
|
|
@@ -34,7 +34,7 @@ exports.confirmPrompt = confirmPrompt;
|
|
|
34
34
|
function selectPrompt(message, choices) {
|
|
35
35
|
var prompt = new Select({
|
|
36
36
|
choices: choices,
|
|
37
|
-
message: displayAsMarkdown(message)
|
|
37
|
+
message: displayAsMarkdown(message),
|
|
38
38
|
});
|
|
39
39
|
return prompt.run();
|
|
40
40
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
|
-
exports
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.isFileStartingWith = exports.removeFilesInCwd = exports.getOnlyNotExistingInCwd = exports.getOnlyExistingInCwd = exports.readJsonFile = exports.isFile = exports.filterOutCommonFiles = void 0;
|
|
7
7
|
var path_1 = __importDefault(require("path"));
|
|
8
8
|
var fs_1 = __importDefault(require("fs"));
|
|
@@ -17,7 +17,7 @@ function filterOutCommonFiles(files, pluginType) {
|
|
|
17
17
|
exports.filterOutCommonFiles = filterOutCommonFiles;
|
|
18
18
|
function isFile(path) {
|
|
19
19
|
try {
|
|
20
|
-
return fs_1
|
|
20
|
+
return fs_1.default.lstatSync(path).isFile();
|
|
21
21
|
}
|
|
22
22
|
catch (e) {
|
|
23
23
|
return false;
|
|
@@ -26,29 +26,29 @@ function isFile(path) {
|
|
|
26
26
|
exports.isFile = isFile;
|
|
27
27
|
function readJsonFile(filename) {
|
|
28
28
|
if (!isFile(filename)) {
|
|
29
|
-
throw new Error("There is no \"".concat(path_1
|
|
29
|
+
throw new Error("There is no \"".concat(path_1.default.basename(filename), "\" file found at \"").concat(filename, "\". Make sure you run this command from a plugins root directory."));
|
|
30
30
|
}
|
|
31
31
|
try {
|
|
32
|
-
return JSON.parse(fs_1
|
|
32
|
+
return JSON.parse(fs_1.default.readFileSync(filename).toString());
|
|
33
33
|
}
|
|
34
34
|
catch (error) {
|
|
35
|
-
error.message = "Cannot parse the \"".concat(path_1
|
|
35
|
+
error.message = "Cannot parse the \"".concat(path_1.default.basename(filename), "\" file at ").concat(filename, ".");
|
|
36
36
|
throw error;
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
exports.readJsonFile = readJsonFile;
|
|
40
40
|
function getOnlyExistingInCwd(files) {
|
|
41
|
-
return files.filter(function (file) { return fs_1
|
|
41
|
+
return files.filter(function (file) { return fs_1.default.existsSync(path_1.default.join(process.cwd(), file)); });
|
|
42
42
|
}
|
|
43
43
|
exports.getOnlyExistingInCwd = getOnlyExistingInCwd;
|
|
44
44
|
function getOnlyNotExistingInCwd(files) {
|
|
45
|
-
return files.filter(function (file) { return !fs_1
|
|
45
|
+
return files.filter(function (file) { return !fs_1.default.existsSync(path_1.default.join(process.cwd(), file)); });
|
|
46
46
|
}
|
|
47
47
|
exports.getOnlyNotExistingInCwd = getOnlyNotExistingInCwd;
|
|
48
48
|
function removeFilesInCwd(files) {
|
|
49
49
|
for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
|
|
50
50
|
var file = files_1[_i];
|
|
51
|
-
fs_1
|
|
51
|
+
fs_1.default.rmSync(path_1.default.join(process.cwd(), file), { recursive: true, force: true });
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
exports.removeFilesInCwd = removeFilesInCwd;
|
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
var _this = this;
|
|
29
|
-
exports
|
|
29
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
30
|
exports.renderHandlebarsTemplate = exports.registerHandlebarsHelpers = exports.normalizeId = exports.ifEq = void 0;
|
|
31
31
|
var handlebars_1 = __importDefault(require("handlebars"));
|
|
32
32
|
var changeCase = __importStar(require("change-case"));
|
|
@@ -51,26 +51,26 @@ function registerHandlebarsHelpers() {
|
|
|
51
51
|
snakeCase: changeCase.snakeCase,
|
|
52
52
|
dotCase: changeCase.dotCase,
|
|
53
53
|
pathCase: changeCase.pathCase,
|
|
54
|
-
lowerCase: lower_case_1
|
|
55
|
-
upperCase: upper_case_1
|
|
54
|
+
lowerCase: lower_case_1.default,
|
|
55
|
+
upperCase: upper_case_1.default,
|
|
56
56
|
sentenceCase: changeCase.sentenceCase,
|
|
57
57
|
constantCase: changeCase.constantCase,
|
|
58
|
-
titleCase: title_case_1
|
|
58
|
+
titleCase: title_case_1.default,
|
|
59
59
|
dashCase: changeCase.paramCase,
|
|
60
60
|
kabobCase: changeCase.paramCase,
|
|
61
61
|
kebabCase: changeCase.paramCase,
|
|
62
62
|
properCase: changeCase.pascalCase,
|
|
63
63
|
pascalCase: changeCase.pascalCase,
|
|
64
64
|
if_eq: exports.ifEq,
|
|
65
|
-
normalize_id: exports.normalizeId
|
|
65
|
+
normalize_id: exports.normalizeId,
|
|
66
66
|
};
|
|
67
67
|
Object.keys(helpers).forEach(function (helperName) {
|
|
68
|
-
return handlebars_1
|
|
68
|
+
return handlebars_1.default.registerHelper(helperName, helpers[helperName]);
|
|
69
69
|
});
|
|
70
70
|
}
|
|
71
71
|
exports.registerHandlebarsHelpers = registerHandlebarsHelpers;
|
|
72
72
|
function renderHandlebarsTemplate(template, data) {
|
|
73
73
|
registerHandlebarsHelpers();
|
|
74
|
-
return handlebars_1
|
|
74
|
+
return handlebars_1.default.compile(template)(data);
|
|
75
75
|
}
|
|
76
76
|
exports.renderHandlebarsTemplate = renderHandlebarsTemplate;
|
package/dist/utils/utils.npm.js
CHANGED
|
@@ -13,7 +13,7 @@ var __assign = (this && this.__assign) || function () {
|
|
|
13
13
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
15
|
};
|
|
16
|
-
exports
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.cleanUpPackageJson = exports.writePackageManagerInPackageJson = exports.updateNpmScripts = exports.removeNpmDependencies = exports.getRemovableNpmDependencies = exports.getUpdatableNpmDependencies = exports.getPackageJsonUpdates = exports.updateNpmDependencies = exports.updatePackageJson = exports.hasNpmDependenciesToUpdate = exports.getPackageJsonUpdatesAsText = exports.getNpmDependencyUpdatesAsText = exports.writePackageJson = exports.getLatestPackageJson = exports.getPackageJson = void 0;
|
|
18
18
|
var path_1 = __importDefault(require("path"));
|
|
19
19
|
var fs_1 = __importDefault(require("fs"));
|
|
@@ -22,17 +22,17 @@ var utils_files_1 = require("./utils.files");
|
|
|
22
22
|
var utils_templates_1 = require("./utils.templates");
|
|
23
23
|
var constants_1 = require("../constants");
|
|
24
24
|
function getPackageJson() {
|
|
25
|
-
return (0, utils_files_1.readJsonFile)(path_1
|
|
25
|
+
return (0, utils_files_1.readJsonFile)(path_1.default.join(process.cwd(), 'package.json'));
|
|
26
26
|
}
|
|
27
27
|
exports.getPackageJson = getPackageJson;
|
|
28
28
|
function getLatestPackageJson() {
|
|
29
|
-
var packageJsonPath = path_1
|
|
29
|
+
var packageJsonPath = path_1.default.join(constants_1.TEMPLATE_PATHS.common, 'package.json');
|
|
30
30
|
var data = (0, utils_templates_1.getTemplateData)();
|
|
31
31
|
return JSON.parse((0, utils_templates_1.renderTemplateFromFile)(packageJsonPath, data));
|
|
32
32
|
}
|
|
33
33
|
exports.getLatestPackageJson = getLatestPackageJson;
|
|
34
34
|
function writePackageJson(json) {
|
|
35
|
-
return fs_1
|
|
35
|
+
return fs_1.default.writeFileSync(path_1.default.join(process.cwd(), 'package.json'), "".concat(JSON.stringify(json, null, 2), "\n"));
|
|
36
36
|
}
|
|
37
37
|
exports.writePackageJson = writePackageJson;
|
|
38
38
|
function getNpmDependencyUpdatesAsText(dependencyUpdates) {
|
|
@@ -110,12 +110,12 @@ function getPackageJsonUpdates(options) {
|
|
|
110
110
|
}, {});
|
|
111
111
|
return {
|
|
112
112
|
dependencyUpdates: ignoreGrafanaDependencies(dependencyUpdates, prevGrafanaDependencies),
|
|
113
|
-
devDependencyUpdates: ignoreGrafanaDependencies(devDependencyUpdates, prevGrafanaDependencies)
|
|
113
|
+
devDependencyUpdates: ignoreGrafanaDependencies(devDependencyUpdates, prevGrafanaDependencies),
|
|
114
114
|
};
|
|
115
115
|
}
|
|
116
116
|
return {
|
|
117
117
|
dependencyUpdates: dependencyUpdates,
|
|
118
|
-
devDependencyUpdates: devDependencyUpdates
|
|
118
|
+
devDependencyUpdates: devDependencyUpdates,
|
|
119
119
|
};
|
|
120
120
|
}
|
|
121
121
|
exports.getPackageJsonUpdates = getPackageJsonUpdates;
|
|
@@ -126,7 +126,7 @@ function ignoreGrafanaDependencies(dependencyUpdates, prevGrafanaDependencies) {
|
|
|
126
126
|
if (whatever.includes(packageName)) {
|
|
127
127
|
acc[packageName] = {
|
|
128
128
|
prev: prevGrafanaDependencies[packageName],
|
|
129
|
-
next: prevGrafanaDependencies[packageName]
|
|
129
|
+
next: prevGrafanaDependencies[packageName],
|
|
130
130
|
};
|
|
131
131
|
}
|
|
132
132
|
else {
|
|
@@ -149,21 +149,21 @@ function getUpdatableNpmDependencies(prevDeps, nextDeps, options) {
|
|
|
149
149
|
if (newSemverRange === currentSemverRange) {
|
|
150
150
|
continue;
|
|
151
151
|
}
|
|
152
|
-
if (!semver_1
|
|
152
|
+
if (!semver_1.default.validRange(newSemverRange) || !semver_1.default.validRange(currentSemverRange)) {
|
|
153
153
|
updateSummary[packageName] = { prev: currentSemverRange, next: newSemverRange };
|
|
154
154
|
continue;
|
|
155
155
|
}
|
|
156
|
-
var newSemverVersion = semver_1
|
|
157
|
-
var currentSemverVersion = semver_1
|
|
158
|
-
if (!newSemverVersion || !semver_1
|
|
156
|
+
var newSemverVersion = semver_1.default.minVersion(newSemverRange);
|
|
157
|
+
var currentSemverVersion = semver_1.default.minVersion(currentSemverRange);
|
|
158
|
+
if (!newSemverVersion || !semver_1.default.valid(newSemverVersion)) {
|
|
159
159
|
console.warn("Skipping: invalid new semver version \"".concat(newSemverRange, "\" for \"").concat(packageName, "\""));
|
|
160
160
|
continue;
|
|
161
161
|
}
|
|
162
|
-
if (!currentSemverVersion || !semver_1
|
|
162
|
+
if (!currentSemverVersion || !semver_1.default.valid(currentSemverVersion)) {
|
|
163
163
|
console.warn("Skipping: invalid current semver version \"".concat(currentSemverRange, "\" for \"").concat(packageName, "\""));
|
|
164
164
|
continue;
|
|
165
165
|
}
|
|
166
|
-
if (!options.onlyOutdated || semver_1
|
|
166
|
+
if (!options.onlyOutdated || semver_1.default.gte(newSemverVersion, currentSemverVersion)) {
|
|
167
167
|
updateSummary[packageName] = { prev: currentSemverRange, next: newSemverRange };
|
|
168
168
|
continue;
|
|
169
169
|
}
|
package/dist/utils/utils.os.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
exports
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getPackageManagerInstallCmd = exports.getPackageManagerWithFallback = exports.getPackageManagerFromUserAgent = void 0;
|
|
4
4
|
var path_1 = require("path");
|
|
5
5
|
var child_process_1 = require("child_process");
|
|
@@ -52,21 +52,21 @@ function getPackageManagerFromLockFile() {
|
|
|
52
52
|
try {
|
|
53
53
|
if (closestLockfile === NPM_LOCKFILE) {
|
|
54
54
|
var npmVersionCommand = (0, child_process_1.spawnSync)('npm', ['--version'], {
|
|
55
|
-
shell: true
|
|
55
|
+
shell: true,
|
|
56
56
|
});
|
|
57
57
|
var packageManagerVersion = npmVersionCommand.stdout.toString().trimEnd();
|
|
58
58
|
return { packageManagerName: 'npm', packageManagerVersion: packageManagerVersion };
|
|
59
59
|
}
|
|
60
60
|
if (closestLockfile === PNPM_LOCKFILE) {
|
|
61
61
|
var pnpmVersionCommand = (0, child_process_1.spawnSync)('pnpm', ['--version'], {
|
|
62
|
-
shell: true
|
|
62
|
+
shell: true,
|
|
63
63
|
});
|
|
64
64
|
var packageManagerVersion = pnpmVersionCommand.stdout.toString().trimEnd();
|
|
65
65
|
return { packageManagerName: 'pnpm', packageManagerVersion: packageManagerVersion };
|
|
66
66
|
}
|
|
67
67
|
if (closestLockfile === YARN_LOCKFILE) {
|
|
68
68
|
var yarnVersionCommand = (0, child_process_1.spawnSync)('yarn', ['--version'], {
|
|
69
|
-
shell: true
|
|
69
|
+
shell: true,
|
|
70
70
|
});
|
|
71
71
|
var packageManagerVersion = yarnVersionCommand.stdout.toString().trimEnd();
|
|
72
72
|
return { packageManagerName: 'yarn', packageManagerVersion: packageManagerVersion };
|
package/dist/utils/utils.path.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
|
-
exports
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getExportPath = void 0;
|
|
7
7
|
var path_1 = __importDefault(require("path"));
|
|
8
8
|
var constants_1 = require("../constants");
|
|
@@ -12,7 +12,7 @@ function getExportPath(pluginName, orgName, pluginType) {
|
|
|
12
12
|
return constants_1.DEV_EXPORT_DIR;
|
|
13
13
|
}
|
|
14
14
|
else {
|
|
15
|
-
return path_1
|
|
15
|
+
return path_1.default.join(process.cwd(), (0, utils_handlebars_1.normalizeId)(pluginName, orgName, pluginType));
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
exports.getExportPath = getExportPath;
|
|
@@ -2,13 +2,13 @@
|
|
|
2
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
|
-
exports
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getPluginJson = void 0;
|
|
7
7
|
var path_1 = __importDefault(require("path"));
|
|
8
8
|
var utils_files_1 = require("./utils.files");
|
|
9
9
|
function getPluginJson(srcDir) {
|
|
10
|
-
var srcPath = srcDir || path_1
|
|
11
|
-
var pluginJsonPath = path_1
|
|
10
|
+
var srcPath = srcDir || path_1.default.join(process.cwd(), 'src');
|
|
11
|
+
var pluginJsonPath = path_1.default.join(srcPath, 'plugin.json');
|
|
12
12
|
return (0, utils_files_1.readJsonFile)(pluginJsonPath);
|
|
13
13
|
}
|
|
14
14
|
exports.getPluginJson = getPluginJson;
|
|
@@ -22,7 +22,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
22
22
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
23
23
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
24
|
};
|
|
25
|
-
exports
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.getTemplateData = exports.renderTemplateFromFile = exports.compileSingleTemplateFile = exports.compileTemplateFiles = exports.getProjectRelativeTemplatePath = exports.getTemplateFiles = void 0;
|
|
27
27
|
var glob_1 = __importDefault(require("glob"));
|
|
28
28
|
var path_1 = __importDefault(require("path"));
|
|
@@ -34,8 +34,8 @@ var utils_plugin_1 = require("./utils.plugin");
|
|
|
34
34
|
var constants_1 = require("../constants");
|
|
35
35
|
var utils_packageManager_1 = require("./utils.packageManager");
|
|
36
36
|
function getTemplateFiles(pluginType, filter) {
|
|
37
|
-
var commonFiles = glob_1
|
|
38
|
-
var pluginTypeSpecificFiles = glob_1
|
|
37
|
+
var commonFiles = glob_1.default.sync("".concat(constants_1.TEMPLATE_PATHS.common, "/**"), { dot: true });
|
|
38
|
+
var pluginTypeSpecificFiles = glob_1.default.sync("".concat(constants_1.TEMPLATE_PATHS[pluginType], "/**"), { dot: true });
|
|
39
39
|
var templateFiles = (0, utils_files_1.filterOutCommonFiles)(__spreadArray(__spreadArray([], commonFiles, true), pluginTypeSpecificFiles, true), pluginType);
|
|
40
40
|
if (filter) {
|
|
41
41
|
return templateFiles.filter(function (file) {
|
|
@@ -61,13 +61,13 @@ function compileSingleTemplateFile(pluginType, templateFile, data) {
|
|
|
61
61
|
}
|
|
62
62
|
var rendered = renderTemplateFromFile(templateFile, data);
|
|
63
63
|
var relativeExportPath = templateFile.replace(constants_1.TEMPLATE_PATHS.common, '').replace(constants_1.TEMPLATE_PATHS[pluginType], '');
|
|
64
|
-
var exportPath = path_1
|
|
65
|
-
mkdirp_1
|
|
66
|
-
fs_1
|
|
64
|
+
var exportPath = path_1.default.join(constants_1.EXPORT_PATH_PREFIX, relativeExportPath);
|
|
65
|
+
mkdirp_1.default.sync(path_1.default.dirname(exportPath));
|
|
66
|
+
fs_1.default.writeFileSync(exportPath, rendered);
|
|
67
67
|
}
|
|
68
68
|
exports.compileSingleTemplateFile = compileSingleTemplateFile;
|
|
69
69
|
function renderTemplateFromFile(templateFile, data) {
|
|
70
|
-
return (0, utils_handlebars_1.renderHandlebarsTemplate)(fs_1
|
|
70
|
+
return (0, utils_handlebars_1.renderHandlebarsTemplate)(fs_1.default.readFileSync(templateFile).toString(), data);
|
|
71
71
|
}
|
|
72
72
|
exports.renderTemplateFromFile = renderTemplateFromFile;
|
|
73
73
|
function getTemplateData() {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@grafana/create-plugin",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.3-canary.455.39386f5.0",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"repository": {
|
|
6
6
|
"directory": "packages/create-plugin",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"engines": {
|
|
67
67
|
"node": ">=18"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "39386f5c92e30cfebaddb100a21f7283ef3e269f"
|
|
70
70
|
}
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"@swc/helpers": "^0.5.0",
|
|
28
28
|
"@swc/jest": "^0.2.26",
|
|
29
29
|
"@testing-library/jest-dom": "^5.16.5",
|
|
30
|
-
"@testing-library/react": "
|
|
30
|
+
"@testing-library/react": "14.0.0",
|
|
31
31
|
"@types/jest": "^29.5.0",
|
|
32
32
|
"@types/lodash": "^4.14.194",
|
|
33
33
|
"@types/node": "^18.15.11",{{#if isAppType}}
|
|
@@ -57,15 +57,15 @@
|
|
|
57
57
|
"node": ">=18"
|
|
58
58
|
},
|
|
59
59
|
"dependencies": {
|
|
60
|
-
"@emotion/css": "
|
|
60
|
+
"@emotion/css": "11.10.6",
|
|
61
61
|
"@grafana/data": "{{ grafanaVersion }}",
|
|
62
62
|
"@grafana/runtime": "{{ grafanaVersion }}",
|
|
63
63
|
"@grafana/ui": "{{ grafanaVersion }}",{{#if_eq pluginType "scenesapp"}}
|
|
64
64
|
"@grafana/schema": "{{ grafanaVersion }}",
|
|
65
65
|
"@grafana/scenes": "0.27.0",{{/if_eq}}
|
|
66
|
-
"react": "
|
|
67
|
-
"react-dom": "
|
|
68
|
-
"react-router-dom": "
|
|
66
|
+
"react": "18.2.0",
|
|
67
|
+
"react-dom": "18.2.0",{{#if isAppType}}
|
|
68
|
+
"react-router-dom": "5.3.3",
|
|
69
69
|
"rxjs": "7.8.0",{{/if}}
|
|
70
70
|
"tslib": "2.5.3"
|
|
71
71
|
},
|