data.coop/pinafore
8
0
Fork 0
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

fix: remove LEGACY mode (#1867)

Browse source
This commit is contained in:
Nolan Lawson 2020-09-13 13:37:54 -07:00 committed by GitHub
parent 295bd18e05
commit 7803bdf797
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 36 additions and 1873 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CONTRIBUTING.md
View file

@ -138,12 +138,6 @@ updating the `fixtures/` should make that a no-op.
There are also some unit tests that run in Node using Mocha. You can find them in `tests/unit` and
run them using `yarn run test-unit`.
## Legacy build
Pinafore also offers a "legacy" build designed for older browsers. To build this version, use:
LEGACY=1 yarn build
## Debug build
To disable minification in a production build (for debugging purposes), you can run:

6
bin/build-inline-script.js
View file

@ -6,7 +6,6 @@ import { rollup } from 'rollup'
import { terser } from 'rollup-plugin-terser'
import replace from '@rollup/plugin-replace'
import fromPairs from 'lodash-es/fromPairs'
import babel from 'rollup-plugin-babel'
import { themes } from '../src/routes/_static/themes'
import terserOptions from './terserOptions'
@ -22,13 +21,8 @@ export async function buildInlineScript () {
plugins: [
replace({
'process.browser': true,
'process.env.LEGACY': JSON.stringify(process.env.LEGACY),
'process.env.THEME_COLORS': JSON.stringify(themeColors)
}),
process.env.LEGACY && babel({
runtimeHelpers: true,
presets: ['@babel/preset-env']
}),
!process.env.DEBUG && terser(terserOptions)
]
})

11
package.json
View file

