@contember/cli 2.0.0-alpha.8 → 2.0.0-alpha.9

package/Dockerfile

@@ -14,7 +14,6 @@ ENV NODE_ENV "production"
 
 COPY --from=builder /src/dist/ /opt/contember/
 COPY --from=builder /src/packages/cli/dist/src/utils/project/resources/out.css /opt/contember/resources/out.css
-COPY --from=builder /src/packages/cli-common/resources /opt/contember/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

package/build.sh

@@ -4,7 +4,7 @@ set -e
 mkdir --parent dist
 yarn install
 yarn workspace @contember/cli build
-node packages/cli/esbuild.js
+node packages/cli/esbuild.cjs
 cd dist
 echo "{}" > package.json
 echo "" > yarn.lock

package/esbuild.cjs

@@ -0,0 +1,27 @@
+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)
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/cli",
-  "version": "2.0.0-alpha.8",
+  "version": "2.0.0-alpha.9",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/src/run.js"
@@ -19,17 +19,17 @@
     "tailwindcss": "^3.3.5"
   },
   "dependencies": {
-    "@contember/cli-common": "2.0.0-alpha.8",
-    "@contember/config-loader": "2.0.0-alpha.8",
-    "@contember/database": "2.0.0-alpha.8",
-    "@contember/dic": "2.0.0-alpha.8",
-    "@contember/engine-common": "2.0.0-alpha.8",
-    "@contember/engine-content-api": "2.0.0-alpha.8",
-    "@contember/migrations-client": "2.0.0-alpha.8",
-    "@contember/schema": "2.0.0-alpha.8",
-    "@contember/schema-migrations": "2.0.0-alpha.8",
-    "@contember/schema-utils": "2.0.0-alpha.8",
-    "@contember/typesafe": "2.0.0-alpha.8",
+    "@contember/cli-common": "2.0.0-alpha.9",
+    "@contember/config-loader": "2.0.0-alpha.9",
+    "@contember/database": "2.0.0-alpha.9",
+    "@contember/dic": "2.0.0-alpha.9",
+    "@contember/engine-common": "2.0.0-alpha.9",
+    "@contember/engine-content-api": "2.0.0-alpha.9",
+    "@contember/migrations-client": "2.0.0-alpha.9",
+    "@contember/schema": "2.0.0-alpha.9",
+    "@contember/schema-migrations": "2.0.0-alpha.9",
+    "@contember/schema-utils": "2.0.0-alpha.9",
+    "@contember/typesafe": "2.0.0-alpha.9",
     "@graphql-tools/schema": "^10.0.0",
     "chalk": "^4.1.2",
     "chalk-table": "^1.0.2",

package/esbuild.js

@@ -1,15 +0,0 @@
-const esbuild = require('esbuild')
-const { resolvePlugin } = require('../../scripts/esbuild/esbuild')
-
-esbuild.build({
-	entryPoints: ['./packages/cli/src/run.ts'],
-	bundle: true,
-	platform: 'node',
-	sourcemap: 'external',
-	outfile: './dist/run.js',
-	plugins: [resolvePlugin],
-	external: ['pg-native', 'electron', 'esbuild', 'vm2'],
-}).catch(e => {
-	console.error(e)
-	process.exit(1)
-})