@ldo/test-solid-server 1.0.0-alpha.24 → 1.0.0-alpha.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  {
2
- "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
2
+ "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld",
3
3
  "import": [
4
4
  "css:config/app/init/initialize-root.json",
5
5
  "css:config/app/main/default.json",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "@context": [
3
- "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld"
3
+ "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld"
4
4
  ],
5
5
  "import": [
6
6
  "css:config/app/init/static-root.json",
@@ -16,7 +16,7 @@ const node_url_1 = require("node:url");
16
16
  // @ts-ignore
17
17
  const __dirname = (0, node_path_1.dirname)((0, node_url_1.fileURLToPath)(import.meta.url));
18
18
  // Use an increased timeout, since the CSS server takes too much setup time.
19
- vitest_1.vi.setConfig({ testTimeout: 40_000 });
19
+ vitest_1.vi.setConfig({ testTimeout: 40_000, hookTimeout: 40_000 });
20
20
  function setupServer(port, resourceInfo, customConfigPath, skipAuthentication) {
21
21
  const data = {
22
22
  rootUri: `http://localhost:${port}/`,
@@ -32,11 +32,26 @@ function setupServer(port, resourceInfo, customConfigPath, skipAuthentication) {
32
32
  data.authFetch = skipAuthentication ? fetch : await (0, authFetch_js_1.generateAuthFetch)(port);
33
33
  });
34
34
  (0, vitest_1.afterAll)(async () => {
35
- data.app.stop();
35
+ // We're potentially ignoring data clean up and server shutdown because
36
+ // sometimes this doesn't work in CI.
37
+ try {
38
+ await Promise.race([
39
+ data.app.stop?.(),
40
+ new Promise((_, reject) => setTimeout(() => reject(new Error("Shutdown timeout")), 10000)),
41
+ ]);
42
+ }
43
+ catch (err) {
44
+ console.warn("⚠️ Ignoring shutdown error in CI:", err.message);
45
+ }
46
+ try {
47
+ const testDataPath = path_1.default.join(__dirname, `./data${port}`);
48
+ await promises_1.default.rm(testDataPath, { recursive: true, force: true });
49
+ }
50
+ catch (err) {
51
+ console.warn("⚠️ Ignoring data cleanup error in CI:", err.message);
52
+ }
36
53
  process.env.JEST_WORKER_ID = previousJestId;
37
54
  process.env.NODE_ENV = previousNodeEnv;
38
- const testDataPath = path_1.default.join(__dirname, `./data${port}`);
39
- await promises_1.default.rm(testDataPath, { recursive: true, force: true });
40
55
  });
41
56
  (0, vitest_1.beforeEach)(async () => {
42
57
  data.fetchMock = vitest_1.vi.fn(data.authFetch);
@@ -1 +1 @@
1
- {"version":3,"file":"setupTestServer.js","sourceRoot":"","sources":["../../src/setupTestServer.ts"],"names":[],"mappings":";;;;;AA0BA,kCAkDC;AA1ED,uDAA8C;AAC9C,gDAAwB;AAExB,yDAAmE;AACnE,iDAAmD;AACnD,2DAA6B;AAC7B,mCAOgB;AAChB,yCAAoC;AACpC,uCAAyC;AAEzC,6DAA6D;AAC7D,aAAa;AACb,MAAM,SAAS,GAAG,IAAA,mBAAO,EAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,4EAA4E;AAC5E,WAAE,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;AAEtC,SAAgB,WAAW,CACzB,IAAY,EACZ,YAA0B,EAC1B,gBAAyB,EACzB,kBAA4B;IAE5B,MAAM,IAAI,GAUN;QACF,OAAO,EAAE,oBAAoB,IAAI,GAAG;KAC9B,CAAC;IAET,IAAI,cAAkC,CAAC;IACvC,IAAI,eAAmC,CAAC;IACxC,IAAA,kBAAS,EAAC,KAAK,IAAI,EAAE;QACnB,4EAA4E;QAC5E,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,YAAY,CAAC;QACpC,sBAAsB;QACtB,IAAI,CAAC,GAAG,GAAG,MAAM,IAAA,2BAAS,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACnD,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,IAAA,gCAAiB,EAAC,IAAI,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,IAAA,iBAAQ,EAAC,KAAK,IAAI,EAAE;QAClB,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,cAAc,CAAC;QAC5C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,CAAC;QACvC,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;QAC3D,MAAM,kBAAE,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,IAAA,mBAAU,EAAC,KAAK,IAAI,EAAE;QACpB,IAAI,CAAC,SAAS,GAAG,WAAE,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,0CAA0C;QAC1C,MAAM,IAAA,gCAAa,EAAC,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,IAAA,kBAAS,EAAC,KAAK,IAAI,EAAE;QACnB,MAAM,IAAA,iCAAc,EAAC,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"setupTestServer.js","sourceRoot":"","sources":["../../src/setupTestServer.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  {
2
- "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
2
+ "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld",
3
3
  "import": [
4
4
  "css:config/app/init/initialize-root.json",
5
5
  "css:config/app/main/default.json",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "@context": [
3
- "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld"
3
+ "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld"
4
4
  ],
5
5
  "import": [
6
6
  "css:config/app/init/static-root.json",
@@ -10,7 +10,7 @@ import { fileURLToPath } from "node:url";
10
10
  // @ts-ignore
11
11
  const __dirname = dirname(fileURLToPath(import.meta.url));
12
12
  // Use an increased timeout, since the CSS server takes too much setup time.
13
- vi.setConfig({ testTimeout: 40_000 });
13
+ vi.setConfig({ testTimeout: 40_000, hookTimeout: 40_000 });
14
14
  export function setupServer(port, resourceInfo, customConfigPath, skipAuthentication) {
15
15
  const data = {
16
16
  rootUri: `http://localhost:${port}/`,
@@ -26,11 +26,26 @@ export function setupServer(port, resourceInfo, customConfigPath, skipAuthentica
26
26
  data.authFetch = skipAuthentication ? fetch : await generateAuthFetch(port);
27
27
  });
28
28
  afterAll(async () => {
29
- data.app.stop();
29
+ // We're potentially ignoring data clean up and server shutdown because
30
+ // sometimes this doesn't work in CI.
31
+ try {
32
+ await Promise.race([
33
+ data.app.stop?.(),
34
+ new Promise((_, reject) => setTimeout(() => reject(new Error("Shutdown timeout")), 10000)),
35
+ ]);
36
+ }
37
+ catch (err) {
38
+ console.warn("⚠️ Ignoring shutdown error in CI:", err.message);
39
+ }
40
+ try {
41
+ const testDataPath = path.join(__dirname, `./data${port}`);
42
+ await fs.rm(testDataPath, { recursive: true, force: true });
43
+ }
44
+ catch (err) {
45
+ console.warn("⚠️ Ignoring data cleanup error in CI:", err.message);
46
+ }
30
47
  process.env.JEST_WORKER_ID = previousJestId;
31
48
  process.env.NODE_ENV = previousNodeEnv;
32
- const testDataPath = path.join(__dirname, `./data${port}`);
33
- await fs.rm(testDataPath, { recursive: true, force: true });
34
49
  });
35
50
  beforeEach(async () => {
36
51
  data.fetchMock = vi.fn(data.authFetch);
@@ -1 +1 @@
1
- {"version":3,"file":"setupTestServer.js","sourceRoot":"","sources":["../../src/setupTestServer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,EACL,SAAS,EACT,QAAQ,EACR,UAAU,EACV,SAAS,EACT,EAAE,GAEH,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,6DAA6D;AAC7D,aAAa;AACb,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,4EAA4E;AAC5E,EAAE,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;AAEtC,MAAM,UAAU,WAAW,CACzB,IAAY,EACZ,YAA0B,EAC1B,gBAAyB,EACzB,kBAA4B;IAE5B,MAAM,IAAI,GAUN;QACF,OAAO,EAAE,oBAAoB,IAAI,GAAG;KAC9B,CAAC;IAET,IAAI,cAAkC,CAAC;IACvC,IAAI,eAAmC,CAAC;IACxC,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,4EAA4E;QAC5E,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,YAAY,CAAC;QACpC,sBAAsB;QACtB,IAAI,CAAC,GAAG,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACnD,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;QAClB,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,cAAc,CAAC;QAC5C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,eAAe,CAAC;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;QAC3D,MAAM,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,0CAA0C;QAC1C,MAAM,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"setupTestServer.js","sourceRoot":"","sources":["../../src/setupTestServer.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"setupTestServer.d.ts","sourceRoot":"","sources":["../../src/setupTestServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAGnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIvD,OAAO,EAML,KAAK,cAAc,EACpB,MAAM,QAAQ,CAAC;AAWhB,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,gBAAgB,CAAC,EAAE,MAAM,EACzB,kBAAkB,CAAC,EAAE,OAAO;SAGrB,GAAG;eACG,cAAc,CACvB,CACE,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,KAC3B,OAAO,CAAC,QAAQ,CAAC,CACvB;eACU,OAAO,KAAK;aACd,MAAM;EAmClB"}
1
+ {"version":3,"file":"setupTestServer.d.ts","sourceRoot":"","sources":["../../src/setupTestServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAGnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIvD,OAAO,EAML,KAAK,cAAc,EACpB,MAAM,QAAQ,CAAC;AAWhB,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,gBAAgB,CAAC,EAAE,MAAM,EACzB,kBAAkB,CAAC,EAAE,OAAO;SAGrB,GAAG;eACG,cAAc,CACvB,CACE,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,KAC3B,OAAO,CAAC,QAAQ,CAAC,CACvB;eACU,OAAO,KAAK;aACd,MAAM;EAuDlB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ldo/test-solid-server",
3
- "version": "1.0.0-alpha.24",
3
+ "version": "1.0.0-alpha.27",
4
4
  "description": "A solid server to be used in jest tests",
5
5
  "type": "module",
6
6
  "main": "./dist/cjs/index.js",
@@ -20,7 +20,8 @@
20
20
  "build:esm": "tsc --project tsconfig.esm.json",
21
21
  "prepublishOnly": "npm run build",
22
22
  "copy-configs": "cp -r src/configs dist/cjs/configs && cp -r src/configs dist/esm/configs",
23
- "lint": "eslint src/** --fix --no-error-on-unmatched-pattern"
23
+ "lint": "eslint src/** --fix --no-error-on-unmatched-pattern",
24
+ "remove-dist": "rimraf dist/"
24
25
  },
25
26
  "repository": {
26
27
  "type": "git",
@@ -33,8 +34,8 @@
33
34
  },
34
35
  "homepage": "https://github.com/o-development/ldo/tree/main/packages/solid#readme",
35
36
  "dependencies": {
36
- "@inrupt/solid-client-authn-core": "^2.2.6",
37
- "@solid/community-server": "^7.1.3",
37
+ "@inrupt/solid-client-authn-core": "3.0.0",
38
+ "@solid/community-server": "8.0.0-alpha.0",
38
39
  "cross-env": "^7.0.3"
39
40
  },
40
41
  "files": [
@@ -44,5 +45,5 @@
44
45
  "publishConfig": {
45
46
  "access": "public"
46
47
  },
47
- "gitHead": "08ed23bf5f93c8cba40940ca9a9891e2b07d4a10"
48
+ "gitHead": "9cba3ff753d29e31333a5b39d1e5e3b0b2caab46"
48
49
  }
@@ -1,5 +1,5 @@
1
1
  {
2
- "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld",
2
+ "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld",
3
3
  "import": [
4
4
  "css:config/app/init/initialize-root.json",
5
5
  "css:config/app/main/default.json",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "@context": [
3
- "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld"
3
+ "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^8.0.0/components/context.jsonld"
4
4
  ],
5
5
  "import": [
6
6
  "css:config/app/init/static-root.json",
@@ -22,7 +22,7 @@ import { fileURLToPath } from "node:url";
22
22
  const __dirname = dirname(fileURLToPath(import.meta.url));
23
23
 
24
24
  // Use an increased timeout, since the CSS server takes too much setup time.
25
- vi.setConfig({ testTimeout: 40_000 });
25
+ vi.setConfig({ testTimeout: 40_000, hookTimeout: 40_000 });
26
26
 
27
27
  export function setupServer(
28
28
  port: number,
@@ -56,11 +56,31 @@ export function setupServer(
56
56
  });
57
57
 
58
58
  afterAll(async () => {
59
- data.app.stop();
59
+ // We're potentially ignoring data clean up and server shutdown because
60
+ // sometimes this doesn't work in CI.
61
+ try {
62
+ await Promise.race([
63
+ data.app.stop?.(),
64
+ new Promise((_, reject) =>
65
+ setTimeout(() => reject(new Error("Shutdown timeout")), 10000),
66
+ ),
67
+ ]);
68
+ } catch (err) {
69
+ console.warn("⚠️ Ignoring shutdown error in CI:", (err as Error).message);
70
+ }
71
+
72
+ try {
73
+ const testDataPath = path.join(__dirname, `./data${port}`);
74
+ await fs.rm(testDataPath, { recursive: true, force: true });
75
+ } catch (err) {
76
+ console.warn(
77
+ "⚠️ Ignoring data cleanup error in CI:",
78
+ (err as Error).message,
79
+ );
80
+ }
81
+
60
82
  process.env.JEST_WORKER_ID = previousJestId;
61
83
  process.env.NODE_ENV = previousNodeEnv;
62
- const testDataPath = path.join(__dirname, `./data${port}`);
63
- await fs.rm(testDataPath, { recursive: true, force: true });
64
84
  });
65
85
 
66
86
  beforeEach(async () => {