@contember/cli 1.3.0-alpha.8 → 1.3.0-beta.1
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/Dockerfile +1 -1
- package/build.sh +1 -0
- package/contember-docker.sh +0 -0
- package/dist/src/commands/deploy/DeployCommand.d.ts +2 -2
- package/dist/src/commands/deploy/DeployCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationAmendCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationAmendCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationCreateHelper.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationCreateHelper.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationDescribeCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationDescribeCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationDiffCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationDiffCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationExecuteCommand.d.ts +3 -3
- package/dist/src/commands/migrations/MigrationExecuteCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationExecuteCommand.js +7 -26
- package/dist/src/commands/migrations/MigrationExecuteCommand.js.map +1 -1
- package/dist/src/commands/migrations/MigrationExecuteHelper.d.ts +1 -1
- package/dist/src/commands/migrations/MigrationExecuteHelper.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationRebaseCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationRebaseCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationStatusCommand.d.ts +2 -2
- package/dist/src/commands/migrations/MigrationStatusCommand.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationValidationHelper.d.ts.map +1 -1
- package/dist/src/commands/migrations/MigrationValidationHelper.js +7 -1
- package/dist/src/commands/migrations/MigrationValidationHelper.js.map +1 -1
- package/dist/src/commands/project/ProjectCreateCommand.d.ts +2 -2
- package/dist/src/commands/project/ProjectCreateCommand.d.ts.map +1 -1
- package/dist/src/commands/project/ProjectGenerateDocumentation.d.ts +2 -2
- package/dist/src/commands/project/ProjectGenerateDocumentation.d.ts.map +1 -1
- package/dist/src/commands/project/ProjectPrintSchemaCommand.d.ts +3 -2
- package/dist/src/commands/project/ProjectPrintSchemaCommand.d.ts.map +1 -1
- package/dist/src/commands/project/ProjectPrintSchemaCommand.js +8 -5
- package/dist/src/commands/project/ProjectPrintSchemaCommand.js.map +1 -1
- package/dist/src/commands/project/ProjectValidateCommand.d.ts +2 -2
- package/dist/src/commands/project/ProjectValidateCommand.d.ts.map +1 -1
- package/dist/src/commands/tenant/CreateApiKeyCommand.d.ts +2 -2
- package/dist/src/commands/tenant/CreateApiKeyCommand.d.ts.map +1 -1
- package/dist/src/commands/tenant/InviteCommand.d.ts +2 -2
- package/dist/src/commands/tenant/InviteCommand.d.ts.map +1 -1
- package/dist/src/commands/tenant/ResetPasswordCommand.d.ts +2 -2
- package/dist/src/commands/tenant/ResetPasswordCommand.d.ts.map +1 -1
- package/dist/src/commands/tenant/SignInCommand.d.ts +2 -2
- package/dist/src/commands/tenant/SignInCommand.d.ts.map +1 -1
- package/dist/src/commands/transfer/ExportCommand.d.ts +2 -2
- package/dist/src/commands/transfer/ExportCommand.d.ts.map +1 -1
- package/dist/src/commands/transfer/ImportCommand.d.ts +2 -2
- package/dist/src/commands/transfer/ImportCommand.d.ts.map +1 -1
- package/dist/src/commands/transfer/TransferCommand.d.ts +2 -2
- package/dist/src/commands/transfer/TransferCommand.d.ts.map +1 -1
- package/dist/src/commands/transfer/utils.d.ts +1 -1
- package/dist/src/commands/transfer/utils.d.ts.map +1 -1
- package/dist/src/commands/workspace/WorkspaceUpdateApiCommand.d.ts +2 -2
- package/dist/src/commands/workspace/WorkspaceUpdateApiCommand.d.ts.map +1 -1
- package/dist/src/commands/workspace/WorkspaceUpdateApiCommand.js +9 -7
- package/dist/src/commands/workspace/WorkspaceUpdateApiCommand.js.map +1 -1
- package/dist/src/run.js +4 -0
- package/dist/src/run.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/utils/admin.d.ts +1 -1
- package/dist/src/utils/admin.d.ts.map +1 -1
- package/dist/src/utils/checkVersions.d.ts +3 -0
- package/dist/src/utils/checkVersions.d.ts.map +1 -0
- package/dist/src/utils/checkVersions.js +83 -0
- package/dist/src/utils/checkVersions.js.map +1 -0
- package/dist/src/utils/dockerCompose.d.ts +3 -0
- package/dist/src/utils/dockerCompose.d.ts.map +1 -1
- package/dist/src/utils/dockerCompose.js +45 -4
- package/dist/src/utils/dockerCompose.js.map +1 -1
- package/dist/src/utils/instance/environment.d.ts +1 -1
- package/dist/src/utils/instance/environment.d.ts.map +1 -1
- package/dist/src/utils/migrations.d.ts +2 -2
- package/dist/src/utils/migrations.d.ts.map +1 -1
- package/dist/src/utils/migrations.js +1 -1
- package/dist/src/utils/migrations.js.map +1 -1
- package/dist/src/utils/schema/collectReferences.d.ts +2 -2
- package/dist/src/utils/schema/collectReferences.d.ts.map +1 -1
- package/dist/src/utils/system/index.d.ts +2 -2
- package/dist/src/utils/system/index.d.ts.map +1 -1
- package/dist/src/utils/system/index.js +1 -1
- package/dist/src/utils/system/index.js.map +1 -1
- package/dist/src/utils/tenant.d.ts +2 -2
- package/dist/src/utils/tenant.d.ts.map +1 -1
- package/dist/src/utils/yaml.d.ts +1 -1
- package/dist/src/utils/yaml.d.ts.map +1 -1
- package/package.json +13 -11
- package/src/commands/migrations/MigrationExecuteCommand.ts +11 -29
- package/src/commands/migrations/MigrationValidationHelper.ts +8 -2
- package/src/commands/project/ProjectPrintSchemaCommand.ts +10 -6
- package/src/commands/workspace/WorkspaceUpdateApiCommand.ts +10 -8
- package/src/run.ts +7 -1
- package/src/utils/checkVersions.ts +58 -0
- package/src/utils/dockerCompose.ts +20 -3
- package/dist/src/utils/commands.d.ts +0 -21
- package/dist/src/utils/commands.d.ts.map +0 -1
- package/dist/src/utils/commands.js +0 -57
- package/dist/src/utils/commands.js.map +0 -1
- package/dist/src/utils/npm.d.ts +0 -6
- package/dist/src/utils/npm.d.ts.map +0 -1
- package/dist/src/utils/npm.js +0 -62
- package/dist/src/utils/npm.js.map +0 -1
- package/src/utils/commands.ts +0 -65
- package/src/utils/npm.ts +0 -63
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
2
|
-
|
|
2
|
+
type Args = {
|
|
3
3
|
source: string;
|
|
4
4
|
target: string;
|
|
5
5
|
};
|
|
6
|
-
|
|
6
|
+
type Options = {
|
|
7
7
|
'include-system'?: boolean;
|
|
8
8
|
yes: boolean;
|
|
9
9
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransferCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/transfer/TransferCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAMvF,
|
|
1
|
+
{"version":3,"file":"TransferCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/transfer/TransferCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAMvF,KAAK,IAAI,GAAG;IACX,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACd,CAAA;AACD,KAAK,OAAO,GAAG;IACd,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,GAAG,EAAE,OAAO,CAAA;CACZ,CAAA;AAED,qBAAa,eAAgB,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAEzD,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAW7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;CAqC5E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/commands/transfer/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAU,MAAM,aAAa,CAAA;AAG9C,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAMxD,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/commands/transfer/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAU,MAAM,aAAa,CAAA;AAG9C,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAMxD,MAAM,MAAM,eAAe,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,cAAc;;eAA2E,SAAS;MAAK,QAAQ,eAAe,CAc1I,CAAA;AAED,eAAO,MAAM,UAAU;YAAqF,QAAQ;aAAW,eAAe;6BAA2B,MAAM,KAAK,IAAI;mCA4CvL,CAAA;AAED,eAAO,MAAM,UAAU;aAAsF,eAAe;mBAAiB,OAAO;YAAU,OAAO;mCAYpK,CAAA;AA4BD,eAAO,MAAM,aAAa,UAAiB,MAAM,EAAE,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,CAAC,KAAG,QAAQ,OAAO,CAgBvF,CAAA"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common';
|
|
2
|
-
|
|
2
|
+
type Args = {
|
|
3
3
|
version: string;
|
|
4
4
|
};
|
|
5
|
-
|
|
5
|
+
type Options = {};
|
|
6
6
|
export declare class WorkspaceUpdateApiCommand extends Command<Args, Options> {
|
|
7
7
|
private readonly workspace;
|
|
8
8
|
constructor(workspace: Workspace);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceUpdateApiCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/workspace/WorkspaceUpdateApiCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"WorkspaceUpdateApiCommand.d.ts","sourceRoot":"","sources":["../../../../src/commands/workspace/WorkspaceUpdateApiCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAIvF,KAAK,IAAI,GAAG;IACX,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAED,KAAK,OAAO,GAAG,EAAE,CAAA;AAEjB,qBAAa,yBAA0B,SAAQ,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;IAEnE,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAKtC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAI;cAK7D,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAgDnE"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.WorkspaceUpdateApiCommand = void 0;
|
|
4
4
|
const cli_common_1 = require("@contember/cli-common");
|
|
5
|
-
const npm_1 = require("../../utils/npm");
|
|
6
5
|
const workspace_1 = require("../../utils/workspace");
|
|
7
6
|
const dockerCompose_1 = require("../../utils/dockerCompose");
|
|
8
7
|
class WorkspaceUpdateApiCommand extends cli_common_1.Command {
|
|
@@ -17,9 +16,12 @@ class WorkspaceUpdateApiCommand extends cli_common_1.Command {
|
|
|
17
16
|
async execute(input) {
|
|
18
17
|
const version = input.getArgument('version');
|
|
19
18
|
const workspace = this.workspace;
|
|
20
|
-
const
|
|
21
|
-
await
|
|
22
|
-
|
|
19
|
+
const packageWorkspace = await workspace.resolvePackageWorkspace();
|
|
20
|
+
await packageWorkspace.updateEverywhere({
|
|
21
|
+
'@contember/schema': version,
|
|
22
|
+
'@contember/schema-definition': version,
|
|
23
|
+
'@contember/cli': version,
|
|
24
|
+
});
|
|
23
25
|
const updatedYaml = await (0, workspace_1.updateWorkspaceApiVersion)(workspace, version);
|
|
24
26
|
if (updatedYaml) {
|
|
25
27
|
console.log(`${updatedYaml} updated`);
|
|
@@ -29,8 +31,8 @@ class WorkspaceUpdateApiCommand extends cli_common_1.Command {
|
|
|
29
31
|
}
|
|
30
32
|
console.log('Updating docker-compose');
|
|
31
33
|
const getNewImage = (currentImage) => {
|
|
32
|
-
for (const candidate of
|
|
33
|
-
if (
|
|
34
|
+
for (const candidate of dockerCompose_1.contemberDockerImages) {
|
|
35
|
+
if (currentImage.startsWith(`${candidate}:`)) {
|
|
34
36
|
return `${candidate}:${version}`;
|
|
35
37
|
}
|
|
36
38
|
}
|
|
@@ -43,7 +45,7 @@ class WorkspaceUpdateApiCommand extends cli_common_1.Command {
|
|
|
43
45
|
services: Object.fromEntries(Object.entries((_a = data === null || data === void 0 ? void 0 : data.services) !== null && _a !== void 0 ? _a : {}).map(([name, service]) => {
|
|
44
46
|
const newImage = getNewImage(service.image);
|
|
45
47
|
if (newImage) {
|
|
46
|
-
console.log(`docker-compose service ${
|
|
48
|
+
console.log(`docker-compose service ${name} updated`);
|
|
47
49
|
return [
|
|
48
50
|
name,
|
|
49
51
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceUpdateApiCommand.js","sourceRoot":"","sources":["../../../../src/commands/workspace/WorkspaceUpdateApiCommand.ts"],"names":[],"mappings":";;;AAAA,sDAAuF;AACvF,
|
|
1
|
+
{"version":3,"file":"WorkspaceUpdateApiCommand.js","sourceRoot":"","sources":["../../../../src/commands/workspace/WorkspaceUpdateApiCommand.ts"],"names":[],"mappings":";;;AAAA,sDAAuF;AACvF,qDAAiE;AACjE,6DAAgG;AAQhG,MAAa,yBAA0B,SAAQ,oBAAsB;IACpE,YACkB,SAAoB;QAErC,KAAK,EAAE,CAAA;QAFU,cAAS,GAAT,SAAS,CAAW;IAGtC,CAAC;IAES,SAAS,CAAC,aAAkD;QACrE,aAAa,CAAC,WAAW,CAAC,wDAAwD,CAAC,CAAA;QACnF,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;IAClC,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,KAA2B;QAClD,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;QAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;QAChC,MAAM,gBAAgB,GAAG,MAAM,SAAS,CAAC,uBAAuB,EAAE,CAAA;QAElE,MAAM,gBAAgB,CAAC,gBAAgB,CAAC;YACvC,mBAAmB,EAAE,OAAO;YAC5B,8BAA8B,EAAE,OAAO;YACvC,gBAAgB,EAAE,OAAO;SACzB,CAAC,CAAA;QAEF,MAAM,WAAW,GAAG,MAAM,IAAA,qCAAyB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAEvE,IAAI,WAAW,EAAE;YAChB,OAAO,CAAC,GAAG,CAAC,GAAG,WAAW,UAAU,CAAC,CAAA;SACrC;aAAM;YACN,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAA;SACjD;QAED,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;QACtC,MAAM,WAAW,GAAG,CAAC,YAAoB,EAAiB,EAAE;YAC3D,KAAK,MAAM,SAAS,IAAI,qCAAqB,EAAE;gBAC9C,IAAI,YAAY,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,CAAC,EAAE;oBAC7C,OAAO,GAAG,SAAS,IAAI,OAAO,EAAE,CAAA;iBAChC;aACD;YACD,OAAO,IAAI,CAAA;QACZ,CAAC,CAAA;QACD,MAAM,IAAA,6CAA6B,EAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE;;YAAC,OAAA,CAAC;gBACjE,GAAG,IAAI;gBACP,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAgB,EAAE,EAAE;oBACxG,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;oBAC3C,IAAI,QAAQ,EAAE;wBACb,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,UAAU,CAAC,CAAA;wBACrD,OAAO;4BACN,IAAI;4BACJ;gCACC,GAAG,OAAO;gCACV,KAAK,EAAE,QAAQ;6BACf;yBACD,CAAA;qBACD;oBACD,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;gBACvB,CAAC,CAAC,CAAC;aACH,CAAC,CAAA;SAAA,CAAC,CAAA;QACH,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;QACnC,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;IAC/C,CAAC;CACD;AA5DD,8DA4DC"}
|
package/dist/src/run.js
CHANGED
|
@@ -6,8 +6,12 @@ const commands_1 = require("./commands");
|
|
|
6
6
|
const ExportCommand_1 = require("./commands/transfer/ExportCommand");
|
|
7
7
|
const ImportCommand_1 = require("./commands/transfer/ImportCommand");
|
|
8
8
|
const TransferCommand_1 = require("./commands/transfer/TransferCommand");
|
|
9
|
+
const checkVersions_1 = require("./utils/checkVersions");
|
|
9
10
|
(async () => {
|
|
10
11
|
const workspace = await cli_common_1.Workspace.get(process.cwd());
|
|
12
|
+
if (!process.env.CONTEMBER_SKIP_VERSION_CHECK) {
|
|
13
|
+
await (0, checkVersions_1.checkVersions)(workspace);
|
|
14
|
+
}
|
|
11
15
|
const commands = {
|
|
12
16
|
['deploy']: () => new commands_1.DeployCommand(workspace),
|
|
13
17
|
['version']: () => new commands_1.VersionCommand(),
|
package/dist/src/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/run.ts"],"names":[],"mappings":";;;AACA,sDAAqH;AACrH,yCAkBmB;AACnB,qEAAiE;AACjE,qEAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/run.ts"],"names":[],"mappings":"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"}
|