@ -43,16 +43,8 @@
"build-vercel-json": "node -r esm bin/build-vercel-json.js"
},
"dependencies": {
"@babel/core": "^7.10.5",
"@babel/plugin-transform-runtime": "^7.10.5",
"@babel/preset-env": "^7.10.4",
"@babel/runtime": "^7.10.5",
"@rollup/plugin-replace": "^2.3.3",
"@webcomponents/custom-elements": "^1.4.1",
"@webcomponents/shadydom": "^1.7.3",
"array-flat-polyfill": "^1.0.1",
"arrow-key-navigation": "^1.2.0",
"babel-loader": "^8.1.0",
"blurhash": "^1.1.3",
"cheerio": "^1.0.0-rc.3",
"child-process-promise": "^2.2.1",
@ -75,9 +67,6 @@
"focus-visible": "^5.1.0",
"form-data": "^3.0.0",
"glob": "^7.1.6",
"indexeddb-getall-shim": "^1.3.6",
"intersection-observer": "^0.11.0",
"intl": "^1.2.5",
"li": "^1.3.0",
"localstorage-memory": "^1.0.3",
"lodash-es": "^4.17.15",

1
src/client.js
View file

@ -1,4 +1,3 @@
import './routes/_thirdparty/regenerator-runtime/runtime.js'
import * as sapper from '../__sapper__/client.js'
import './routes/_utils/serviceWorkerClient'
import './routes/_utils/historyEvents'

37
src/routes/_components/dialog/components/EmojiDialog.html
View file

@ -68,40 +68,6 @@
import { doubleRAF } from '../../../_utils/doubleRAF'
import { convertCustomEmojiToEmojiPickerFormat } from '../../../_utils/convertCustomEmojiToEmojiPickerFormat'
function applyShadowDomPolyfill (picker) {
// polyfill for :host, plus other fixes mostly targeted at KaiOS.
// We could use shadycss, but it doesn't really work for our use case (has to be injected
// into the web component's connectedCallback directly).
const style = picker.shadowRoot.querySelector('style')
style.remove()
if (!document.getElementById('emoji-picker-style')) {
let css = style.textContent
css = css.replace(/:host\(([.*?])\)/g, 'emoji-picker$1')
css = css.replace(/:host/g, 'emoji-picker')
css = css.replace(/\*/g, 'emoji-picker *')
css = css.replace(/\b(button|input|input\[type=search\])\s*\{/, 'emoji-picker $1{')
// fixes for KaiOS style bugs
css += `
emoji-picker .emoji-menu {
grid-template-columns: repeat(8, 1fr);
}
@media screen and (max-width: 320px) {
emoji-picker .emoji-menu {
grid-template-columns: repeat(6, 1fr);
}
.emoji-container {
width: calc(100% - 20px);
}
}
`
const newStyle = document.createElement('style')
newStyle.id = 'emoji-picker-style'
newStyle.textContent = css
document.head.appendChild(newStyle)
}
}
export default {
async oncreate () {
onCreateDialog.call(this)
@ -117,9 +83,6 @@
}
applyFocusVisiblePolyfill(picker.shadowRoot)
registerShadowRoot(picker.shadowRoot)
if (process.env.LEGACY && !HTMLElement.prototype.attachShadow.toString().includes('[native code]')) {
applyShadowDomPolyfill(picker)
}
this.on('destroy', () => unregisterShadowRoot(picker.shadowRoot))
if (!isUserTouching) { // auto focus the input on desktop
doubleRAF(() => { // triple rAF because a11y tries to focus as well

6
src/routes/_components/dialog/components/MediaAltEditor.html
View file

@ -20,8 +20,6 @@
max={mediaAltCharLimit}
style="width: 100%; text-align: right;"
/>
<!-- WASM is unlikely to work on older browsers and Tesseract.js is a big dependency -->
{#if !legacy}
<button class="extract-text-button" type="button"
on:click="onClick()"
disabled={extracting}
@ -37,7 +35,6 @@
overLimit={false}
max={100}
/>
{/if}
</div>
<style>
.media-alt-editor {
@ -128,8 +125,7 @@
mediaAltCharLimit: MEDIA_ALT_CHAR_LIMIT,
extracting: false,
className: '',
extractionProgress: 0,
legacy: process.env.LEGACY
extractionProgress: 0
}),
computed: {
length: ({ rawText }) => length(rawText || ''),

21
src/routes/_thirdparty/regenerator-runtime/LICENSE vendored
View file

@ -1,21 +0,0 @@
MIT License
Copyright (c) 2014-present, Facebook, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

709
src/routes/_thirdparty/regenerator-runtime/runtime.js vendored
View file

@ -1,709 +0,0 @@
/* eslint-disable */
// via https://unpkg.com/browse/regenerator-runtime@0.13.3/
/**
* Copyright (c) 2014-present, Facebook, Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
var globalObj = (typeof self !== 'undefined' ? self : window);
globalObj.regeneratorRuntime = (function (exports) {
"use strict";
var Op = Object.prototype;
var hasOwn = Op.hasOwnProperty;
var undefined; // More compressible than void 0.
var $Symbol = typeof Symbol === "function" ? Symbol : {};
var iteratorSymbol = $Symbol.iterator || "@@iterator";
var asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator";
var toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
function wrap(innerFn, outerFn, self, tryLocsList) {
// If outerFn provided and outerFn.prototype is a Generator, then outerFn.prototype instanceof Generator.
var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator;
var generator = Object.create(protoGenerator.prototype);
var context = new Context(tryLocsList || []);
// The ._invoke method unifies the implementations of the .next,
// .throw, and .return methods.
generator._invoke = makeInvokeMethod(innerFn, self, context);
return generator;
}
exports.wrap = wrap;
// Try/catch helper to minimize deoptimizations. Returns a completion
// record like context.tryEntries[i].completion. This interface could
// have been (and was previously) designed to take a closure to be
// invoked without arguments, but in all the cases we care about we
// already have an existing method we want to call, so there's no need
// to create a new function object. We can even get away with assuming
// the method takes exactly one argument, since that happens to be true
// in every case, so we don't have to touch the arguments object. The
// only additional allocation required is the completion record, which
// has a stable shape and so hopefully should be cheap to allocate.
function tryCatch(fn, obj, arg) {
try {
return { type: "normal", arg: fn.call(obj, arg) };
} catch (err) {
return { type: "throw", arg: err };
}
}
var GenStateSuspendedStart = "suspendedStart";
var GenStateSuspendedYield = "suspendedYield";
var GenStateExecuting = "executing";
var GenStateCompleted = "completed";
// Returning this object from the innerFn has the same effect as
// breaking out of the dispatch switch statement.
var ContinueSentinel = {};
// Dummy constructor functions that we use as the .constructor and
// .constructor.prototype properties for functions that return Generator
// objects. For full spec compliance, you may wish to configure your
// minifier not to mangle the names of these two functions.
function Generator() {}
function GeneratorFunction() {}
function GeneratorFunctionPrototype() {}
// This is a polyfill for %IteratorPrototype% for environments that
// don't natively support it.
var IteratorPrototype = {};
IteratorPrototype[iteratorSymbol] = function () {
return this;
};
var getProto = Object.getPrototypeOf;
var NativeIteratorPrototype = getProto && getProto(getProto(values([])));
if (NativeIteratorPrototype &&
NativeIteratorPrototype !== Op &&
hasOwn.call(NativeIteratorPrototype, iteratorSymbol)) {
// This environment has a native %IteratorPrototype%; use it instead
// of the polyfill.
IteratorPrototype = NativeIteratorPrototype;
}
var Gp = GeneratorFunctionPrototype.prototype =
Generator.prototype = Object.create(IteratorPrototype);
GeneratorFunction.prototype = Gp.constructor = GeneratorFunctionPrototype;
GeneratorFunctionPrototype.constructor = GeneratorFunction;
GeneratorFunctionPrototype[toStringTagSymbol] =
GeneratorFunction.displayName = "GeneratorFunction";
// Helper for defining the .next, .throw, and .return methods of the
// Iterator interface in terms of a single ._invoke method.
function defineIteratorMethods(prototype) {
["next", "throw", "return"].forEach(function(method) {
prototype[method] = function(arg) {
return this._invoke(method, arg);
};
});
}
exports.isGeneratorFunction = function(genFun) {
var ctor = typeof genFun === "function" && genFun.constructor;
return ctor
? ctor === GeneratorFunction ||
// For the native GeneratorFunction constructor, the best we can
// do is to check its .name property.
(ctor.displayName || ctor.name) === "GeneratorFunction"
: false;
};
exports.mark = function(genFun) {
if (Object.setPrototypeOf) {
Object.setPrototypeOf(genFun, GeneratorFunctionPrototype);
} else {
genFun.__proto__ = GeneratorFunctionPrototype;
if (!(toStringTagSymbol in genFun)) {
genFun[toStringTagSymbol] = "GeneratorFunction";
}
}
genFun.prototype = Object.create(Gp);
return genFun;
};
// Within the body of any async function, `await x` is transformed to
// `yield regeneratorRuntime.awrap(x)`, so that the runtime can test
// `hasOwn.call(value, "__await")` to determine if the yielded value is
// meant to be awaited.
exports.awrap = function(arg) {
return { __await: arg };
};
function AsyncIterator(generator) {
function invoke(method, arg, resolve, reject) {
var record = tryCatch(generator[method], generator, arg);
if (record.type === "throw") {
reject(record.arg);
} else {
var result = record.arg;
var value = result.value;
if (value &&
typeof value === "object" &&
hasOwn.call(value, "__await")) {
return Promise.resolve(value.__await).then(function(value) {
invoke("next", value, resolve, reject);
}, function(err) {
invoke("throw", err, resolve, reject);
});
}
return Promise.resolve(value).then(function(unwrapped) {
// When a yielded Promise is resolved, its final value becomes
// the .value of the Promise<{value,done}> result for the
// current iteration.
result.value = unwrapped;
resolve(result);
}, function(error) {
// If a rejected Promise was yielded, throw the rejection back
// into the async generator function so it can be handled there.
return invoke("throw", error, resolve, reject);
});
}
}
var previousPromise;
function enqueue(method, arg) {
function callInvokeWithMethodAndArg() {
return new Promise(function(resolve, reject) {
invoke(method, arg, resolve, reject);
});
}
return previousPromise =
// If enqueue has been called before, then we want to wait until
// all previous Promises have been resolved before calling invoke,
// so that results are always delivered in the correct order. If
// enqueue has not been called before, then it is important to
// call invoke immediately, without waiting on a callback to fire,
// so that the async generator function has the opportunity to do
// any necessary setup in a predictable way. This predictability
// is why the Promise constructor synchronously invokes its
// executor callback, and why async functions synchronously
// execute code before the first await. Since we implement simple
// async functions in terms of async generators, it is especially
// important to get this right, even though it requires care.
previousPromise ? previousPromise.then(
callInvokeWithMethodAndArg,
// Avoid propagating failures to Promises returned by later
// invocations of the iterator.
callInvokeWithMethodAndArg
) : callInvokeWithMethodAndArg();
}
// Define the unified helper method that is used to implement .next,
// .throw, and .return (see defineIteratorMethods).
this._invoke = enqueue;
}
defineIteratorMethods(AsyncIterator.prototype);
AsyncIterator.prototype[asyncIteratorSymbol] = function () {
return this;
};
exports.AsyncIterator = AsyncIterator;
// Note that simple async functions are implemented on top of
// AsyncIterator objects; they just return a Promise for the value of
// the final result produced by the iterator.
exports.async = function(innerFn, outerFn, self, tryLocsList) {
var iter = new AsyncIterator(
wrap(innerFn, outerFn, self, tryLocsList)
);
return exports.isGeneratorFunction(outerFn)
? iter // If outerFn is a generator, return the full iterator.
: iter.next().then(function(result) {
return result.done ? result.value : iter.next();
});
};
function makeInvokeMethod(innerFn, self, context) {
var state = GenStateSuspendedStart;
return function invoke(method, arg) {
if (state === GenStateExecuting) {
throw new Error("Generator is already running");
}
if (state === GenStateCompleted) {
if (method === "throw") {
throw arg;
}
// Be forgiving, per 25.3.3.3.3 of the spec:
// https://people.mozilla.org/~jorendorff/es6-draft.html#sec-generatorresume
return doneResult();
}
context.method = method;
context.arg = arg;
while (true) {
var delegate = context.delegate;
if (delegate) {
var delegateResult = maybeInvokeDelegate(delegate, context);
if (delegateResult) {
if (delegateResult === ContinueSentinel) continue;
return delegateResult;
}
}
if (context.method === "next") {
// Setting context._sent for legacy support of Babel's
// function.sent implementation.
context.sent = context._sent = context.arg;
} else if (context.method === "throw") {
if (state === GenStateSuspendedStart) {
state = GenStateCompleted;
throw context.arg;
}
context.dispatchException(context.arg);
} else if (context.method === "return") {
context.abrupt("return", context.arg);
}
state = GenStateExecuting;
var record = tryCatch(innerFn, self, context);
if (record.type === "normal") {
// If an exception is thrown from innerFn, we leave state ===
// GenStateExecuting and loop back for another invocation.
state = context.done
? GenStateCompleted
: GenStateSuspendedYield;
if (record.arg === ContinueSentinel) {
continue;
}
return {
value: record.arg,
done: context.done
};
} else if (record.type === "throw") {
state = GenStateCompleted;
// Dispatch the exception by looping back around to the
// context.dispatchException(context.arg) call above.
context.method = "throw";
context.arg = record.arg;
}
}
};
}
// Call delegate.iterator[context.method](context.arg) and handle the
// result, either by returning a { value, done } result from the
// delegate iterator, or by modifying context.method and context.arg,
// setting context.delegate to null, and returning the ContinueSentinel.
function maybeInvokeDelegate(delegate, context) {
var method = delegate.iterator[context.method];
if (method === undefined) {
// A .throw or .return when the delegate iterator has no .throw
// method always terminates the yield* loop.
context.delegate = null;
if (context.method === "throw") {
// Note: ["return"] must be used for ES3 parsing compatibility.
if (delegate.iterator["return"]) {
// If the delegate iterator has a return method, give it a
// chance to clean up.
context.method = "return";
context.arg = undefined;
maybeInvokeDelegate(delegate, context);
if (context.method === "throw") {
// If maybeInvokeDelegate(context) changed context.method from
// "return" to "throw", let that override the TypeError below.
return ContinueSentinel;
}
}
context.method = "throw";
context.arg = new TypeError(
"The iterator does not provide a 'throw' method");
}
return ContinueSentinel;
}
var record = tryCatch(method, delegate.iterator, context.arg);
if (record.type === "throw") {
context.method = "throw";
context.arg = record.arg;
context.delegate = null;
return ContinueSentinel;
}
var info = record.arg;
if (! info) {
context.method = "throw";
context.arg = new TypeError("iterator result is not an object");
context.delegate = null;
return ContinueSentinel;
}
if (info.done) {
// Assign the result of the finished delegate to the temporary
// variable specified by delegate.resultName (see delegateYield).
context[delegate.resultName] = info.value;
// Resume execution at the desired location (see delegateYield).
context.next = delegate.nextLoc;
// If context.method was "throw" but the delegate handled the
// exception, let the outer generator proceed normally. If
// context.method was "next", forget context.arg since it has been
// "consumed" by the delegate iterator. If context.method was
// "return", allow the original .return call to continue in the
// outer generator.
if (context.method !== "return") {
context.method = "next";
context.arg = undefined;
}
} else {
// Re-yield the result returned by the delegate method.
return info;
}
// The delegate iterator is finished, so forget it and continue with
// the outer generator.
context.delegate = null;
return ContinueSentinel;
}
// Define Generator.prototype.{next,throw,return} in terms of the
// unified ._invoke helper method.
defineIteratorMethods(Gp);
Gp[toStringTagSymbol] = "Generator";
// A Generator should always return itself as the iterator object when the
// @@iterator function is called on it. Some browsers' implementations of the
// iterator prototype chain incorrectly implement this, causing the Generator
// object to not be returned from this call. This ensures that doesn't happen.
// See https://github.com/facebook/regenerator/issues/274 for more details.
Gp[iteratorSymbol] = function() {
return this;
};
Gp.toString = function() {
return "[object Generator]";
};
function pushTryEntry(locs) {
var entry = { tryLoc: locs[0] };
if (1 in locs) {
entry.catchLoc = locs[1];
}
if (2 in locs) {
entry.finallyLoc = locs[2];
entry.afterLoc = locs[3];
}
this.tryEntries.push(entry);
}
function resetTryEntry(entry) {
var record = entry.completion || {};
record.type = "normal";
delete record.arg;
entry.completion = record;
}
function Context(tryLocsList) {
// The root entry object (effectively a try statement without a catch
// or a finally block) gives us a place to store values thrown from
// locations where there is no enclosing try statement.
this.tryEntries = [{ tryLoc: "root" }];
tryLocsList.forEach(pushTryEntry, this);
this.reset(true);
}
exports.keys = function(object) {
var keys = [];
for (var key in object) {
keys.push(key);
}
keys.reverse();
// Rather than returning an object with a next method, we keep
// things simple and return the next function itself.
return function next() {
while (keys.length) {
var key = keys.pop();
if (key in object) {
next.value = key;
next.done = false;
return next;
}
}
// To avoid creating an additional object, we just hang the .value
// and .done properties off the next function object itself. This
// also ensures that the minifier will not anonymize the function.
next.done = true;
return next;
};
};
function values(iterable) {
if (iterable) {
var iteratorMethod = iterable[iteratorSymbol];
if (iteratorMethod) {
return iteratorMethod.call(iterable);
}
if (typeof iterable.next === "function") {
return iterable;
}
if (!isNaN(iterable.length)) {
var i = -1, next = function next() {
while (++i < iterable.length) {
if (hasOwn.call(iterable, i)) {
next.value = iterable[i];
next.done = false;
return next;
}
}
next.value = undefined;
next.done = true;
return next;
};
return next.next = next;
}
}
// Return an iterator with no values.
return { next: doneResult };
}
exports.values = values;
function doneResult() {
return { value: undefined, done: true };
}
Context.prototype = {
constructor: Context,
reset: function(skipTempReset) {
this.prev = 0;
this.next = 0;
// Resetting context._sent for legacy support of Babel's
// function.sent implementation.
this.sent = this._sent = undefined;
this.done = false;
this.delegate = null;
this.method = "next";
this.arg = undefined;
this.tryEntries.forEach(resetTryEntry);
if (!skipTempReset) {
for (var name in this) {
// Not sure about the optimal order of these conditions:
if (name.charAt(0) === "t" &&
hasOwn.call(this, name) &&
!isNaN(+name.slice(1))) {
this[name] = undefined;
}
}
}
},
stop: function() {
this.done = true;
var rootEntry = this.tryEntries[0];
var rootRecord = rootEntry.completion;
if (rootRecord.type === "throw") {
throw rootRecord.arg;
}
return this.rval;
},
dispatchException: function(exception) {
if (this.done) {
throw exception;
}
var context = this;
function handle(loc, caught) {
record.type = "throw";
record.arg = exception;
context.next = loc;
if (caught) {
// If the dispatched exception was caught by a catch block,
// then let that catch block handle the exception normally.
context.method = "next";
context.arg = undefined;
}
return !! caught;
}
for (var i = this.tryEntries.length - 1; i >= 0; --i) {
var entry = this.tryEntries[i];
var record = entry.completion;
if (entry.tryLoc === "root") {
// Exception thrown outside of any try block that could handle
// it, so set the completion value of the entire function to
// throw the exception.
return handle("end");
}
if (entry.tryLoc <= this.prev) {
var hasCatch = hasOwn.call(entry, "catchLoc");
var hasFinally = hasOwn.call(entry, "finallyLoc");
if (hasCatch && hasFinally) {
if (this.prev < entry.catchLoc) {
return handle(entry.catchLoc, true);
} else if (this.prev < entry.finallyLoc) {
return handle(entry.finallyLoc);
}
} else if (hasCatch) {
if (this.prev < entry.catchLoc) {
return handle(entry.catchLoc, true);
}
} else if (hasFinally) {
if (this.prev < entry.finallyLoc) {
return handle(entry.finallyLoc);
}
} else {
throw new Error("try statement without catch or finally");
}
}
}
},
abrupt: function(type, arg) {
for (var i = this.tryEntries.length - 1; i >= 0; --i) {
var entry = this.tryEntries[i];
if (entry.tryLoc <= this.prev &&
hasOwn.call(entry, "finallyLoc") &&
this.prev < entry.finallyLoc) {
var finallyEntry = entry;
break;
}
}
if (finallyEntry &&
(type === "break" ||
type === "continue") &&
finallyEntry.tryLoc <= arg &&
arg <= finallyEntry.finallyLoc) {
// Ignore the finally entry if control is not jumping to a
// location outside the try/catch block.
finallyEntry = null;
}
var record = finallyEntry ? finallyEntry.completion : {};
record.type = type;
record.arg = arg;
if (finallyEntry) {
this.method = "next";
this.next = finallyEntry.finallyLoc;
return ContinueSentinel;
}
return this.complete(record);
},
complete: function(record, afterLoc) {
if (record.type === "throw") {
throw record.arg;
}
if (record.type === "break" ||
record.type === "continue") {
this.next = record.arg;
} else if (record.type === "return") {
this.rval = this.arg = record.arg;
this.method = "return";
this.next = "end";
} else if (record.type === "normal" && afterLoc) {
this.next = afterLoc;
}
return ContinueSentinel;
},
finish: function(finallyLoc) {
for (var i = this.tryEntries.length - 1; i >= 0; --i) {
var entry = this.tryEntries[i];
if (entry.finallyLoc === finallyLoc) {
this.complete(entry.completion, entry.afterLoc);
resetTryEntry(entry);
return ContinueSentinel;
}
}
},
"catch": function(tryLoc) {
for (var i = this.tryEntries.length - 1; i >= 0; --i) {
var entry = this.tryEntries[i];
if (entry.tryLoc === tryLoc) {
var record = entry.completion;
if (record.type === "throw") {
var thrown = record.arg;
resetTryEntry(entry);
}
return thrown;
}
}
// The context.catch method must only be called with a location
// argument that corresponds to a known catch block.
throw new Error("illegal catch attempt");
},
delegateYield: function(iterable, resultName, nextLoc) {
this.delegate = {
iterator: values(iterable),
resultName: resultName,
nextLoc: nextLoc
};
if (this.method === "next") {
// Deliberately forget the last sent value so that we don't
// accidentally pass it on to the delegate.
this.arg = undefined;
}
return ContinueSentinel;
}
};
// Regardless of whether this script is executing as a CommonJS module
// or not, return the runtime object so that we can declare the variable
// regeneratorRuntime in the outer scope, which allows this module to be
// injected easily by `bin/regenerator --include-runtime script.js`.
return exports;
}({}));
/* eslint-enable */

23
src/routes/_utils/asyncPolyfills.js
View file

@ -1,31 +1,8 @@
export const importIntersectionObserver = () => import(
/* webpackChunkName: '$polyfill$-intersection-observer' */ 'intersection-observer'
)
export const importRequestIdleCallback = () => import(
/* webpackChunkName: '$polyfill$-requestidlecallback' */ 'requestidlecallback'
)
export const importIndexedDBGetAllShim = () => import(
/* webpackChunkName: '$polyfill$-indexeddb-getall-shim' */ 'indexeddb-getall-shim'
)
export const importCustomElementsPolyfill = () => import(
/* webpackChunkName: '$polyfill$-@webcomponents/custom-elements' */ '@webcomponents/custom-elements'
)
export const importIntl = () => import(
/* webpackChunkName: '$polyfill$-intl' */ 'intl'
)
export const importFocusVisible = () => import(
/* webpackChunkName: '$polyfill$-focus-visible' */ 'focus-visible'
)
export const importShadowDomPolyfill = () => import(
/* webpackChunkName: '$polyfill$-shadydom' */ '@webcomponents/shadydom'
)
export const importArrayFlat = () => import(
/* webpackChunkName: '$polyfill$-array-flat' */ 'array-flat-polyfill'
)

17
src/routes/_utils/loadPolyfills.js
View file

@ -1,22 +1,9 @@
import {
importArrayFlat,
importCustomElementsPolyfill,
importIndexedDBGetAllShim,
importIntersectionObserver,
importIntl,
importRequestIdleCallback,
importShadowDomPolyfill
importRequestIdleCallback
} from './asyncPolyfills'
export function loadPolyfills () {
return Promise.all([
typeof requestIdleCallback === 'undefined' && importRequestIdleCallback(),
// these legacy polyfills should be kept in sync with webpack/shared.config.js
process.env.LEGACY && !Array.prototype.flat && importArrayFlat(),
process.env.LEGACY && !IDBObjectStore.prototype.getAll && importIndexedDBGetAllShim(),
process.env.LEGACY && typeof IntersectionObserver === 'undefined' && importIntersectionObserver(),
process.env.LEGACY && typeof Intl === 'undefined' && importIntl(),
process.env.LEGACY && typeof customElements === 'undefined' && importCustomElementsPolyfill(),
process.env.LEGACY && !HTMLElement.prototype.attachShadow && importShadowDomPolyfill()
typeof requestIdleCallback === 'undefined' && importRequestIdleCallback()
])
}

1
src/routes/_workers/blurhash.js
View file

@ -1,4 +1,3 @@
import '../_thirdparty/regenerator-runtime/runtime.js'
import { decode as decodeBlurHash } from 'blurhash'
import registerPromiseWorker from 'promise-worker/register'
import { BLURHASH_RESOLUTION as RESOLUTION } from '../_static/blurhash'

1
src/service-worker.js
View file

@ -1,4 +1,3 @@
import './routes/_thirdparty/regenerator-runtime/runtime.js'
import {
assets as __assets__,
shell as __shell__,

5
webpack/client.config.js
View file

@ -4,7 +4,6 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
const LodashModuleReplacementPlugin = require('lodash-webpack-plugin')
const terser = require('./terser.config')
const CircularDependencyPlugin = require('circular-dependency-plugin')
const legacyBabel = require('./legacyBabel.config')
const { mode, dev, resolve, inlineSvgs, allSvgs } = require('./shared.config')
const urlRegex = require('../src/routes/_utils/urlRegexSource.js')()
@ -47,7 +46,6 @@ module.exports = {
}
}
},
process.env.LEGACY && legacyBabel(),
{
test: /\.html$/,
use: {
@ -87,8 +85,7 @@ module.exports = {
'process.env.NODE_ENV': JSON.stringify(mode),
'process.env.INLINE_SVGS': JSON.stringify(inlineSvgs),
'process.env.ALL_SVGS': JSON.stringify(allSvgs),
'process.env.URL_REGEX': urlRegex.toString(),
'process.env.LEGACY': !!process.env.LEGACY
'process.env.URL_REGEX': urlRegex.toString()
}),
new webpack.NormalModuleReplacementPlugin(
/\/_database\/database\.js$/, // this version plays nicer with IDEs

42
webpack/legacyBabel.config.js
View file

@ -1,42 +0,0 @@
module.exports = () => ({
test: /\.(m?js|html)$/,
exclude: path => {
if (!path.includes('node_modules')) {
return false // don't exclude our own modules
}
const toSkip = [
'tesseract.js',
'realistic-structured-clone',
'@babel/runtime',
'page-lifecycle',
'localstorage-memory',
'promise-worker',
'webpack'
]
for (const module of toSkip) {
if (path.includes(`node_modules/${module}`)) {
return true // exclude certain packages that don't transpile well
}
}
return false
},
use: {
loader: 'babel-loader',
options: {
presets: [
'@babel/preset-env'
],
plugins: [
[
'@babel/plugin-transform-runtime',
{
// This started failing with commit 2a248cb for some mysterious reason, causing an error:
// TypeError: Cannot set property 'wrap' of undefined
// I could not for the life of me figure out how to fix it, so I just manually import regenerator.
regenerator: false
}
]
]
}
}
})

4
webpack/server.config.js
View file

@ -15,6 +15,7 @@ const NOOP_MODULES = [
]
const serverResolve = JSON.parse(JSON.stringify(resolve))
serverResolve.alias = serverResolve.alias || {}
NOOP_MODULES.forEach(mod => {
serverResolve.alias[mod] = 'lodash-es/noop'
})
@ -52,8 +53,7 @@ module.exports = {
plugins: [
new webpack.DefinePlugin({
'process.env.INLINE_SVGS': JSON.stringify(inlineSvgs),
'process.env.ALL_SVGS': JSON.stringify(allSvgs),
'process.env.LEGACY': !!process.env.LEGACY
'process.env.ALL_SVGS': JSON.stringify(allSvgs)
})
]
}

7
webpack/service-worker.config.js
View file

@ -2,7 +2,6 @@ const config = require('sapper/config/webpack.js')
const terser = require('./terser.config')
const webpack = require('webpack')
const { mode, dev, resolve } = require('./shared.config')
const legacyBabel = require('./legacyBabel.config')
module.exports = {
entry: config.serviceworker.entry(),
@ -10,11 +9,6 @@ module.exports = {
resolve,
mode,
devtool: dev ? 'inline-source-map' : 'source-map',
module: {
rules: [
process.env.LEGACY && legacyBabel()
].filter(Boolean)
},
optimization: dev ? {} : {
minimize: !process.env.DEBUG,
minimizer: [
@ -25,7 +19,6 @@ module.exports = {
new webpack.DefinePlugin({
'process.browser': true,
'process.env.NODE_ENV': JSON.stringify(mode),
'process.env.LEGACY': !!process.env.LEGACY,
'process.env.SAPPER_TIMESTAMP': process.env.SAPPER_TIMESTAMP || Date.now()
})
].filter(Boolean)

27
webpack/shared.config.js
View file

@ -21,32 +21,7 @@ const dev = mode === 'development'
const resolve = {
extensions: ['.js', '.json', '.html'],
mainFields: ['svelte', 'module', 'browser', 'main'],
alias: {
react: 'preact/compat/dist/compat.module.js',
'react-dom': 'preact/compat/dist/compat.module.js',
...(process.env.LEGACY ? {
'../_utils/tesseractWorker.js': 'lodash/noop',
'emoji-mart/dist-modern/components/picker/nimble-picker': 'emoji-mart/dist-es/components/picker/nimble-picker',
'emoji-regex/es2015/text': 'emoji-regex/text',
'page-lifecycle/dist/lifecycle.mjs': 'page-lifecycle/dist/lifecycle.es5.js',
'./SvgIcon.html': './SvgIconLegacy.html',
'../SvgIcon.html': '../SvgIconLegacy.html',
'../../SvgIcon.html': '../../SvgIconLegacy.html',
'../../_components/SvgIcon.html': '../../_components/SvgIconLegacy.html',
'../../../_components/SvgIcon.html': '../../../_components/SvgIconLegacy.html'
} : {
// these polyfills are only needed in legacy mode
'array-flat-polyfill': 'lodash/noop',
'indexeddb-getall-shim': 'lodash/noop',
intl: 'lodash/noop',
'intersection-observer': 'lodash/noop',
'@webcomponents/custom-elements': 'lodash/noop',
'@webcomponents/shadydom': 'lodash/noop',
'./routes/_thirdparty/regenerator-runtime/runtime.js': 'lodash/noop',
'../_thirdparty/regenerator-runtime/runtime.js': 'lodash/noop'
})
}
mainFields: ['svelte', 'module', 'browser', 'main']
}
module.exports = {

957
yarn.lock
View file

File diff suppressed because it is too large Load diff