Skip to content

Commit 93ed33b

Browse files
committed
Updating coincident to its latest
1 parent 036b48c commit 93ed33b

10 files changed

+198
-217
lines changed

docs/index.js

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/index.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/zip-CGWtiqjJ.js

-2
This file was deleted.

docs/zip-gl8b5xR3.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/zip-CGWtiqjJ.js.map renamed to docs/zip-gl8b5xR3.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esm/worker/_template.js

+7-31
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// bigger than it used to be before any changes is applied to this file.
66

77
import * as JSON from '@ungap/structured-clone/json';
8-
import coincident from 'coincident/window';
8+
import coincident from 'coincident/window/worker';
99

1010
import { assign, create, createFunction, createOverload, createResolved, dispatch, registerJSModules } from '../utils.js';
1111
import createJSModules from './js_modules.js';
@@ -32,19 +32,23 @@ const add = (type, fn) => {
3232

3333
const { parse, stringify } = JSON;
3434

35-
const { proxy: sync, window, isWindowProxy } = coincident(self, {
35+
const { proxy: sync, sync: syncMainAndWorker, polyfill, window, isWindowProxy } = await coincident({
3636
parse,
3737
stringify,
3838
transform: value => transform ? transform(value) : value
3939
});
4040

4141
const xworker = {
42+
// propagate the fact SharedArrayBuffer is polyfilled
43+
polyfill,
4244
// allows synchronous utilities between this worker and the main thread
4345
sync,
4446
// allow access to the main thread world
4547
window,
4648
// allow introspection for foreign (main thread) refrences
4749
isWindowProxy,
50+
// propagate the fact `window` can be used
51+
hasWindow: syncMainAndWorker,
4852
// standard worker related events / features
4953
onmessage: console.info,
5054
onerror: console.error,
@@ -61,38 +65,10 @@ add('message', ({ data: { options, config: baseURL, configURL, code, hooks } })
6165

6266
const interpreter = await getRuntime(runtimeID, baseURL, configURL, config);
6367

64-
const { js_modules, sync_main_only } = configs.get(runtimeID);
68+
const { js_modules } = configs.get(runtimeID);
6569

6670
const mainModules = js_modules?.main;
6771

68-
// this flag allows interacting with the xworker.sync exposed
69-
// *only in the worker* and eventually invoked *only from main*.
70-
// If that flag is `false` or not present, then SharedArrayBuffer
71-
// must be available or not much can work in here.
72-
let syncMainAndWorker = !sync_main_only;
73-
74-
// bails out out of the box with a native/meaningful error
75-
// in case the SharedArrayBuffer is not available
76-
try {
77-
new SharedArrayBuffer(4);
78-
// if this does not throw there's no reason to
79-
// branch out of all the features ... but ...
80-
syncMainAndWorker = true;
81-
}
82-
// eslint-disable-next-line no-unused-vars
83-
catch (_) {
84-
// if it does throw and `sync_main_only` was not `true`
85-
// then there's no way to go further
86-
if (syncMainAndWorker) {
87-
throw new Error(
88-
[
89-
'Unable to use SharedArrayBuffer due insecure environment.',
90-
'Please read requirements in MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer#security_requirements',
91-
].join('\n'),
92-
);
93-
}
94-
}
95-
9672
const details = create(registry.get(type));
9773

9874
const resolved = createResolved(

esm/worker/class.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import * as JSON from '@ungap/structured-clone/json';
21
import fetch from '@webreflection/fetch';
3-
import coincident from 'coincident/window';
42
import xworker from './xworker.js';
53
import { getConfigURLAndType } from '../loader.js';
64
import { assign, create, defineProperties, importCSS, importJS } from '../utils.js';
@@ -45,7 +43,7 @@ export default (...args) =>
4543
});
4644

4745
const sync = assign(
48-
coincident(worker, JSON).proxy,
46+
worker.proxy,
4947
{ importJS, importCSS },
5048
);
5149

package-lock.json

+165-170
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"license": "APACHE-2.0",
4141
"devDependencies": {
4242
"@node-loader/import-maps": "^1.1.0",
43-
"@playwright/test": "^1.45.2",
43+
"@playwright/test": "^1.45.3",
4444
"@rollup/plugin-node-resolve": "^15.2.3",
4545
"@rollup/plugin-terser": "^0.4.4",
4646
"@zip.js/zip.js": "^2.7.47",
@@ -49,9 +49,9 @@
4949
"chokidar": "^3.6.0",
5050
"eslint": "^9.7.0",
5151
"linkedom": "^0.18.4",
52-
"rollup": "^4.18.1",
52+
"rollup": "^4.19.0",
5353
"static-handler": "^0.4.3",
54-
"typescript": "^5.5.3"
54+
"typescript": "^5.5.4"
5555
},
5656
"type": "module",
5757
"module": "./dist/index.js",
@@ -83,14 +83,14 @@
8383
"@webreflection/idb-map": "^0.3.1",
8484
"basic-devtools": "^0.1.6",
8585
"codedent": "^0.1.2",
86-
"coincident": "^1.2.3",
86+
"coincident": "^2.0.0-rc3",
8787
"gc-hook": "^0.3.1",
8888
"html-escaper": "^3.0.3",
8989
"proxy-target": "^3.0.2",
9090
"sticky-module": "^0.1.1",
9191
"to-json-callback": "^0.1.1"
9292
},
9393
"worker": {
94-
"blob": "sha256-1GVYWvaeoNZQWMkVaV243TH9CjdQ95JPuNGGAj3OrDI="
94+
"blob": "sha256-/7mU0W9+r+gE4w81wkQG4lOLZZuastawu03Ln1AMXK4="
9595
}
9696
}

rollup/build_xworker.cjs

+15-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,24 @@ const DIST_DIR = resolve(join(__dirname, "..", "dist"));
1212
const WORKERS_DIR = resolve(join(__dirname, "..", "esm", "worker"));
1313
const PACKAGE_JSON = resolve(join(__dirname, "..", "package.json"));
1414

15+
const coincident = [
16+
"import * as JSON from '@ungap/structured-clone/json';",
17+
"import coincident from 'coincident/window/main';",
18+
'const { Worker } = coincident(JSON);',
19+
];
20+
1521
for (const file of readdirSync(DIST_DIR)) {
1622
if (file.startsWith("_")) {
1723
if (process.env.NO_MIN) {
1824
writeFileSync(
1925
join(WORKERS_DIR, "xworker.js"),
20-
`/* c8 ignore next */\nexport default () => new Worker('/dist/_template.js',{type:'module'});`,
26+
[
27+
'/* c8 ignore start */',
28+
...coincident,
29+
`export default () => new Worker('/dist/_template.js');`,
30+
'/* c8 ignore stop */',
31+
''
32+
].join("\n")
2133
);
2234
} else {
2335
const js = JSON.stringify(
@@ -39,7 +51,8 @@ for (const file of readdirSync(DIST_DIR)) {
3951
'const {url} = import.meta;',
4052
`const re = ${/import\((['"])([^)]+?\.js)\1\)/}g;`,
4153
`const place = ${(_,q,f) => `import(${q}${new URL(f,url).href}${q})`};`,
42-
`export default () => new Worker(URL.createObjectURL(new Blob([${js}.replace(re,place)],{type:'application/javascript'})),{type:'module'})`,
54+
...coincident,
55+
`export default () => new Worker(URL.createObjectURL(new Blob([${js}.replace(re,place)],{type:'application/javascript'})))`,
4356
'/* c8 ignore stop */',
4457
''
4558
].join("\n")

0 commit comments

Comments
 (0)