Skip to content

Commit a9d8941

Browse files
authored
add tests for new eq, if resolvers (#192)
* add tests for new eq, if resolvers * move env-graph within src to make turbo caching happy
1 parent 682cfba commit a9d8941

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+148
-30
lines changed

.changeset/twelve-things-hang.md

Lines changed: 2 additions & 0 deletions

.vscode/settings.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"files.associations": {
66
// package.json needs to be "json" rather than "json with comments" so that the "version lens" plugin works
77
"package.json": "json",
8+
"turbo.json": "jsonc",
89
},
910
"eslint.validate": [
1011
// enable eslint on file types other than js/ts
@@ -24,7 +25,7 @@
2425
// these are written out individually because if written as a group
2526
// users cannot override individual items in their settings.json
2627
"[typescript]": {
27-
"editor.defaultFormatter": "vscode.typescript-language-features"
28+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
2829
},
2930
"[javascript]": {
3031
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
@@ -42,17 +43,12 @@
4243
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
4344
},
4445
"[json]": {
45-
"editor.defaultFormatter": "vscode.json-language-features"
46+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
4647
},
4748
"[jsonc]": {
48-
"editor.defaultFormatter": "vscode.json-language-features"
49+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
4950
},
5051
"[env]": {
5152
"editor.formatOnSave": false
5253
},
53-
54-
// vscode's built-in json formatter is removing the extra newline at the end which conflicts with editorconfig
55-
// "json.format.keepLines": true,
56-
// "json.format.enable": false,
57-
5854
}

eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default tseslint.config(
4545
'packages/eslint-custom-rules',
4646
'packages/env-spec-parser/src/grammar.js',
4747
'packages/varlock-website/.astro',
48-
'packages/varlock/env-graph/test/plugins',
48+
'packages/varlock/src/env-graph/test/plugins',
4949
'**/*.ignore',
5050
'**/.vercel',
5151
'**/.netlify',

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"scripts": {
1111
"build": "turbo build --filter='!./examples/**'",
1212
"build:libs": "pnpm run build --filter=\"!@varlock/website\"",
13-
"test:ci": "turbo test:ci",
13+
"test:ci": "turbo test:ci --filter='!./examples/**'",
1414
"preinstall": "npx only-allow pnpm",
15-
"dev": "turbo run dev --concurrency=40 --parallel",
15+
"dev": "turbo run dev --concurrency=40 --parallel --filter='!./examples/**'",
1616
"lint": "eslint .",
1717
"lint:fix": "eslint . --fix",
1818
"changeset:add": "changeset add",

packages/varlock/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"build:sea": "tsup --config tsup-sea.config.ts",
1717
"dev": "tsup",
1818
"test": "vitest",
19+
"test:ci": "vitest --run",
1920
"lint": "eslint .",
2021
"lint:fix": "pnpm run lint --fix"
2122
},

packages/varlock/src/cli/commands/load.command.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { getItemSummary } from '../../lib/formatting';
66
import { checkForConfigErrors, checkForSchemaErrors } from '../helpers/error-checks';
77
import { type TypedGunshiCommandFn } from '../helpers/gunshi-type-utils';
88
import path from 'node:path';
9-
import { FileBasedDataSource } from '../../../env-graph';
9+
import { FileBasedDataSource } from '../../env-graph';
1010

1111
export const commandSpec = define({
1212
name: 'load',

packages/varlock/src/cli/commands/plugin.command.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { define } from 'gunshi';
2-
import { loadEnvGraph } from '../../../env-graph';
2+
import { loadEnvGraph } from '../../env-graph';
33
import { type TypedGunshiCommandFn } from '../helpers/gunshi-type-utils';
44
import { checkForSchemaErrors } from '../helpers/error-checks';
55

packages/varlock/src/cli/helpers/error-checks.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import ansis from 'ansis';
22
import { gracefulExit } from 'exit-hook';
33
import _ from '@env-spec/utils/my-dash';
4-
import { EnvGraph, ConfigItem } from '../../../env-graph';
4+
import { EnvGraph, ConfigItem } from '../../env-graph';
55
import { getItemSummary, joinAndCompact } from '../../lib/formatting';
6-
import { VarlockError } from '../../../env-graph/lib/errors';
6+
import { VarlockError } from '../../env-graph/lib/errors';
77

88

99
function showErrorLocationDetails(err: Error) {
File renamed without changes.

0 commit comments

Comments
 (0)