From 84cb82ff23cf474f29c6e42615e9bcdd1a032291 Mon Sep 17 00:00:00 2001
From: Rafal Galka <rgalka@coldrun.com>
Date: Wed, 9 Oct 2024 00:34:54 +0200
Subject: [PATCH] fix(package): pnpm workspace packages filtering

---
 eslint.config.js                 | 4 ----
 package.json                     | 2 +-
 packages/playground/package.json | 4 ++--
 packages/playground/src/main.ts  | 2 +-
 packages/shared/package.json     | 2 +-
 pnpm-lock.yaml                   | 2 +-
 pnpm-workspace.yaml              | 2 +-
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/eslint.config.js b/eslint.config.js
index 55e2ff1..ee061a3 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,12 +1,9 @@
-import { createRequire } from 'module';
 import pluginJs from '@eslint/js';
 import configPrettier from 'eslint-config-prettier';
 import pluginImportX from 'eslint-plugin-import-x';
 import globals from 'globals';
 import { config, configs as configsTs, parser } from 'typescript-eslint';
 
-const pkg = createRequire(import.meta.url)('./package.json');
-
 export default config(
   {
     files: ['**/*.{js,mjs,cjs,jsx,ts,cts,mts,tsx,vue}'],
@@ -20,7 +17,6 @@ export default config(
   {
     settings: {
       'import-x/resolver': { typescript: true, node: true },
-      'import-x/internal-regex': RegExp(`^${pkg.name}.*`),
     },
     rules: {
       'import-x/order': ['error', { alphabetize: { order: 'asc' } }],
diff --git a/package.json b/package.json
index 387bc12..9a59f68 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@coldrun/monorepo-typescript",
+  "name": "monorepo-typescript",
   "private": true,
   "author": "Coldrun <info@coldrun.com>",
   "type": "module",
diff --git a/packages/playground/package.json b/packages/playground/package.json
index 1a27879..d44528a 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@coldrun/monorepo-typescript-playground",
+  "name": "@monorepo-typescript/playground",
   "private": true,
   "version": "0.1.0",
   "type": "module",
@@ -10,7 +10,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@coldrun/monorepo-typescript-shared": "workspace:*"
+    "@monorepo-typescript/shared": "workspace:*"
   },
   "devDependencies": {
     "vite": "^5.4.3"
diff --git a/packages/playground/src/main.ts b/packages/playground/src/main.ts
index 179225a..4e9ac8f 100644
--- a/packages/playground/src/main.ts
+++ b/packages/playground/src/main.ts
@@ -1,8 +1,8 @@
 import './style.css';
+import { isCallable } from '@monorepo-typescript/shared';
 import viteLogo from '../public/vite.svg';
 import { setupCounter } from './counter.ts';
 import typescriptLogo from './typescript.svg';
-import { isCallable } from '@coldrun/monorepo-typescript-shared';
 
 document.querySelector<HTMLDivElement>('#app')!.innerHTML = `
   <div>
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 74aef4e..ca09d05 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@coldrun/monorepo-typescript-shared",
+  "name": "@monorepo-typescript/shared",
   "private": true,
   "version": "0.1.0",
   "type": "module",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2a2a2f4..22f9ab6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -68,7 +68,7 @@ importers:
 
   packages/playground:
     dependencies:
-      '@coldrun/monorepo-typescript-shared':
+      '@monorepo-typescript/shared':
         specifier: workspace:*
         version: link:../shared
     devDependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 18ec407..9c9be4b 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,2 +1,2 @@
 packages:
-  - 'packages/*'
+  - "packages/**"