From 41d94262d47b17eeb277b6cc3617e4a10b8c86c1 Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Mon, 16 Jun 2025 23:13:23 -0400 Subject: [PATCH] Fixed tests from a fresh build --- .github/workflows/test.yml | 9 +++---- .gitignore | 2 ++ nx.json | 28 --------------------- package-lock.json | 13 +++++++++- package.json | 4 +-- packages/cli/package.json | 6 ++--- packages/connected-nextgraph/package.json | 5 ++-- packages/connected-solid/package.json | 6 +++-- packages/connected/package.json | 6 ++--- packages/dataset/package.json | 5 ++-- packages/jsonld-dataset-proxy/package.json | 5 ++-- packages/ldo/package.json | 5 ++-- packages/rdf-utils/package.json | 5 ++-- packages/react/package.json | 5 ++-- packages/schema-converter-shex/package.json | 5 ++-- packages/solid-react/package.json | 5 ++-- packages/solid-type-index/package.json | 5 ++-- packages/subscribable-dataset/package.json | 5 ++-- packages/svelte/package.json | 5 ++-- packages/test-solid-server/package.json | 5 ++-- packages/traverser-shexj/package.json | 5 ++-- packages/type-traverser/package.json | 5 ++-- 22 files changed, 71 insertions(+), 73 deletions(-) delete mode 100644 nx.json diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 106bc03..03f147b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: Test Node.js Monorepo +name: CI - Build & Test on: pull_request: @@ -18,13 +18,10 @@ jobs: node-version: '20' cache: 'npm' - - name: Install dependencies with npm workspaces + - name: Install dependencies using npm workspaces run: npm install - - name: Bootstrap workspaces (if needed) - run: npx lerna link - - - name: Build all packages + - name: Build all packages in topological order run: npm run build - name: Run tests diff --git a/.gitignore b/.gitignore index f6c2ad6..a981069 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ yarn-error.log* coverage/ docs/ + +.nx diff --git a/nx.json b/nx.json deleted file mode 100644 index 9ed4830..0000000 --- a/nx.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "tasksRunnerOptions": { - "default": { - "runner": "nx/tasks-runners/default", - "options": { - "cacheableOperations": [ - "build", - "test" - ] - } - } - }, - "targetDefaults": { - "build": { - "dependsOn": [ - "^build" - ], - "outputs": [ - "{projectRoot}/dist" - ] - }, - "test": { - "outputs": [ - "{projectRoot}/coverage" - ] - } - } -} diff --git a/package-lock.json b/package-lock.json index 21253be..b6f3be8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24428,6 +24428,10 @@ "integrity": "sha512-YXet4a9wQP96Ru9MQSfoRUzsCaeboLPXj+rVG1ulH4t54zqFHiNmW6FPl7V2dTxk9uHlW3yb9+1jWO44AdWisw==", "license": "ISC" }, + "node_modules/remove-dist": { + "resolved": "packages/solid-react/rimraf dist", + "link": true + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -30404,7 +30408,6 @@ "@ldo/rdf-utils": "^1.0.0-alpha.21" }, "devDependencies": { - "@ldo/connected-solid": "^1.0.0-alpha.26", "@ldo/test-solid-server": "^1.0.0-alpha.24", "@rdfjs/types": "^1.0.1", "cross-env": "^7.0.3", @@ -30526,6 +30529,7 @@ "version": "1.0.0-alpha.26", "license": "MIT", "dependencies": { + "@ldo/connected": "^1.0.0-alpha.21", "@ldo/dataset": "^1.0.0-alpha.21", "@ldo/ldo": "^1.0.0-alpha.21", "@ldo/rdf-utils": "^1.0.0-alpha.21", @@ -31253,6 +31257,7 @@ "@ldo/rdf-utils": "^1.0.0-alpha.21", "@rdfjs/types": "^1.0.1", "@testing-library/react": "^14.1.2", + "remove-dist": "rimraf dist/", "start-server-and-test": "^2.0.3", "whatwg-fetch": "^3.6.20" } @@ -31373,6 +31378,12 @@ "dev": true, "license": "MIT" }, + "packages/solid-react/rimraf dist": { + "dev": true + }, + "packages/solid-react/rimraf dist/ && rimraf node_modules": { + "extraneous": true + }, "packages/solid-type-index": { "name": "@ldo/solid-type-index", "version": "1.0.0-alpha.26", diff --git a/package.json b/package.json index 5da0948..88a611a 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "test": "lerna run test", "build": "lerna run build", "lint": "lerna run lint", - "clean": "lerna run clean", + "clean": "lerna clean --yes && lerna run remove-dist && rimraf node_modules", "publish": "lerna publish --no-private" }, "devDependencies": { @@ -32,4 +32,4 @@ "typescript": "^5.2.2", "vitest": "^3.1.3" } -} +} \ No newline at end of file diff --git a/packages/cli/package.json b/packages/cli/package.json index 29d1f48..56ca539 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -8,9 +8,9 @@ "ldo": "./dist/index.js" }, "scripts": { - "build": "npm run clean && npm run build:ts && npm run copy-files && npm run update-permission", + "build": "npm run remove-dist && npm run build:ts && npm run copy-files && npm run update-permission", "build:ts": "tsc --project tsconfig.cjs.json", - "clean": "rimraf dist/", + "remove-dist": "rimraf dist/", "copy-files": "copyfiles -u 1 \"./src/**/*.ejs\" dist/", "update-permission": "chmod +x ./dist/index.js", "test": "jest --coverage", @@ -61,4 +61,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/connected-nextgraph/package.json b/packages/connected-nextgraph/package.json index 8373959..2c32ff3 100644 --- a/packages/connected-nextgraph/package.json +++ b/packages/connected-nextgraph/package.json @@ -24,7 +24,8 @@ "docs": "typedoc --plugin typedoc-plugin-markdown", "start-test-server": "./test/ngd -vv --save-key -l 14400 --base ./test/nextgraph-data", "start-integration-test": "vitest run --coverage", - "test:integration": "start-server-and-test start-test-server http-get://localhost:14400 start-integration-test" + "test:integration": "start-server-and-test start-test-server http-get://localhost:14400 start-integration-test", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -69,4 +70,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/connected-solid/package.json b/packages/connected-solid/package.json index b112bc8..3897edb 100644 --- a/packages/connected-solid/package.json +++ b/packages/connected-solid/package.json @@ -22,7 +22,8 @@ "prepublishOnly": " npm run build", "build:ldo": "ldo build --input src/.shapes --output src/.ldo", "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", - "docs": "typedoc --plugin typedoc-plugin-markdown" + "docs": "typedoc --plugin typedoc-plugin-markdown", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -48,6 +49,7 @@ "typedoc-plugin-markdown": "^3.17.1" }, "dependencies": { + "@ldo/connected": "^1.0.0-alpha.21", "@ldo/dataset": "^1.0.0-alpha.21", "@ldo/ldo": "^1.0.0-alpha.21", "@ldo/rdf-utils": "^1.0.0-alpha.21", @@ -64,4 +66,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/connected/package.json b/packages/connected/package.json index c4df318..819dc5f 100644 --- a/packages/connected/package.json +++ b/packages/connected/package.json @@ -22,7 +22,8 @@ "prepublishOnly": " npm run build", "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", "docs": "typedoc --plugin typedoc-plugin-markdown", - "build:ldo": "ldo build --input test/.shapes --output test/.ldo" + "build:ldo": "ldo build --input test/.shapes --output test/.ldo", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -35,7 +36,6 @@ }, "homepage": "https://github.com/o-development/ldo/tree/main/packages/solid#readme", "devDependencies": { - "@ldo/connected-solid": "^1.0.0-alpha.26", "@ldo/test-solid-server": "^1.0.0-alpha.24", "@rdfjs/types": "^1.0.1", "cross-env": "^7.0.3", @@ -61,4 +61,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/dataset/package.json b/packages/dataset/package.json index fa7f4a1..dad1493 100644 --- a/packages/dataset/package.json +++ b/packages/dataset/package.json @@ -22,7 +22,8 @@ "example:extendedDataset": "ts-node ./example/extendedDatasetExample.ts", "example:loadData": "ts-node ./example/loadDataExample.ts", "prepublishOnly": " npm run build", - "lint": "eslint src/** --fix --no-error-on-unmatched-pattern" + "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -56,4 +57,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/jsonld-dataset-proxy/package.json b/packages/jsonld-dataset-proxy/package.json index 4da640b..b2baad5 100644 --- a/packages/jsonld-dataset-proxy/package.json +++ b/packages/jsonld-dataset-proxy/package.json @@ -22,7 +22,8 @@ "prepublishOnly": " npm run build", "start": "ts-node ./example/example.ts", "start:lang": "ts-node ./example/languageExample.ts", - "lint": "eslint src/** --fix --no-error-on-unmatched-pattern" + "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -57,4 +58,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/ldo/package.json b/packages/ldo/package.json index 000d6ee..9a76ae5 100644 --- a/packages/ldo/package.json +++ b/packages/ldo/package.json @@ -22,7 +22,8 @@ "example": "ts-node ./example/example.ts", "prepublishOnly": " npm run build", "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", - "docs": "typedoc --plugin typedoc-plugin-markdown" + "docs": "typedoc --plugin typedoc-plugin-markdown", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -63,4 +64,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/rdf-utils/package.json b/packages/rdf-utils/package.json index 13d3d1e..903120a 100644 --- a/packages/rdf-utils/package.json +++ b/packages/rdf-utils/package.json @@ -20,7 +20,8 @@ "test": "jest --coverage", "test:watch": "jest --watch", "prepublishOnly": " npm run build", - "lint": "eslint src/** --fix --no-error-on-unmatched-pattern" + "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -49,4 +50,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/react/package.json b/packages/react/package.json index bd91d48..8f2c679 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -21,7 +21,8 @@ "test": "vitest run --coverage", "prepublishOnly": " npm run build", "build:ldo": "ldo build --input src/shapes --output src/ldo", - "lint": "eslint src/** --fix --no-error-on-unmatched-pattern" + "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -55,4 +56,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/schema-converter-shex/package.json b/packages/schema-converter-shex/package.json index 14921dd..d5a449a 100644 --- a/packages/schema-converter-shex/package.json +++ b/packages/schema-converter-shex/package.json @@ -20,7 +20,8 @@ "build:esm": "tsc --project tsconfig.esm.json", "test": "jest --coverage", "prepublishOnly": " npm run build", - "lint": "eslint src/** --fix --no-error-on-unmatched-pattern" + "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -52,4 +53,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/solid-react/package.json b/packages/solid-react/package.json index cc408f0..810992a 100644 --- a/packages/solid-react/package.json +++ b/packages/solid-react/package.json @@ -40,7 +40,8 @@ "@rdfjs/types": "^1.0.1", "@testing-library/react": "^14.1.2", "start-server-and-test": "^2.0.3", - "whatwg-fetch": "^3.6.20" + "whatwg-fetch": "^3.6.20", + "remove-dist": "rimraf dist/" }, "dependencies": { "@inrupt/solid-client-authn-browser": "2.5.0", @@ -57,4 +58,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/solid-type-index/package.json b/packages/solid-type-index/package.json index 3bf90b8..3e44ed5 100644 --- a/packages/solid-type-index/package.json +++ b/packages/solid-type-index/package.json @@ -21,7 +21,8 @@ "test": "vitest run --coverage", "prepublishOnly": " npm run build", "build:ldo": "ldo build --input src/.shapes --output src/.ldo", - "lint": "eslint src/** --fix --no-error-on-unmatched-pattern" + "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -54,4 +55,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/subscribable-dataset/package.json b/packages/subscribable-dataset/package.json index be095a4..9704ba1 100644 --- a/packages/subscribable-dataset/package.json +++ b/packages/subscribable-dataset/package.json @@ -21,7 +21,8 @@ "test": "jest --coverage", "example:subscribableDataset": "ts-node ./example/subscribableDatasetExample.ts", "prepublishOnly": " npm run build", - "lint": "eslint src/** --fix --no-error-on-unmatched-pattern" + "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -54,4 +55,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/svelte/package.json b/packages/svelte/package.json index c7f5315..1616d87 100644 --- a/packages/svelte/package.json +++ b/packages/svelte/package.json @@ -25,7 +25,8 @@ "test": "jest --coverage", "lint": "eslint . --ext .js,.ts,.svelte --fix --no-error-on-unmatched-pattern", "format": "prettier --write .", - "prepublishOnly": "npm run build" + "prepublishOnly": "npm run build", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -79,4 +80,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/test-solid-server/package.json b/packages/test-solid-server/package.json index 4d78158..a8c1426 100644 --- a/packages/test-solid-server/package.json +++ b/packages/test-solid-server/package.json @@ -20,7 +20,8 @@ "build:esm": "tsc --project tsconfig.esm.json", "prepublishOnly": "npm run build", "copy-configs": "cp -r src/configs dist/cjs/configs && cp -r src/configs dist/esm/configs", - "lint": "eslint src/** --fix --no-error-on-unmatched-pattern" + "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -45,4 +46,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/traverser-shexj/package.json b/packages/traverser-shexj/package.json index bcfc4e1..8cc9cb2 100644 --- a/packages/traverser-shexj/package.json +++ b/packages/traverser-shexj/package.json @@ -20,7 +20,8 @@ "build:esm": "tsc --project tsconfig.esm.json", "test": "jest --coverage", "prepublishOnly": " npm run build", - "lint": "eslint src/** --fix --no-error-on-unmatched-pattern" + "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -43,4 +44,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/type-traverser/package.json b/packages/type-traverser/package.json index 68d065e..15a572a 100644 --- a/packages/type-traverser/package.json +++ b/packages/type-traverser/package.json @@ -21,7 +21,8 @@ "test": "jest --coverage", "start": "ts-node ./example/example", "prepublishOnly": " npm run build", - "lint": "eslint src/** --fix --no-error-on-unmatched-pattern" + "lint": "eslint src/** --fix --no-error-on-unmatched-pattern", + "remove-dist": "rimraf dist/" }, "repository": { "type": "git", @@ -49,4 +50,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file