chore: release new version

kedrzu · Feb 21, 2025 · 92ae57d · 92ae57d
2 parents 7128d4f + 72b525c
commit 92ae57d
Show file tree

Hide file tree

Showing 171 changed files with 2,973 additions and 1,984 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1,6 @@
 node_modules
 dist
-.eslintrc.cjs
+.eslintrc.cjs
+# smoke tests mostly
+*.cjs
+*.mjs
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,7 +5,7 @@
 
 version: 2
 updates:
-  - package-ecosystem: "" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: 'npm' # See documentation for possible values
+    directory: '/' # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: 'weekly'
diff --git a/.github/workflows/update-yarn-lock.yml → .github/workflows/check-commit.yml b/.github/workflows/update-yarn-lock.yml → .github/workflows/check-commit.yml
@@ -1,27 +1,21 @@
-name: Update yarn.lock file
+name: Check commit
 on:
   push:
-    branches: [main]
+    branches: [main, release]
 jobs:
-  release:
+  check-commit:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: latest
 
-      - name: Setup Git
-        run: |
-          git config --local user.email "actions@github.com"
-          git config --local user.name "Github Actions"
-
       - run: yarn install
         env:
           YARN_ENABLE_IMMUTABLE_INSTALLS: false
 
-      - name: Check for changes
-        id: check_changes
+      - name: Commit yarn.lock changes
         run: |
           if git diff --exit-code; then
             echo "No changes to commit."
@@ -31,3 +25,8 @@ jobs:
             git commit -a -m "chore: update yarn.lock"
             git push
           fi
+
+      - run: yarn setup
+      - run: yarn build
+      - run: yarn test
+      - run: yarn smoke
diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
@@ -35,10 +35,10 @@ jobs:
           node-version: latest
 
       - run: yarn install
-        env:
-          YARN_ENABLE_IMMUTABLE_INSTALLS: false
-      - run: yarn turbo run build
+      - run: yarn setup
+      - run: yarn build
       - run: yarn test
+      - run: yarn smoke
 
       - run: yarn release
         if: ${{ inputs.dry_run != true }}
@@ -51,3 +51,14 @@ jobs:
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/checkout@v4
+        if: ${{ inputs.dry_run != true }}
+        with:
+          ref: main
+
+      - name: Merge release to main
+        if: ${{ inputs.dry_run != true }}
+        run: |
+          git merge --no-ff release -m "chore: auto-merge release -> main"
+          git push
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,8 @@ dist/
 
 # TypeScript cache
 *.tsbuildinfo
+*.tsbuildinfo.cjs
+*.tsbuildinfo.esm
 
 # Eslint cache
 .eslintcache
@@ -22,8 +24,8 @@ yarn-error.log
 
 .turbo
 .env
-./tsconfig.json
-tsconfig.dev.json
+tsconfig.cjs.dev.json
+tsconfig.esm.dev.json
 
 .nx/cache
-.nx/workspace-data
+.nx/workspace-data
diff --git a/package.json b/package.json
@@ -10,33 +10,42 @@
         "packages/*"
     ],
     "scripts": {
-        "setup": "yarn && turbo run build && yarn monorepo",
+        "setup": "turbo run build:esm --filter=@nzyme/cli && yarn monorepo",
         "monorepo": "nzyme monorepo",
-        "clean": "del  \"**/dist\" \"**/.tsbuildinfo\" \"!**/node_modules/**\"",
-        "build": "tsc --build tsconfig.dev.json",
-        "watch": "yarn build --watch",
+        "clean": "del \"**/tsconfig.*.dev.json\" \"**/dist\" \"**/.turbo\" \"**/.tsbuildinfo\" \"**/.tsbuildinfo.*\" \"!**/node_modules/**\"",
+        "build:esm": "tsc --build tsconfig.esm.dev.json",
+        "build:cjs": "tsc --build tsconfig.cjs.dev.json && yarn nzyme rename-cjs",
+        "build": "yarn build:esm && yarn build:cjs",
+        "build:turbo": "turbo run build:esm build:cjs",
+        "watch": "yarn build:esm --watch",
+        "watch:cjs": "yarn build:cjs --watch",
+        "smoke": "turbo run smoke:cjs smoke:mjs",
         "release": "nx release --yes",
         "dev": "yarn && yarn monorepo && yarn watch",
         "test": "vitest run",
         "coverage": "vitest run --coverage",
-        "upgrade": "yarn upgrade-interactive"
+        "upgrade": "yarn upgrade-interactive",
+        "groundup": "yarn && yarn clean &&yarn setup && yarn build"
     },
     "devDependencies": {
-        "@nx/js": "^20.3.1",
+        "@nx/js": "^20.4.6",
         "@nzyme/cli": "*",
         "@swc-node/register": "^1.10.9",
-        "@swc/core": "^1.10.7",
+        "@swc/core": "^1.10.18",
         "del-cli": "^6.0.0",
-        "nx": "20.3.1",
-        "prettier": "^3.4.2",
+        "nx": "20.4.6",
+        "prettier": "^3.5.1",
         "ts-node": "^10.9.2",
-        "turbo": "^2.3.3",
+        "turbo": "^2.4.2",
         "typescript": "^5.7.3",
-        "vitest": "^3.0.1"
+        "vitest": "^3.0.6"
     },
     "depcheck": {
         "ignoreDeps": [
             "*"
         ]
+    },
+    "dependencies": {
+        "tslib": "^2.8.1"
     }
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -7,61 +7,64 @@
         "url": "git+https://github.com/kedrzu/nzyme.git"
     },
     "author": "Michał Kędrzyński <m.kedrzynski@gmail.com>",
