@contember/cli 2.0.0-alpha.31 → 2.0.0-alpha.35

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@contember/cli",
-  "version": "2.0.0-alpha.31",
+  "version": "2.0.0-alpha.35",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/production/run.js"
   },
+  "type": "module",
   "scripts": {
     "build": "tailwindcss -i src/lib/project/docs/resources/style.css -o ./dist/resources/out.css"
   },
@@ -19,22 +20,21 @@
     "tailwindcss": "^3.4.14"
   },
   "dependencies": {
-    "@contember/cli-common": "2.0.0-alpha.31",
-    "@contember/config-loader": "2.0.0-alpha.31",
-    "@contember/database": "2.0.0-alpha.31",
-    "@contember/dic": "2.0.0-alpha.31",
-    "@contember/engine-common": "2.0.0-alpha.31",
-    "@contember/engine-content-api": "2.0.0-alpha.31",
-    "@contember/graphql-client": "2.0.0-alpha.31",
-    "@contember/migrations-client": "2.0.0-alpha.31",
-    "@contember/schema": "2.0.0-alpha.31",
-    "@contember/schema-migrations": "2.0.0-alpha.31",
-    "@contember/schema-utils": "2.0.0-alpha.31",
-    "@contember/typesafe": "2.0.0-alpha.31",
+    "@contember/cli-common": "2.0.0-alpha.35",
+    "@contember/config-loader": "2.0.0-alpha.35",
+    "@contember/database": "2.0.0-alpha.35",
+    "@contember/dic": "2.0.0-alpha.35",
+    "@contember/engine-common": "2.0.0-alpha.35",
+    "@contember/engine-content-api": "2.0.0-alpha.35",
+    "@contember/graphql-client": "2.0.0-alpha.35",
+    "@contember/migrations-client": "2.0.0-alpha.35",
+    "@contember/schema": "2.0.0-alpha.35",
+    "@contember/schema-migrations": "2.0.0-alpha.35",
+    "@contember/schema-utils": "2.0.0-alpha.35",
+    "@contember/typesafe": "2.0.0-alpha.35",
     "@graphql-tools/schema": "^10.0.7",
     "chalk": "^5.3.0",
     "chalk-table": "^1.0.2",
-    "esbuild": "^0.21.5",
     "fast-glob": "^3.3.2",
     "graphql": "^16.9.0",
     "js-yaml": "^4.1.0",
@@ -45,5 +45,8 @@
     "prompts": "^2.4.2",
     "semver": "^7.6.3",
     "yawn-yaml": "^2.3.0"
+  },
+  "peerDependencies": {
+    "esbuild": "*"
   }
-}
+}

package/src/lib/js/EsBuildBuilder.ts

@@ -1,8 +1,8 @@
 import { JsBuilder } from './JsBuilder'
-import * as esbuild from 'esbuild'
 
 export class EsBuildBuilder implements JsBuilder {
 	async build(path: string): Promise<string> {
+		const esbuild = await import('esbuild')
 		const response = await esbuild.build({
 			entryPoints: [path],
 			platform: 'node',

package/src/lib/migrations/MigrationPrinter.ts

@@ -1,3 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/triple-slash-reference
+/// <reference path="../../../types/chalk-table/index.d.ts" />
+
 import { Schema } from '@contember/schema'
 import chalk from 'chalk'
 import { AnyMigrationStatus, Migration, MigrationDescriber, MigrationState } from '@contember/migrations-client'

package/tsconfig.settings.json

@@ -1,7 +1,6 @@
 {
 	"compilerOptions": {
 		"esModuleInterop": true,
-		"typeRoots": ["./types", "./node_modules/@types"]
 	},
 	"extends": "../../tsconfig.settings.json"
 }

package/Dockerfile

@@ -1,20 +0,0 @@
-FROM node:20-alpine as builder
-
-WORKDIR /src
-RUN apk --no-cache add bash
-RUN apk --no-cache add build-base python3
-COPY ./ ./
-RUN test ! -f yarn.tar.gz || tar xf yarn.tar.gz -C "./.yarn/cache" .
-RUN /src/packages/cli/build.sh
-
-FROM node:20-alpine
-
-WORKDIR /src
-ENV NODE_ENV "production"
-
-COPY --from=builder /src/dist/ /opt/contember/
-COPY --from=builder /src/packages/cli/dist/resources/ /opt/contember/dist/resources/
-COPY --from=builder /src/packages/cli/package.json /opt/contember/package.json
-RUN ln -s /opt/contember/run.js /usr/bin/contember
-ENV CONTEMBER_CLI_PACKAGE_ROOT /opt/contember
-ENTRYPOINT ["node", "/opt/contember/run.js"]

package/build.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-set -e
-
-mkdir --parent dist
-yarn install
-yarn workspace @contember/cli build
-node packages/cli/esbuild.cjs
-cd dist
-echo "{}" > package.json
-echo "" > yarn.lock
-yarn add esbuild@^0.14.14 vm2@^3.9.9

package/esbuild.cjs

@@ -1,27 +0,0 @@
-const esbuild = require('esbuild')
-const path = require('path')
-
-const root = path.dirname(path.dirname(__dirname))
-
-esbuild.build({
-	entryPoints: ['./packages/cli/src/run.ts'],
-	bundle: true,
-	platform: 'node',
-	sourcemap: 'external',
-	outfile: './dist/run.js',
-	plugins: [
-		{
-			name: 'resolve contember',
-			setup(build) {
-				build.onResolve({filter: /^@contember\/.+$/}, args => {
-					const pkg = args.path.match(/@contember\/(.+)/)[1]
-					return {path: path.join(root, 'packages', pkg, pkg.includes('/') ? 'index.ts' : 'src/index.ts')}
-				})
-			},
-		},
-	],
-	external: ['pg-native', 'electron', 'esbuild', 'vm2'],
-}).catch(e => {
-	console.error(e)
-	process.exit(1)
-})