jitsu-cli 1.10.4 → 2.14.0-beta.5

package/package.json

@@ -1,23 +1,41 @@
 {
   "name": "jitsu-cli",
-  "version": "1.10.4",
+  "version": "2.14.0-beta.5",
   "description": "",
   "author": "Jitsu Dev Team <dev@jitsu.com>",
   "publishConfig": {
     "access": "public"
   },
-  "bin": "./bin/jitsu-cli",
+  "bin": {
+    "jitsu-cli": "./bin/jitsu-cli"
+  },
   "license": "MIT",
   "private": false,
+  "scripts": {
+    "clean": "rm -rf ./dist",
+    "typecheck": "tsc --noEmit",
+    "build": "tsc -p . && webpack",
+    "run": "pnpm build && node dist/main.js",
+    "login": "pnpm build && node dist/main.js login",
+    "init child": "pnpm build && node dist/main.js init",
+    "build child": "pnpm build && node dist/main.js build",
+    "run child": "pnpm build && node dist/main.js run -e ./data/page.json",
+    "test child": "pnpm build && node dist/main.js test",
+    "deploy child": "pnpm build && node dist/main.js deploy"
+  },
   "dependencies": {
     "figlet": "^1.6.0",
     "jest-cli": "^29.7.0",
-    "tslib": "^2.6.3",
-    "typescript": "^5.6.3"
+    "tslib": "catalog:",
+    "typescript": "catalog:"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.23.2",
-    "@babel/preset-typescript": "^7.23.2",
+    "@swc-node/register": "catalog:",
+    "swc-loader": "catalog:",
+    "@swc/core": "catalog:",
+    "@jitsu/common-config": "workspace:*",
+    "@jitsu/functions-lib": "workspace:*",
+    "@jitsu/protocols": "workspace:*",
     "@rollup/plugin-commonjs": "^28.0.2",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^16.0.0",
@@ -27,12 +45,11 @@
     "@types/commander": "^2.12.2",
     "@types/express": "^4.17.21",
     "@types/inquirer": "^9.0.3",
-    "@types/jest": "^29.5.5",
-    "@types/lodash": "^4.14.198",
-    "@types/node": "^18.15.3",
+    "@types/lodash": "catalog:",
+    "@types/node": "catalog:",
+    "@vitest/ui": "catalog:",
     "@types/webpack": "^5.28.5",
     "@webpack-cli/generators": "^3.0.7",
-    "babel-loader": "^9.1.3",
     "chalk": "^5.3.0",
     "commander": "^11.0.0",
     "cross-fetch": "^4.0.0",
@@ -41,31 +58,17 @@
     "inquirer": "^9.2.11",
     "jest": "^29.7.0",
     "json5": "^2.2.3",
-    "lodash": "^4.17.21",
+    "juava": "workspace:*",
+    "lodash": "catalog:",
     "node-fetch": "^3.3.2",
     "node-loader": "^2.0.0",
     "prismjs": "^1.30.0",
     "rollup": "^3.29.5",
     "semver": "^7.5.4",
-    "ts-jest": "^29.1.1",
     "ts-loader": "^9.5.1",
-    "ts-node": "^10.9.2",
-    "webpack": "^5.99.5",
-    "webpack-cli": "^6.0.1",
-    "@jitsu/functions-lib": "1.10.4",
-    "juava": "1.10.4",
-    "@jitsu/protocols": "1.10.4"
-  },
-  "scripts": {
-    "clean": "rm -rf ./dist",
-    "compile": "tsc -p . ",
-    "build": "pnpm compile && webpack",
-    "run": "pnpm build && node dist/main.js",
-    "login": "pnpm build && node dist/main.js login",
-    "init child": "pnpm build && node dist/main.js init",
-    "build child": "pnpm build && node dist/main.js build",
-    "run child": "pnpm build && node dist/main.js run -e ./data/page.json",
-    "test child": "pnpm build && node dist/main.js test",
-    "deploy child": "pnpm build && node dist/main.js deploy"
+    "ts-node": "catalog:",
+    "vitest": "catalog:",
+    "webpack": "catalog:",
+    "webpack-cli": "catalog:"
   }
-}
+}

package/src/commands/build.ts

@@ -128,7 +128,6 @@ function checkTypescript(projectDir: string): string[] | void {
     console.info(`No ${b("tsconfig.json")} file found in ${b(projectDir)}. Assuming JavaScript project`);
     return;
   }
-  console.log(`Checking TypeScript files in ${b(projectDir)}`);
   let compilerOptions: ts.CompilerOptions = {};
   let filenames: string[] = [];
   const tsconfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