+    "type": "module",
     "publishConfig": {
         "access": "public"
     },
     "files": [
         "dist"
     ],
     "bin": {
-        "nzyme": "dist/cli.js"
+        "nzyme": "dist/esm/cli.js"
     },
-    "type": "module",
     "engines": {
         "node": ">=20"
     },
     "scripts": {
-        "build": "tsc",
-        "watch": "tsc --watch"
+        "build:esm": "tsc --build ./tsconfig.esm.json"
     },
     "dependencies": {
         "@lerna/package": "^6.4.1",
         "@lerna/project": "^6.4.1",
         "@nzyme/node-utils": "^0.5.0",
-        "@oclif/core": "^4.2.3",
-        "@oclif/plugin-help": "^6.2.21",
-        "@oclif/plugin-version": "^2.2.20",
+        "@nzyme/utils": "^0.5.0",
+        "@oclif/core": "^4.2.7",
+        "@oclif/plugin-help": "^6.2.25",
+        "@oclif/plugin-version": "^2.2.24",
         "@types/fs-extra": "^11.0.4",
         "chalk": "^5.4.1",
         "comment-json": "^4.2.5",
         "compare-versions": "^6.1.1",
         "consola": "^3.4.0",
         "depcheck": "^1.4.7",
+        "fast-glob": "^3.3.3",
         "fs-extra": "^11.3.0",
+        "glob": "^11.0.1",
         "lodash.merge": "^4.6.2",
-        "prettier": "^3.4.2",
-        "ts-node": "^10.9.2"
+        "prettier": "^3.5.1",
+        "ts-node": "^10.9.2",
+        "tslib": "^2.8.1"
     },
     "devDependencies": {
         "@nzyme/eslint": "^0.5.0",
         "@nzyme/tsconfig": "^0.5.0",
         "@types/lerna__package": "^5.1.3",
         "@types/lerna__project": "^5.1.2",
         "@types/lodash.merge": "^4.6.9",
-        "@types/node": "^22.10.7",
+        "@types/node": "^22.13.4",
         "@types/react": "^19.0.7",
         "@types/source-map-support": "^0.5.10",
         "eslint-plugin-react": "^7.37.4",
         "eslint-plugin-react-hooks": "^5.1.0",
-        "oclif": "^4.17.13",
+        "oclif": "^4.17.30",
         "ts-node": "^10.9.2",
         "typescript": "^5.7.3"
     },
     "oclif": {
         "bin": "nzyme",
         "commands": {
             "strategy": "explicit",
-            "target": "./dist/commands.js"
+            "target": "./dist/esm/commands.js"
         },
         "plugins": [
             "@oclif/plugin-help",

diff --git a/packages/cli/src/commands.ts b/packages/cli/src/commands.ts
@@ -1,5 +1,7 @@
 import { MonorepoCommand } from './commands/MonorepoCommand.js';
+import { RenameCjsCommand } from './commands/RenameCjsCommand.js';
 
 export default {
     monorepo: MonorepoCommand,
+    'rename-cjs': RenameCjsCommand,
 };