javascript-solid-server 0.0.196 → 0.0.197
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.
- package/package.json +1 -1
- package/src/handlers/git.js +7 -1
- package/src/mashlib/index.js +3 -160
- package/test/git-auto-init.test.js +16 -1
package/package.json
CHANGED
package/src/handlers/git.js
CHANGED
|
@@ -140,7 +140,13 @@ function tryAutoInitRepo(repoAbs, log) {
|
|
|
140
140
|
} else {
|
|
141
141
|
mkdirSync(repoAbs, { recursive: true });
|
|
142
142
|
}
|
|
143
|
-
|
|
143
|
+
// Pin the initial branch to `main` regardless of the server's
|
|
144
|
+
// `init.defaultBranch` config. `receive.denyCurrentBranch
|
|
145
|
+
// updateInstead` only extracts the working tree when the push
|
|
146
|
+
// targets the branch HEAD points at, so a deterministic default
|
|
147
|
+
// keeps `git push pod HEAD:main` working on every deployment. See
|
|
148
|
+
// #471.
|
|
149
|
+
const result = spawnSync('git', ['init', '-b', 'main', repoAbs], {
|
|
144
150
|
stdio: ['ignore', 'pipe', 'pipe']
|
|
145
151
|
});
|
|
146
152
|
if (result.status !== 0) {
|
package/src/mashlib/index.js
CHANGED
|
@@ -99,156 +99,12 @@ function dataIsland(resourceUrl, jsonLdString) {
|
|
|
99
99
|
*
|
|
100
100
|
* Net effect: when JSS serves an HTML wrapper with an embedded data
|
|
101
101
|
* island, the page renders with one HTTP round-trip instead of two.
|
|
102
|
-
*
|
|
103
|
-
* Extended kludges (kept here so the inline reader stays single-script
|
|
104
|
-
* and the HTML wrapper stays self-contained; remove these once the
|
|
105
|
-
* upstream bugs they work around are fixed):
|
|
106
|
-
*
|
|
107
|
-
* A. Origin rewrite — remap the data island's data-uri and embedded
|
|
108
|
-
* @id origins to the current page origin so the same HTML wrapper
|
|
109
|
-
* renders identically from any host (origin pod, GitHub Pages
|
|
110
|
-
* mirror, static export). No-op when origins already match.
|
|
111
|
-
*
|
|
112
|
-
* B. window.fetch interceptor with JSON-LD↔turtle conversion. JSS
|
|
113
|
-
* serves canonical application/ld+json data islands. Mashlib's
|
|
114
|
-
* fetcher would honor them via its registered JsonLdHandler —
|
|
115
|
-
* except solid-panes/outline/manager.js does its own fetch with
|
|
116
|
-
* Accept: text/turtle and parses the body as turtle
|
|
117
|
-
* unconditionally (the legacy mashlib container-load path).
|
|
118
|
-
* Patching $rdf.parse from outside the bundle does not reach
|
|
119
|
-
* solid-panes' import-scoped binding (webpack ESM namespace
|
|
120
|
-
* isolation). Shim: at the fetch boundary, when the request
|
|
121
|
-
* matches the data island URI, use rdflib's own $rdf.parse +
|
|
122
|
-
* $rdf.serialize to convert JSON-LD→turtle in flight for
|
|
123
|
-
* container URIs; serve raw JSON-LD for everything else.
|
|
124
|
-
* Generic for any RDF shape because rdflib does the conversion.
|
|
125
|
-
*
|
|
126
|
-
* C. jsonld-parser chunk preload. Mashlib's webpack publicPath is
|
|
127
|
-
* hardcoded to '/', so the dynamic import of the JSON-LD parser
|
|
128
|
-
* chunk (chunk 841 in mashlib 2.x — stable across 2.0.0→2.2.0)
|
|
129
|
-
* 404s on any non-root deploy (see SolidOS/mashlib#287). Inject
|
|
130
|
-
* a script tag that loads the chunk from `mashlibBase`; the
|
|
131
|
-
* chunk self-registers into `self.webpackChunkMashlib` so
|
|
132
|
-
* webpack's runtime never issues the broken fetch.
|
|
133
|
-
*
|
|
134
|
-
* @param {string} [mashlibBase='/'] - Base URL where mashlib's chunks
|
|
135
|
-
* are reachable. CDN deploys pass `https://unpkg.com/mashlib@X/dist/`;
|
|
136
|
-
* local deploys default to `/` (JSS serves chunks at root).
|
|
137
102
|
*/
|
|
138
|
-
export function roundTripOptimizationScript(
|
|
103
|
+
export function roundTripOptimizationScript() {
|
|
139
104
|
return `<script>
|
|
140
105
|
(function () {
|
|
141
106
|
if (typeof window === 'undefined') return;
|
|
142
107
|
|
|
143
|
-
// Kludge A: origin rewrite — remap data island URIs to the current
|
|
144
|
-
// page origin so the wrapper renders identically from any host.
|
|
145
|
-
// Best-effort; skipped if globals are missing (e.g. headless test).
|
|
146
|
-
if (window.location && typeof document !== 'undefined'
|
|
147
|
-
&& document.getElementById && typeof URL === 'function') {
|
|
148
|
-
try {
|
|
149
|
-
var __di_el = document.getElementById('dataisland');
|
|
150
|
-
if (__di_el && __di_el.getAttribute) {
|
|
151
|
-
var __di_uri = __di_el.getAttribute('data-uri');
|
|
152
|
-
if (__di_uri) {
|
|
153
|
-
var __di_origUrl = new URL(__di_uri);
|
|
154
|
-
var __di_origin = window.location.origin;
|
|
155
|
-
if (__di_origUrl.origin !== __di_origin && __di_el.setAttribute) {
|
|
156
|
-
__di_el.setAttribute('data-uri',
|
|
157
|
-
__di_origin + __di_origUrl.pathname
|
|
158
|
-
+ __di_origUrl.search + __di_origUrl.hash);
|
|
159
|
-
if (__di_el.textContent) {
|
|
160
|
-
__di_el.textContent = __di_el.textContent
|
|
161
|
-
.split(__di_origUrl.origin).join(__di_origin);
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
|
-
} catch (e) { /* leave the island alone on malformed input */ }
|
|
167
|
-
}
|
|
168
|
-
|
|
169
|
-
// Kludge C: preload the jsonld parser chunk from the same base
|
|
170
|
-
// that hosts mashlib. The chunk self-registers into
|
|
171
|
-
// self.webpackChunkMashlib so the broken /841.mashlib.min.js
|
|
172
|
-
// publicPath:'/' fetch never happens. Best-effort.
|
|
173
|
-
try {
|
|
174
|
-
if (typeof document !== 'undefined' && document.createElement
|
|
175
|
-
&& document.head && document.head.appendChild) {
|
|
176
|
-
var __di_chunk = document.createElement('script');
|
|
177
|
-
__di_chunk.src = ${JSON.stringify(mashlibBase + '841.mashlib.min.js')};
|
|
178
|
-
__di_chunk.async = true;
|
|
179
|
-
document.head.appendChild(__di_chunk);
|
|
180
|
-
}
|
|
181
|
-
} catch (e) { /* ignore */ }
|
|
182
|
-
|
|
183
|
-
// Kludge B: window.fetch interceptor with JSON-LD↔turtle conversion
|
|
184
|
-
// via rdflib (loaded by mashlib). Container URIs get turtle (to feed
|
|
185
|
-
// solid-panes' hardcoded turtle parse); everything else gets JSON-LD
|
|
186
|
-
// (mashlib's JsonLdHandler dispatches natively on Content-Type).
|
|
187
|
-
// Best-effort; skipped if window.fetch missing.
|
|
188
|
-
if (typeof window.fetch === 'function' && typeof document !== 'undefined'
|
|
189
|
-
&& document.getElementById) {
|
|
190
|
-
var __di_convertToTurtle = function (jsonStr, baseUri) {
|
|
191
|
-
return new Promise(function (resolve, reject) {
|
|
192
|
-
var $r = window.$rdf;
|
|
193
|
-
if (!$r || typeof $r.parse !== 'function'
|
|
194
|
-
|| typeof $r.serialize !== 'function'
|
|
195
|
-
|| typeof $r.graph !== 'function') {
|
|
196
|
-
reject(new Error('rdflib not available'));
|
|
197
|
-
return;
|
|
198
|
-
}
|
|
199
|
-
try {
|
|
200
|
-
var __di_tempStore = $r.graph();
|
|
201
|
-
$r.parse(jsonStr, __di_tempStore, baseUri,
|
|
202
|
-
'application/ld+json', function (pErr) {
|
|
203
|
-
if (pErr) { reject(pErr); return; }
|
|
204
|
-
try {
|
|
205
|
-
$r.serialize(null, __di_tempStore, baseUri, 'text/turtle',
|
|
206
|
-
function (sErr, ttl) {
|
|
207
|
-
if (sErr) { reject(sErr); return; }
|
|
208
|
-
resolve(ttl);
|
|
209
|
-
});
|
|
210
|
-
} catch (sx) { reject(sx); }
|
|
211
|
-
});
|
|
212
|
-
} catch (px) { reject(px); }
|
|
213
|
-
});
|
|
214
|
-
};
|
|
215
|
-
var __di_islandResponse = function (body, ct) {
|
|
216
|
-
return new Response(body, {
|
|
217
|
-
status: 200, statusText: 'OK',
|
|
218
|
-
headers: { 'content-type': ct }
|
|
219
|
-
});
|
|
220
|
-
};
|
|
221
|
-
var __di_origFetch = window.fetch.bind(window);
|
|
222
|
-
window.fetch = function (input, init) {
|
|
223
|
-
try {
|
|
224
|
-
var __di_url = (typeof input === 'string') ? input
|
|
225
|
-
: (input && input.url) || String(input);
|
|
226
|
-
var __di_el2 = document.getElementById('dataisland');
|
|
227
|
-
var __di_dataUri = __di_el2 && __di_el2.getAttribute
|
|
228
|
-
&& __di_el2.getAttribute('data-uri');
|
|
229
|
-
var __di_norm = function (u) {
|
|
230
|
-
return String(u).split('#')[0].replace(/\\/$/, '');
|
|
231
|
-
};
|
|
232
|
-
if (__di_dataUri && __di_norm(__di_url) === __di_norm(__di_dataUri)) {
|
|
233
|
-
var __di_isContainer = /\\/(?:[?#].*)?$/.test(String(__di_url));
|
|
234
|
-
if (__di_isContainer) {
|
|
235
|
-
return __di_convertToTurtle(__di_el2.textContent, __di_dataUri)
|
|
236
|
-
.then(function (ttl) {
|
|
237
|
-
return __di_islandResponse(ttl, 'text/turtle');
|
|
238
|
-
})
|
|
239
|
-
.catch(function () {
|
|
240
|
-
return __di_islandResponse(__di_el2.textContent,
|
|
241
|
-
'application/ld+json');
|
|
242
|
-
});
|
|
243
|
-
}
|
|
244
|
-
return Promise.resolve(__di_islandResponse(__di_el2.textContent,
|
|
245
|
-
'application/ld+json'));
|
|
246
|
-
}
|
|
247
|
-
} catch (e) { /* fall through to network */ }
|
|
248
|
-
return __di_origFetch(input, init);
|
|
249
|
-
};
|
|
250
|
-
}
|
|
251
|
-
|
|
252
108
|
// Initialize defensively: another script may have set a truthy
|
|
253
109
|
// window.__dataIsland that lacks a .get function — or, worse,
|
|
254
110
|
// assigned a primitive (string, number, etc.) where attaching
|
|
@@ -408,12 +264,7 @@ export function roundTripOptimizationScript(mashlibBase = '/') {
|
|
|
408
264
|
*/
|
|
409
265
|
export function generateDatabrowserHtml(resourceUrl, cdnVersion = null, opts = {}) {
|
|
410
266
|
const island = dataIsland(resourceUrl, opts.embedJsonLd);
|
|
411
|
-
const
|
|
412
|
-
? `https://unpkg.com/mashlib@${cdnVersion}/dist/`
|
|
413
|
-
: '/';
|
|
414
|
-
const reader = opts.roundTripOptimization === false
|
|
415
|
-
? ''
|
|
416
|
-
: roundTripOptimizationScript(mashlibBase);
|
|
267
|
+
const reader = opts.roundTripOptimization === false ? '' : roundTripOptimizationScript();
|
|
417
268
|
if (cdnVersion) {
|
|
418
269
|
// CDN mode - use script.onload to ensure mashlib is fully loaded before init
|
|
419
270
|
// This avoids race conditions with defer + DOMContentLoaded
|
|
@@ -455,15 +306,7 @@ export function generateDatabrowserHtml(resourceUrl, cdnVersion = null, opts = {
|
|
|
455
306
|
export function generateModuleDatabrowserHtml(moduleUrl, resourceUrl = '', opts = {}) {
|
|
456
307
|
const cssUrl = moduleUrl.replace(/\.js$/, '.css');
|
|
457
308
|
const island = dataIsland(resourceUrl, opts.embedJsonLd);
|
|
458
|
-
|
|
459
|
-
// mashlib's bundled chunks sit alongside the entry point — but if
|
|
460
|
-
// a host (e.g. solid.social) serves only the entry and not chunks,
|
|
461
|
-
// the broken /841.mashlib.min.js request 404s harmlessly and the
|
|
462
|
-
// page falls back to the existing inline-reader paths.
|
|
463
|
-
const mashlibBase = moduleUrl.replace(/[^/]*$/, '');
|
|
464
|
-
const reader = opts.roundTripOptimization === false
|
|
465
|
-
? ''
|
|
466
|
-
: roundTripOptimizationScript(mashlibBase);
|
|
309
|
+
const reader = opts.roundTripOptimization === false ? '' : roundTripOptimizationScript();
|
|
467
310
|
return `<!doctype html><html lang="en"><head><meta charset="utf-8"/>
|
|
468
311
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
469
312
|
<title>Solid Data Browser</title>
|
|
@@ -15,7 +15,7 @@ import { createServer } from '../src/server.js';
|
|
|
15
15
|
import { createServer as createNetServer } from 'net';
|
|
16
16
|
import fs from 'fs-extra';
|
|
17
17
|
import path from 'path';
|
|
18
|
-
import { existsSync, statSync, writeFileSync } from 'fs';
|
|
18
|
+
import { existsSync, statSync, writeFileSync, readFileSync } from 'fs';
|
|
19
19
|
|
|
20
20
|
const TEST_HOST = 'localhost';
|
|
21
21
|
const DATA_DIR = './test-data-git-auto-init';
|
|
@@ -77,6 +77,21 @@ describe('Git auto-init on first push', () => {
|
|
|
77
77
|
assert.ok(existsSync(path.join(dotGit, 'refs')), '.git/refs must exist');
|
|
78
78
|
});
|
|
79
79
|
|
|
80
|
+
it('pins the initial branch to `main` regardless of server config', async () => {
|
|
81
|
+
// `updateInstead` only extracts the working tree when the push
|
|
82
|
+
// targets the branch HEAD points at. If `git init` honoured the
|
|
83
|
+
// server's `init.defaultBranch`, a server configured for e.g.
|
|
84
|
+
// `gh-pages` would silently fail to extract files pushed to `main`.
|
|
85
|
+
// Pin the auto-init'd HEAD so `git push pod HEAD:main` works
|
|
86
|
+
// everywhere. See #471.
|
|
87
|
+
const repoPath = 'public/apps/penny';
|
|
88
|
+
const headPath = path.resolve(DATA_DIR, repoPath, '.git', 'HEAD');
|
|
89
|
+
assert.ok(existsSync(headPath), 'prereq: repo from earlier test still exists');
|
|
90
|
+
const head = readFileSync(headPath, 'utf8').trim();
|
|
91
|
+
assert.strictEqual(head, 'ref: refs/heads/main',
|
|
92
|
+
`HEAD must point at refs/heads/main, got: ${head}`);
|
|
93
|
+
});
|
|
94
|
+
|
|
80
95
|
it('auto-inits a regular repo when the target directory exists but is empty', async () => {
|
|
81
96
|
const repoPath = 'public/empty-dir';
|
|
82
97
|
await fs.ensureDir(path.resolve(DATA_DIR, repoPath));
|