diff --git a/.vscode/settings.json b/.vscode/settings.json index 1e8082415c2..f56c6dd3e89 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "files.associations": { "turbo.json": "jsonc" - } -} \ No newline at end of file + }, + "eslint.workingDirectories": ["packages/*", "tests/*"] +} diff --git a/config/eslint/base.cjs b/config/eslint/base.cjs index 887487e8096..8dcbb9e9c9a 100644 --- a/config/eslint/base.cjs +++ b/config/eslint/base.cjs @@ -1,5 +1,17 @@ const path = require('path'); -const prettierPath = path.join(process.cwd(), '../../.prettierrc.js'); + +let isRoot = false; +try { + const dir = process.cwd(); + const pkg = require(path.join(dir, './package.json')); + if (pkg.name === 'root') { + isRoot = true; + } +} catch (e) { + console.log(e); +} + +const prettierPath = path.join(process.cwd(), isRoot ? './.prettierrc.js' : '../../.prettierrc.js'); const prettierConfig = require(prettierPath); function rules() { @@ -20,13 +32,13 @@ function rules() { 'prefer-rest-params': 'off', 'prefer-const': 'error', - "prettier/prettier": [ - "error", + 'prettier/prettier': [ + 'error', prettierConfig, { - "usePrettierrc": false - } - ] + usePrettierrc: false, + }, + ], }; } @@ -46,7 +58,7 @@ function settings() { node: false, es2022: true, }, - } + }; } module.exports = { diff --git a/config/package.json b/config/package.json index bc16f96fef6..1eb9e50fb25 100644 --- a/config/package.json +++ b/config/package.json @@ -13,7 +13,6 @@ "eslint-plugin-import": "^2.29.0", "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-simple-import-sort": "^10.0.0", - "pnpm-sync-dependencies-meta-injected": "0.0.10", "prettier": "^3.0.3", "typescript": "~5.2.2" }, diff --git a/packages/active-record/package.json b/packages/active-record/package.json index 7245fcacd1d..6e06e881316 100644 --- a/packages/active-record/package.json +++ b/packages/active-record/package.json @@ -39,9 +39,6 @@ "@ember/string": { "injected": true }, - "@warp-drive/internal-config": { - "injected": true - }, "@warp-drive/core-types": { "injected": true }, diff --git a/packages/adapter/package.json b/packages/adapter/package.json index e8b1e838b4c..e9b8253add7 100644 --- a/packages/adapter/package.json +++ b/packages/adapter/package.json @@ -59,9 +59,6 @@ "@ember/string": { "injected": true }, - "@warp-drive/internal-config": { - "injected": true - }, "@warp-drive/core-types": { "injected": true }, diff --git a/packages/core-types/package.json b/packages/core-types/package.json index 8baa18ed66d..911479017ac 100644 --- a/packages/core-types/package.json +++ b/packages/core-types/package.json @@ -47,9 +47,6 @@ "dependenciesMeta": { "@ember-data/private-build-infra": { "injected": true - }, - "@warp-drive/internal-config": { - "injected": true } }, "devDependencies": { diff --git a/packages/debug/package.json b/packages/debug/package.json index 8ff2faffcce..c7fc33cd580 100644 --- a/packages/debug/package.json +++ b/packages/debug/package.json @@ -31,9 +31,6 @@ "@ember-data/store": { "injected": true }, - "@warp-drive/internal-config": { - "injected": true - }, "@ember-data/request": { "injected": true }, diff --git a/packages/diagnostic/package.json b/packages/diagnostic/package.json index 39d3e818641..7cfb0b62a14 100644 --- a/packages/diagnostic/package.json +++ b/packages/diagnostic/package.json @@ -126,9 +126,5 @@ "ember": { "edition": "octane" }, - "dependenciesMeta": { - "@warp-drive/internal-config": { - "injected": true - } - } + "dependenciesMeta": {} } diff --git a/packages/graph/package.json b/packages/graph/package.json index 283eef4607e..7cef830913f 100644 --- a/packages/graph/package.json +++ b/packages/graph/package.json @@ -53,9 +53,6 @@ "@warp-drive/core-types": { "injected": true }, - "@warp-drive/internal-config": { - "injected": true - }, "@ember-data/request": { "injected": true }, diff --git a/packages/holodeck/package.json b/packages/holodeck/package.json index d6e99de16ec..b039eb64aee 100644 --- a/packages/holodeck/package.json +++ b/packages/holodeck/package.json @@ -90,9 +90,6 @@ "@ember-data/request": { "injected": true }, - "@warp-drive/internal-config": { - "injected": true - }, "@warp-drive/core-types": { "injected": true } diff --git a/packages/json-api/package.json b/packages/json-api/package.json index ac3f702dc3c..b8c9094340d 100644 --- a/packages/json-api/package.json +++ b/packages/json-api/package.json @@ -67,9 +67,6 @@ "@ember-data/private-build-infra": { "injected": true }, - "@warp-drive/internal-config": { - "injected": true - }, "@warp-drive/core-types": { "injected": true }, diff --git a/packages/legacy-compat/package.json b/packages/legacy-compat/package.json index ea47e288235..b9521bbf8a2 100644 --- a/packages/legacy-compat/package.json +++ b/packages/legacy-compat/package.json @@ -71,9 +71,6 @@ "@ember-data/json-api": { "injected": true }, - "@warp-drive/internal-config": { - "injected": true - }, "@ember-data/store": { "injected": true }, diff --git a/packages/model/package.json b/packages/model/package.json index fe9dc205f5a..06911adabfb 100644 --- a/packages/model/package.json +++ b/packages/model/package.json @@ -73,9 +73,6 @@ "@ember-data/private-build-infra": { "injected": true }, - "@warp-drive/internal-config": { - "injected": true - }, "@ember-data/store": { "injected": true }, diff --git a/packages/request-utils/package.json b/packages/request-utils/package.json index d1be39260f0..4b0d122f2c4 100644 --- a/packages/request-utils/package.json +++ b/packages/request-utils/package.json @@ -83,9 +83,6 @@ "dependenciesMeta": { "@warp-drive/core-types": { "injected": true - }, - "@warp-drive/internal-config": { - "injected": true } } } diff --git a/packages/request/package.json b/packages/request/package.json index 46ba3a84cf5..016c12db9a3 100644 --- a/packages/request/package.json +++ b/packages/request/package.json @@ -57,9 +57,6 @@ }, "@warp-drive/core-types": { "injected": true - }, - "@warp-drive/internal-config": { - "injected": true } }, "devDependencies": { diff --git a/packages/rest/package.json b/packages/rest/package.json index 8ac2ad1a087..c4738650053 100644 --- a/packages/rest/package.json +++ b/packages/rest/package.json @@ -91,9 +91,6 @@ "edition": "octane" }, "dependenciesMeta": { - "@warp-drive/internal-config": { - "injected": true - }, "@warp-drive/core-types": { "injected": true }, diff --git a/packages/serializer/package.json b/packages/serializer/package.json index 96134f7d9f3..9c95daee6dc 100644 --- a/packages/serializer/package.json +++ b/packages/serializer/package.json @@ -55,9 +55,6 @@ "@ember-data/private-build-infra": { "injected": true }, - "@warp-drive/internal-config": { - "injected": true - }, "@warp-drive/core-types": { "injected": true }, diff --git a/packages/store/package.json b/packages/store/package.json index 619b16aeffe..87c75235cd1 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -58,9 +58,6 @@ "@warp-drive/core-types": { "injected": true }, - "@warp-drive/internal-config": { - "injected": true - }, "@ember/string": { "injected": true } diff --git a/packages/tracking/package.json b/packages/tracking/package.json index 88bcb70b183..1ded198cf3f 100644 --- a/packages/tracking/package.json +++ b/packages/tracking/package.json @@ -24,9 +24,6 @@ "dependenciesMeta": { "@ember-data/private-build-infra": { "injected": true - }, - "@warp-drive/internal-config": { - "injected": true } }, "dependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b7cbe6cbb80..e0a8e25aa5f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -129,9 +129,6 @@ importers: eslint-plugin-simple-import-sort: specifier: ^10.0.0 version: 10.0.0(eslint@8.52.0) - pnpm-sync-dependencies-meta-injected: - specifier: 0.0.10 - version: 0.0.10 prettier: specifier: ^3.0.3 version: 3.0.3 @@ -329,7 +326,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-inflector: specifier: ^4.0.2 version: 4.0.2(@babel/core@7.23.2) @@ -358,8 +355,6 @@ importers: injected: true '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true ember-inflector: injected: true @@ -455,7 +450,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-inflector: specifier: ^4.0.2 version: 4.0.2(@babel/core@7.23.2) @@ -495,8 +490,6 @@ importers: injected: true '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true ember-inflector: injected: true @@ -556,7 +549,7 @@ importers: version: 15.2.3(rollup@4.1.4) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-source: specifier: ~5.3.0 version: 5.3.0(@babel/core@7.23.2)(@glimmer/component@1.1.2)(webpack@5.89.0) @@ -575,8 +568,6 @@ importers: dependenciesMeta: '@ember-data/private-build-infra': injected: true - '@warp-drive/internal-config': - injected: true packages/debug: dependencies: @@ -625,7 +616,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-source: specifier: ~5.3.0 version: 5.3.0(@babel/core@7.23.2)(@glimmer/component@1.1.2)(webpack@5.89.0) @@ -642,8 +633,6 @@ importers: injected: true '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true packages/diagnostic: dependencies: @@ -695,10 +684,10 @@ importers: version: 15.2.3(rollup@4.1.4) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config bun-types: specifier: ^1.0.6 - version: 1.0.6 + version: 1.0.7 ember-cli-test-loader: specifier: ^3.1.0 version: 3.1.0(@babel/core@7.23.2) @@ -714,9 +703,6 @@ importers: walk-sync: specifier: ^3.0.0 version: 3.0.0 - dependenciesMeta: - '@warp-drive/internal-config': - injected: true packages/eslint-plugin-ember-data: dependencies: @@ -801,7 +787,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-source: specifier: ~5.3.0 version: 5.3.0(@babel/core@7.23.2)(@glimmer/component@1.1.2)(webpack@5.89.0) @@ -830,8 +816,6 @@ importers: injected: true '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true packages/holodeck: dependencies: @@ -886,7 +870,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config rollup: specifier: ^4.1.4 version: 4.1.4 @@ -901,8 +885,6 @@ importers: injected: true '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true packages/json-api: dependencies: @@ -987,7 +969,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-inflector: specifier: ^4.0.2 version: 4.0.2(@babel/core@7.23.2) @@ -1023,8 +1005,6 @@ importers: injected: true '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true ember-inflector: injected: true @@ -1111,7 +1091,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-inflector: specifier: ^4.0.2 version: 4.0.2(@babel/core@7.23.2) @@ -1146,8 +1126,6 @@ importers: injected: true '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true ember-inflector: injected: true @@ -1252,7 +1230,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-inflector: specifier: ^4.0.2 version: 4.0.2(@babel/core@7.23.2) @@ -1294,8 +1272,6 @@ importers: injected: true '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true ember-inflector: injected: true @@ -1436,7 +1412,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-source: specifier: ~5.3.0 version: 5.3.0(@babel/core@7.23.2)(@glimmer/component@1.1.2)(webpack@5.89.0) @@ -1454,8 +1430,6 @@ importers: injected: true '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true packages/request-utils: dependencies: @@ -1510,7 +1484,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-source: specifier: ~5.3.0 version: 5.3.0(@babel/core@7.23.2)(@glimmer/component@1.1.2)(webpack@5.89.0) @@ -1526,8 +1500,6 @@ importers: dependenciesMeta: '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true packages/rest: dependencies: @@ -1597,7 +1569,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-inflector: specifier: ^4.0.2 version: 4.0.2(@babel/core@7.23.2) @@ -1626,8 +1598,6 @@ importers: injected: true '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true ember-inflector: injected: true @@ -1828,7 +1798,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-inflector: specifier: ^4.0.2 version: 4.0.2(@babel/core@7.23.2) @@ -1860,8 +1830,6 @@ importers: injected: true '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true ember-inflector: injected: true @@ -1936,7 +1904,7 @@ importers: version: file:packages/core-types(@babel/core@7.23.2) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-source: specifier: ~5.3.0 version: 5.3.0(@babel/core@7.23.2)(@glimmer/component@1.1.2)(webpack@5.89.0) @@ -1963,8 +1931,6 @@ importers: injected: true '@warp-drive/core-types': injected: true - '@warp-drive/internal-config': - injected: true packages/tracking: dependencies: @@ -2031,7 +1997,7 @@ importers: version: 15.2.3(rollup@4.1.4) '@warp-drive/internal-config': specifier: workspace:5.5.0-alpha.11 - version: file:config + version: link:../../config ember-source: specifier: ~5.3.0 version: 5.3.0(@babel/core@7.23.2)(@glimmer/component@1.1.2)(webpack@5.89.0) @@ -2047,8 +2013,6 @@ importers: dependenciesMeta: '@ember-data/private-build-infra': injected: true - '@warp-drive/internal-config': - injected: true packages/unpublished-eslint-rules: dependencies: @@ -3116,7 +3080,7 @@ importers: version: file:packages/holodeck(@ember-data/request@5.5.0-alpha.11)(@warp-drive/core-types@5.5.0-alpha.11) bun-types: specifier: ^1.0.6 - version: 1.0.6 + version: 1.0.7 ember-auto-import: specifier: ^2.6.3 version: 2.6.3(webpack@5.89.0) @@ -4407,6 +4371,7 @@ packages: eslint: 8.52.0 eslint-visitor-keys: 2.1.0 semver: 6.3.1 + dev: false /@babel/generator@7.23.0: resolution: {integrity: sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==} @@ -6207,6 +6172,7 @@ packages: resolution: {integrity: sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==} dependencies: eslint-scope: 5.1.1 + dev: false /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} @@ -6286,6 +6252,7 @@ packages: open: 9.1.0 picocolors: 1.0.0 tslib: 2.6.2 + dev: false /@pm2/agent@2.0.3: resolution: {integrity: sha512-xkqqCoTf5VsciMqN0vb9jthW7olVAi4KRFNddCc7ZkeJZ3i8QwZANr4NSH2H5DvseRFHq7MiPspRY/EWAFWWTg==} @@ -7194,6 +7161,7 @@ packages: /@types/json5@0.0.29: resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} + dev: false /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} @@ -7327,6 +7295,7 @@ packages: typescript: 5.2.2 transitivePeerDependencies: - supports-color + dev: false /@typescript-eslint/parser@6.8.0(eslint@8.52.0)(typescript@5.2.2): resolution: {integrity: sha512-5tNs6Bw0j6BdWuP8Fx+VH4G9fEPDxnVI7yH1IAPkQH5RUtvKwRoqdecAPdQXv4rSOADAaz1LFBZvZG7VbXivSg==} @@ -7347,6 +7316,7 @@ packages: typescript: 5.2.2 transitivePeerDependencies: - supports-color + dev: false /@typescript-eslint/scope-manager@6.8.0: resolution: {integrity: sha512-xe0HNBVwCph7rak+ZHcFD6A+q50SMsFwcmfdjs9Kz4qDh5hWhaPhFjRs/SODEhroBI5Ruyvyz9LfwUJ624O40g==} @@ -7354,6 +7324,7 @@ packages: dependencies: '@typescript-eslint/types': 6.8.0 '@typescript-eslint/visitor-keys': 6.8.0 + dev: false /@typescript-eslint/type-utils@6.8.0(eslint@8.52.0)(typescript@5.2.2): resolution: {integrity: sha512-RYOJdlkTJIXW7GSldUIHqc/Hkto8E+fZN96dMIFhuTJcQwdRoGN2rEWA8U6oXbLo0qufH7NPElUb+MceHtz54g==} @@ -7373,10 +7344,12 @@ packages: typescript: 5.2.2 transitivePeerDependencies: - supports-color + dev: false /@typescript-eslint/types@6.8.0: resolution: {integrity: sha512-p5qOxSum7W3k+llc7owEStXlGmSl8FcGvhYt8Vjy7FqEnmkCVlM3P57XQEGj58oqaBWDQXbJDZxwUWMS/EAPNQ==} engines: {node: ^16.0.0 || >=18.0.0} + dev: false /@typescript-eslint/typescript-estree@6.8.0(typescript@5.2.2): resolution: {integrity: sha512-ISgV0lQ8XgW+mvv5My/+iTUdRmGspducmQcDw5JxznasXNnZn3SKNrTRuMsEXv+V/O+Lw9AGcQCfVaOPCAk/Zg==} @@ -7397,6 +7370,7 @@ packages: typescript: 5.2.2 transitivePeerDependencies: - supports-color + dev: false /@typescript-eslint/utils@6.8.0(eslint@8.52.0)(typescript@5.2.2): resolution: {integrity: sha512-dKs1itdE2qFG4jr0dlYLQVppqTE+Itt7GmIf/vX6CSvsW+3ov8PbWauVKyyfNngokhIO9sKZeRGCUo1+N7U98Q==} @@ -7415,6 +7389,7 @@ packages: transitivePeerDependencies: - supports-color - typescript + dev: false /@typescript-eslint/visitor-keys@6.8.0: resolution: {integrity: sha512-oqAnbA7c+pgOhW2OhGvxm0t1BULX5peQI/rLsNDpGM78EebV3C9IGbX5HNZabuZ6UQrYveCLjKo8Iy/lLlBkkg==} @@ -7422,6 +7397,7 @@ packages: dependencies: '@typescript-eslint/types': 6.8.0 eslint-visitor-keys: 3.4.3 + dev: false /@ungap/structured-clone@1.2.0: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} @@ -7844,6 +7820,7 @@ packages: es-abstract: 1.22.3 get-intrinsic: 1.2.2 is-string: 1.0.7 + dev: false /array-to-error@1.1.1: resolution: {integrity: sha512-kqcQ8s7uQfg3UViYON3kCMcck3A9exxgq+riVuKy08Mx00VN4EJhK30L2VpjE58LQHKhcE/GRpvbVUhqTvqzGQ==} @@ -7872,6 +7849,7 @@ packages: es-abstract: 1.22.3 es-shim-unscopables: 1.0.2 get-intrinsic: 1.2.2 + dev: false /array.prototype.flat@1.3.2: resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==} @@ -7881,6 +7859,7 @@ packages: define-properties: 1.2.1 es-abstract: 1.22.3 es-shim-unscopables: 1.0.2 + dev: false /array.prototype.flatmap@1.3.2: resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==} @@ -7890,6 +7869,7 @@ packages: define-properties: 1.2.1 es-abstract: 1.22.3 es-shim-unscopables: 1.0.2 + dev: false /arraybuffer.prototype.slice@1.0.2: resolution: {integrity: sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==} @@ -8671,6 +8651,7 @@ packages: /big-integer@1.6.51: resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==} engines: {node: '>=0.6'} + dev: false /big.js@5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} @@ -8791,6 +8772,7 @@ packages: engines: {node: '>= 5.10.0'} dependencies: big-integer: 1.6.51 + dev: false /brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} @@ -9383,6 +9365,7 @@ packages: engines: {node: '>=12'} dependencies: run-applescript: 5.0.0 + dev: false /bytes@1.0.0: resolution: {integrity: sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==} @@ -10409,6 +10392,7 @@ packages: dependencies: bplist-parser: 0.2.0 untildify: 4.0.0 + dev: false /default-browser@4.0.0: resolution: {integrity: sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==} @@ -10418,6 +10402,7 @@ packages: default-browser-id: 3.0.0 execa: 7.2.0 titleize: 3.0.0 + dev: false /defaults@1.0.4: resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==} @@ -10439,6 +10424,7 @@ packages: /define-lazy-prop@3.0.0: resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==} engines: {node: '>=12'} + dev: false /define-properties@1.2.1: resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} @@ -10555,6 +10541,7 @@ packages: engines: {node: '>=0.10.0'} dependencies: esutils: 2.0.3 + dev: false /doctrine@3.0.0: resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} @@ -11590,6 +11577,7 @@ packages: resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==} dependencies: hasown: 2.0.0 + dev: false /es-to-primitive@1.2.1: resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==} @@ -11636,6 +11624,7 @@ packages: eslint: '>=7.0.0' dependencies: eslint: 8.52.0 + dev: false /eslint-import-resolver-node@0.3.9: resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} @@ -11645,6 +11634,7 @@ packages: resolve: 1.22.8 transitivePeerDependencies: - supports-color + dev: false /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.8.0)(eslint-import-resolver-node@0.3.9)(eslint@8.52.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} @@ -11673,6 +11663,7 @@ packages: eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color + dev: false /eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.8.0)(eslint@8.52.0): resolution: {integrity: sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==} @@ -11707,6 +11698,7 @@ packages: - eslint-import-resolver-typescript - eslint-import-resolver-webpack - supports-color + dev: false /eslint-plugin-prettier@5.0.1(eslint-config-prettier@9.0.0)(eslint@8.52.0)(prettier@3.0.3): resolution: {integrity: sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==} @@ -11727,6 +11719,7 @@ packages: prettier: 3.0.3 prettier-linter-helpers: 1.0.0 synckit: 0.8.5 + dev: false /eslint-plugin-simple-import-sort@10.0.0(eslint@8.52.0): resolution: {integrity: sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==} @@ -11734,6 +11727,7 @@ packages: eslint: '>=5.0.0' dependencies: eslint: 8.52.0 + dev: false /eslint-scope@5.1.1: resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} @@ -11752,6 +11746,7 @@ packages: /eslint-visitor-keys@2.1.0: resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==} engines: {node: '>=10'} + dev: false /eslint-visitor-keys@3.4.3: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} @@ -11936,6 +11931,7 @@ packages: onetime: 6.0.0 signal-exit: 3.0.7 strip-final-newline: 3.0.0 + dev: false /exists-sync@0.0.3: resolution: {integrity: sha512-/qPB5E0cRuA/Cs5vHrmKYSfhIBCPJs9Vm3e9aIejMwwbe6idMeNbGu1g5stvr/bXT6HywHckLPEkmY7HK6FlwA==} @@ -12052,6 +12048,7 @@ packages: /fast-diff@1.3.0: resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==} + dev: false /fast-glob@3.3.1: resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==} @@ -12890,6 +12887,7 @@ packages: ignore: 5.2.4 merge2: 1.4.1 slash: 3.0.0 + dev: false /globby@13.2.2: resolution: {integrity: sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==} @@ -13253,6 +13251,7 @@ packages: /human-signals@4.3.1: resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==} engines: {node: '>=14.18.0'} + dev: false /humanize-ms@1.2.1: resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==} @@ -13536,6 +13535,7 @@ packages: resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} hasBin: true + dev: false /is-extendable@0.1.1: resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==} @@ -13582,6 +13582,7 @@ packages: hasBin: true dependencies: is-docker: 3.0.0 + dev: false /is-interactive@1.0.0: resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==} @@ -13679,6 +13680,7 @@ packages: /is-stream@3.0.0: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dev: false /is-string@1.0.7: resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} @@ -13964,6 +13966,7 @@ packages: hasBin: true dependencies: minimist: 1.2.8 + dev: false /json5@2.2.3: resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} @@ -14568,6 +14571,7 @@ packages: /mimic-fn@4.0.0: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} engines: {node: '>=12'} + dev: false /mimic-response@1.0.1: resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==} @@ -14961,6 +14965,7 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: path-key: 4.0.0 + dev: false /npmlog@6.0.2: resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==} @@ -15033,6 +15038,7 @@ packages: call-bind: 1.0.5 define-properties: 1.2.1 es-abstract: 1.22.3 + dev: false /object.groupby@1.0.1: resolution: {integrity: sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==} @@ -15041,6 +15047,7 @@ packages: define-properties: 1.2.1 es-abstract: 1.22.3 get-intrinsic: 1.2.2 + dev: false /object.pick@1.3.0: resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==} @@ -15055,6 +15062,7 @@ packages: call-bind: 1.0.5 define-properties: 1.2.1 es-abstract: 1.22.3 + dev: false /on-finished@2.3.0: resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==} @@ -15094,6 +15102,7 @@ packages: engines: {node: '>=12'} dependencies: mimic-fn: 4.0.0 + dev: false /open@9.1.0: resolution: {integrity: sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==} @@ -15103,6 +15112,7 @@ packages: define-lazy-prop: 3.0.0 is-inside-container: 1.0.0 is-wsl: 2.2.0 + dev: false /optionator@0.9.3: resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} @@ -15370,6 +15380,7 @@ packages: /path-key@4.0.0: resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==} engines: {node: '>=12'} + dev: false /path-name@1.0.0: resolution: {integrity: sha512-/dcAb5vMXH0f51yvMuSUqFpxUcA8JelbRmE5mW/p4CUJxrNgK24IkstnV7ENtg2IDGBOu6izKTG6eilbnbNKWQ==} @@ -15664,6 +15675,7 @@ packages: engines: {node: '>=6.0.0'} dependencies: fast-diff: 1.3.0 + dev: false /prettier@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} @@ -15674,6 +15686,7 @@ packages: resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} engines: {node: '>=14'} hasBin: true + dev: false /pretty-bytes@5.6.0: resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} @@ -16356,6 +16369,7 @@ packages: engines: {node: '>=12'} dependencies: execa: 5.1.1 + dev: false /run-async@2.4.1: resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==} @@ -17038,6 +17052,7 @@ packages: /strip-bom@3.0.0: resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} engines: {node: '>=4'} + dev: false /strip-bom@4.0.0: resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==} @@ -17057,6 +17072,7 @@ packages: /strip-final-newline@3.0.0: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} engines: {node: '>=12'} + dev: false /strip-json-comments@2.0.1: resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==} @@ -17158,6 +17174,7 @@ packages: dependencies: '@pkgr/utils': 2.4.2 tslib: 2.6.2 + dev: false /systeminformation@5.21.13: resolution: {integrity: sha512-sGgMhQxxjKHSIJtv7g5s19IRpfCgLG3tZqGbFcfGFyMm1hJ3BmzTfaq0yyOO2oLHlbkM49mgMjnPPB8g573LMA==} @@ -17413,6 +17430,7 @@ packages: /titleize@3.0.0: resolution: {integrity: sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==} engines: {node: '>=12'} + dev: false /tmp-sync@1.1.2: resolution: {integrity: sha512-npRDYJiMaPWhcLf6q06v/vA3o/ZG4hfHDiBuj1N3Yeh3GTkFQb1YLFs6inDGMWIHjGidl4Oc1+oXHNKKj5vkDQ==} @@ -17553,6 +17571,7 @@ packages: typescript: '*' dependencies: typescript: 5.2.2 + dev: false /tsconfig-paths@3.14.2: resolution: {integrity: sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==} @@ -17561,6 +17580,7 @@ packages: json5: 1.0.2 minimist: 1.2.8 strip-bom: 3.0.0 + dev: false /tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} @@ -17842,6 +17862,7 @@ packages: /untildify@4.0.0: resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==} engines: {node: '>=8'} + dev: false /update-browserslist-db@1.0.13(browserslist@4.22.1): resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} @@ -18453,31 +18474,6 @@ packages: engines: {node: '>=0.2.0'} dev: true - file:config: - resolution: {directory: config, type: directory} - name: '@warp-drive/internal-config' - engines: {node: '>= 20.8.1'} - dependencies: - '@babel/core': 7.23.2(supports-color@8.1.1) - '@babel/eslint-parser': 7.22.15(@babel/core@7.23.2)(eslint@8.52.0) - '@babel/plugin-proposal-decorators': 7.23.2(@babel/core@7.23.2) - '@typescript-eslint/eslint-plugin': 6.8.0(@typescript-eslint/parser@6.8.0)(eslint@8.52.0)(typescript@5.2.2) - '@typescript-eslint/parser': 6.8.0(eslint@8.52.0)(typescript@5.2.2) - eslint: 8.52.0 - eslint-config-prettier: 9.0.0(eslint@8.52.0) - eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.8.0)(eslint@8.52.0) - eslint-plugin-prettier: 5.0.1(eslint-config-prettier@9.0.0)(eslint@8.52.0)(prettier@3.0.3) - eslint-plugin-simple-import-sort: 10.0.0(eslint@8.52.0) - pnpm-sync-dependencies-meta-injected: 0.0.10 - prettier: 3.0.3 - typescript: 5.2.2 - transitivePeerDependencies: - - '@types/eslint' - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color - dev: true - file:packages/-ember-data(@babel/core@7.23.2)(@ember/string@3.1.1)(ember-source@5.3.0): resolution: {directory: packages/-ember-data, type: directory} id: file:packages/-ember-data diff --git a/scripts/validate-deps.js b/scripts/validate-deps.js index 4086c84ae7d..a1d258d72d4 100644 --- a/scripts/validate-deps.js +++ b/scripts/validate-deps.js @@ -3,20 +3,18 @@ const path = require('path'); const root = process.cwd(); const pkgs = new Map(); -const otherPkgs = new Set([ - 'ember-inflector', - '@ember/string' -]); +const otherPkgs = new Set(['ember-inflector', '@ember/string']); const files = new Map(); const currentVersion = require(path.join(root, 'package.json')).version; const peer_exceptions = { '@ember-data/active-record': { - '@ember-data/store': true + '@ember-data/store': true, }, '@ember-data/rest': { - '@ember-data/store': true + '@ember-data/store': true, }, -} +}; +const ignore_hardlinks = new Set(['@warp-drive/internal-config']); function isPeerException(pkg, dep) { return Boolean(peer_exceptions[pkg] && peer_exceptions[pkg][dep]); @@ -48,7 +46,7 @@ fs.readdirSync(path.join(root, 'packages')).forEach((dirName) => { pkgs.set(pkg.name, pkg); files.set(pkg.name, { path: path.join(root, 'packages', dirName, 'package.json'), - pkg + pkg, }); }); @@ -57,10 +55,17 @@ fs.readdirSync(path.join(root, 'tests')).forEach((dirName) => { pkgs.set(pkg.name, pkg); files.set(pkg.name, { path: path.join(root, 'tests', dirName, 'package.json'), - pkg + pkg, }); }); +const configPkg = require(path.join(root, './config/package.json')); +pkgs.set(configPkg.name, configPkg); +files.set(configPkg.name, { + path: path.join(root, './config/package.json'), + configPkg, +}); + pkgs.forEach((pkg) => { let edited = false; if (pkg.version !== currentVersion) { @@ -75,7 +80,7 @@ pkgs.forEach((pkg) => { if (!pkg.scripts['_syncPnpm']) { console.log(`Missing _syncPnpm script for ${pkg.name}`); edited = true; - pkg.scripts['_syncPnpm'] = "bun run sync-dependencies-meta-injected"; + pkg.scripts['_syncPnpm'] = 'bun run sync-dependencies-meta-injected'; } if (pkg.scripts['prepare']) { console.log(`Removing prepare script for ${pkg.name}`); @@ -96,6 +101,18 @@ pkgs.forEach((pkg) => { } if (pkgs.has(dep) || otherPkgs.has(dep)) { + if (ignore_hardlinks.has(dep)) { + if (pkg.dependenciesMeta?.[dep]?.injected) { + console.log(`Removing hardlink for ${pkg.name}`); + edited = true; + if (Object.keys(pkg.dependenciesMeta[dep]).length === 1) { + delete pkg.dependenciesMeta[dep]; + } else { + delete pkg.dependenciesMeta[dep].injected; + } + } + return; + } if (!pkg.dependenciesMeta) { console.log(`Missing dependenciesMeta for ${pkg.name}`); edited = true; @@ -140,6 +157,19 @@ pkgs.forEach((pkg) => { } if (pkgs.has(dep) || otherPkgs.has(dep)) { + if (ignore_hardlinks.has(dep)) { + if (pkg.dependenciesMeta?.[dep]?.injected) { + console.log(`Removing hardlink for ${pkg.name}`); + edited = true; + if (Object.keys(pkg.dependenciesMeta[dep]).length === 1) { + delete pkg.dependenciesMeta[dep]; + } else { + delete pkg.dependenciesMeta[dep].injected; + } + } + return; + } + if (!pkg.devDependencies) { console.log(`Missing devDependencies for ${pkg.name}`); edited = true; @@ -199,6 +229,19 @@ pkgs.forEach((pkg) => { } if (pkgs.has(dep) || otherPkgs.has(dep)) { + if (ignore_hardlinks.has(dep)) { + if (pkg.dependenciesMeta?.[dep]?.injected) { + console.log(`Removing hardlink for ${pkg.name}`); + edited = true; + if (Object.keys(pkg.dependenciesMeta[dep]).length === 1) { + delete pkg.dependenciesMeta[dep]; + } else { + delete pkg.dependenciesMeta[dep].injected; + } + } + continue; + } + if (!pkg.dependenciesMeta) { console.log(`Missing (dev) dependenciesMeta for ${pkg.name}`); edited = true; @@ -215,7 +258,6 @@ pkgs.forEach((pkg) => { pkg.dependenciesMeta[dep].injected = true; } } - } if (pkg.devDependenciesMeta) {