@@ -137,6 +136,7 @@ function checkTypescript(projectDir: string): string[] | void {
     typeRoots: [path.resolve(projectDir, "node_modules", "@types")],
     checkJs: true,
     allowJs: true,
+    skipLibCheck: true,
     noEmit: true,
     esModuleInterop: typeof compilerOptions.esModuleInterop !== "undefined" ? compilerOptions.esModuleInterop : true,
     moduleResolution:

package/src/commands/login.ts

@@ -35,7 +35,9 @@ export async function logout({ force }: { force?: boolean }) {
 }
 
 export async function login({ host, apikey, force }: { host: string; apikey?: string; force?: boolean }) {
-  const jitsuFile = `${homedir()}/.jitsu/jitsu-cli.json`;
+  const jitsuDir = `${homedir()}/.jitsu`;
+  fs.mkdirSync(jitsuDir, { recursive: true });
+  const jitsuFile = `${jitsuDir}/jitsu-cli.json`;
   if (fs.existsSync(jitsuFile) && !force) {
     const loginInfo = JSON.parse(readFileSync(jitsuFile, { encoding: "utf-8" }));
     console.error(

package/tsconfig.json

@@ -1,26 +1,9 @@
 {
+  "extends": "@jitsu/common-config/tsconfig.json",
   "compilerOptions": {
     "outDir": "./compiled",
-    "rootDir": ".",
-    "noImplicitAny": false,
-    "allowSyntheticDefaultImports": true,
-    "importHelpers": true,
-    "removeComments": true,
-    "target": "ES2021",
-    "module": "commonjs",
-    "lib": [
-      "dom","esnext"
-    ],
-    "allowJs": true,
-    "strict": true,
-    "esModuleInterop": true,
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "skipLibCheck": true
+    "rootDir": "."
   },
-  "exclude": [
-    "node_modules"
-  ],
   "include": [
     "src/**/*"
   ]

package/{webpack.config.js → webpack.config.cjs}

@@ -27,8 +27,12 @@ const config = {
     rules: [
       {
         test: /\.(ts|tsx)$/i,
+        exclude: /node_modules/,
         use: {
-          loader: "babel-loader",
+          loader: "swc-loader",
+          options: {
+            configFile: path.resolve(__dirname, "../../libs/common-config/swc.config.json"),
+          },
         },
       },
       {

package/.turbo/turbo-build.log

@@ -1,28 +0,0 @@
-jitsu-cli:build: cache hit, replaying output dcca113b76fcc4b6
-jitsu-cli:build: 
-jitsu-cli:build: > jitsu-cli@0.0.0 build /Users/ildarnurislamov/Projects/newjitsu/cli/jitsu-cli
-jitsu-cli:build: > pnpm compile && webpack
-jitsu-cli:build: 
-jitsu-cli:build: 
-jitsu-cli:build: > jitsu-cli@0.0.0 compile /Users/ildarnurislamov/Projects/newjitsu/cli/jitsu-cli
-jitsu-cli:build: > tsc -p . 
-jitsu-cli:build: 
-jitsu-cli:build: asset main.js 3.45 MiB [emitted] (name: main) 1 related asset
-jitsu-cli:build: asset 233.js 130 KiB [emitted] (id hint: vendors) 1 related asset
-jitsu-cli:build: asset 445e7f36f8a19c2bf682.js 37.3 KiB [emitted] [immutable] [from: ../../node_modules/.pnpm/@rollup+plugin-typescript@11.1.6_rollup@3.29.5_tslib@2.8.0_typescript@5.6.3/node_modules/@rollup/plugin-typescript/dist/es/index.js] (auxiliary name: main)
-jitsu-cli:build: asset 140.js 10 KiB [emitted] 1 related asset
-jitsu-cli:build: orphan modules 574 KiB [orphan] 100 modules
-jitsu-cli:build: runtime modules 3.62 KiB 10 modules
-jitsu-cli:build: cacheable modules 2.84 MiB (javascript) 37.3 KiB (asset)
-jitsu-cli:build:   javascript modules 2.49 MiB 428 modules
-jitsu-cli:build:   json modules 363 KiB
-jitsu-cli:build:     modules by path ../../node_modules/.pnpm/iconv-lite@0.4.24/node_modules/iconv-lite/ 86.7 KiB
-jitsu-cli:build:       ../../node_modules/.pnpm/iconv-lite@0.4.24/node_modules/iconv-lite/encodings/tab...(truncated) 8.78 KiB [built] [code generated]
-jitsu-cli:build:       + 7 modules
-jitsu-cli:build:     + 4 modules
-jitsu-cli:build:   ../../node_modules/.pnpm/@rollup+plugin-typescript@11.1.6_rollup@3.29.5_tslib@2....(truncated) 37.3 KiB (asset) 42 bytes (javascript) [built] [code generated]
-jitsu-cli:build: optional modules 84 bytes [optional]
-jitsu-cli:build:   external "worker_threads" 42 bytes [optional] [built] [code generated]
-jitsu-cli:build:   external "node:stream/web" 42 bytes [optional] [built] [code generated]
-jitsu-cli:build: + 26 modules
-jitsu-cli:build: webpack 5.99.5 compiled successfully in 4904 ms

package/.turbo/turbo-clean.log

@@ -1,5 +0,0 @@
-jitsu-cli:clean: cache hit, replaying output fc669d593044a2dc
-jitsu-cli:clean: 
-jitsu-cli:clean: > jitsu-cli@0.0.0 clean /Users/ildarnurislamov/Projects/newjitsu/cli/jitsu-cli
-jitsu-cli:clean: > rm -rf ./dist
-jitsu-cli:clean: 

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Jitsu Labs, Inc
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/babel.config.cjs

@@ -1,4 +0,0 @@
-module.exports = {
-  presets: ["@babel/preset-env", "@babel/preset-typescript"],
-  plugins: [],
-};