Fixed tests from a fresh build

3 months ago · 41d94262d4
parent dadf06a2c2
commit 41d94262d4
22 changed files with 71 additions and 73 deletions
--- 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
--- a/.gitignore
+++ b/.gitignore
@ -18,3 +18,5 @@ yarn-error.log*
 coverage/

 docs/
+
+.nx
--- a/nx.json
+++ b/nx.json
@ -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"
-      ]
-    }
-  }
-}
--- 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",
--- 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": {
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",