This hook's headSting represents everything that will be written to <head> tag excluding CSS (those are managed on the style hook).
+ use: `This hook's headSting represents everything that will be written to <head> tag.
There are many possible SEO uses to this hook, especially for plugins. That said, we recommend users who want to set common SEO elements such as tags <title> and meta descriptions programatically to do it from within Svelte templates using the <svelte:head></svelte:head> tag. Chances are you won't need this field unless you're a power user and need access to the raw head.
`,
location: 'Page.ts',
experimental: false,
advanced: true,
},
+ {
+ hook: 'compileHtml',
+ props: ['helpers', 'data', 'request', 'headString', 'footerString', 'layoutHtml', 'htmlString'],
+ mutable: ['errors', 'htmlString'],
+ context: 'This is where Elder.js merges the html from the Svelte layout with stacks and wraps it in an tag.',
+ use: `This hook should only be used when you need to have full control over the <html> document. Make sure if you use this to add 'elderCompileHtml' to the 'hooks.disable' array in your elder.config.js or your template will be overwritten.
`,
+ location: 'Page.ts',
+ experimental: false,
+ advanced: true,
+ },
+
{
hook: 'html',
props: ['helpers', 'data', 'settings', 'request', 'htmlString', 'query', 'errors'],
@@ -260,7 +285,7 @@ export const hookInterface: Array = [
{
hook: 'buildComplete',
- props: ['helpers', 'data', 'settings', 'timings', 'query', 'errors', 'routes'],
+ props: ['helpers', 'data', 'settings', 'timings', 'query', 'errors', 'routes', 'allRequests'],
mutable: [],
context: 'Executed after a build is complete',
use: `Contains whether the build was successful. If not it contains errors for the entire build. Also includes
diff --git a/src/hookInterface/types.ts b/src/hookInterface/types.ts
index 43988a0d..cd9a75e8 100644
--- a/src/hookInterface/types.ts
+++ b/src/hookInterface/types.ts
@@ -3,11 +3,12 @@ export type Hook =
| 'bootstrap'
| 'allRequests'
| 'middleware'
- | 'modifyCustomProps'
| 'request'
| 'data'
+ | 'shortcodes'
| 'stacks'
| 'head'
+ | 'compileHtml'
| 'html'
| 'requestComplete'
| 'error'
diff --git a/src/hooks.ts b/src/hooks.ts
index c22a2e2d..6cd1e7b8 100644
--- a/src/hooks.ts
+++ b/src/hooks.ts
@@ -3,13 +3,15 @@ import fs from 'fs-extra';
import { parseBuildPerf } from './utils';
import externalHelpers from './externalHelpers';
import { HookOptions } from './hookInterface/types';
+import prepareShortcodeParser from './utils/prepareShortcodeParser';
+import Page from './utils/Page';
const hooks: Array = [
{
hook: 'bootstrap',
name: 'elderAddExternalHelpers',
description: 'Adds external helpers to helpers object',
- priority: 100,
+ priority: 1,
run: async ({ helpers, query, settings }) => {
let additionalHelpers = {};
try {
@@ -28,11 +30,132 @@ const hooks: Array = [
return null;
},
},
+ {
+ hook: 'middleware',
+ name: 'elderExpressLikeMiddleware',
+ description: 'An express like middleware so requests can be served by Elder.js',
+ priority: 1,
+ run: async ({
+ serverLookupObject,
+ settings,
+ query,
+ helpers,
+ data,
+ routes,
+ allRequests,
+ runHook,
+ errors,
+ shortcodes,
+ req,
+ next,
+ res,
+ request,
+ }) => {
+ if (req.path) {
+ let reqPath = req.path;
+
+ if (settings.server.prefix && settings.server.prefix.length > 0) {
+ if (reqPath.indexOf(settings.server.prefix) !== 0) {
+ return next();
+ }
+ }
+
+ // see if we have a request object with the path as is. (could include / or not.)
+ let requestObject = serverLookupObject[reqPath];
+
+ if (!requestObject && reqPath[reqPath.length - 1] === '/') {
+ // check the path without a slash.
+ requestObject = serverLookupObject[reqPath.substring(0, reqPath.length - 1)];
+ } else if (!requestObject) {
+ // check the path with a slash.
+ reqPath += '/';
+ requestObject = serverLookupObject[reqPath];
+ }
+
+ // if we have a requestObject then we know it is for ElderGuide
+ if (requestObject) {
+ let route = routes[requestObject.route];
+ if (request && request.route) {
+ route = routes[request.route];
+ }
+ const forPage = {
+ request: { ...requestObject, ...request },
+ settings,
+ query,
+ helpers,
+ data,
+ route,
+ runHook,
+ allRequests,
+ routes,
+ errors,
+ shortcodes,
+ };
+
+ const page = new Page(forPage);
+
+ const html = await page.html();
+
+ if (html && !res.headerSent) {
+ res.setHeader('Content-Type', 'text/html');
+ res.end(html);
+ }
+ } else {
+ next();
+ }
+ } else {
+ next();
+ }
+ return {};
+ },
+ },
+ {
+ hook: 'shortcodes',
+ name: 'elderProcessShortcodes',
+ description:
+ "Builds the shortcode parser, parses shortcodes from the html returned by the route's html and appends anything needed to the stacks.",
+ priority: 50,
+ run: async ({
+ helpers,
+ data,
+ settings,
+ request,
+ query,
+ cssStack,
+ headStack,
+ customJsStack,
+ templateHtml,
+ shortcodes,
+ allRequests,
+ }) => {
+ const ShortcodeParser = prepareShortcodeParser({
+ shortcodes,
+ helpers,
+ data,
+ settings,
+ request,
+ query,
+ cssStack,
+ headStack,
+ customJsStack,
+ allRequests,
+ });
+
+ const html = await ShortcodeParser.parse(templateHtml);
+
+ return {
+ templateHtml: html,
+ headStack,
+ cssStack,
+ customJsStack,
+ };
+ },
+ },
{
hook: 'stacks',
name: 'elderAddMetaCharsetToHead',
description: `Adds = [
{
source: 'elderAddMetaCharsetToHead',
string: ` = [
hook: 'stacks',
name: 'elderAddMetaViewportToHead',
description: `Adds = [
{
source: 'elderAddMetaViewportToHead',
string: ` = [
hook: 'stacks',
name: 'elderAddDefaultIntersectionObserver',
description: 'Sets up the default polyfill for the intersection observer',
- priority: 1,
- run: async ({ beforeHydrateStack, settings }) => {
- if (settings && settings.locations && {}.hasOwnProperty.call(settings.locations, 'intersectionObserverPoly')) {
- if (settings.locations.intersectionObserverPoly) {
- return {
- beforeHydrateStack: [
- {
- source: 'elderAddDefaultIntersectionObserver',
- string: ``,
- priority: 1,
- },
- ...beforeHydrateStack,
- ],
- };
- }
- } else {
- console.log(
- 'Not injecting intersection observer polyfill. To not see this warning set locations.intersectionObserverPoly = false in elder.config.js.',
- );
- }
- return null;
+ priority: 100,
+ },
+ ...beforeHydrateStack,
+ ],
+ };
},
},
{
@@ -102,54 +216,59 @@ const hooks: Array = [
name: 'elderAddSystemJs',
description: 'AddsSystemJs to beforeHydrateStack also add preloading of systemjs to the headStack.',
priority: 1,
- run: async ({ beforeHydrateStack, headStack, settings }) => {
- if (settings && settings.locations && {}.hasOwnProperty.call(settings.locations, 'systemJs')) {
- if (settings.locations.systemJs) {
- return {
- beforeHydrateStack: [
- {
- source: 'elderAddSystemJs',
- string: ``,
- priority: 2,
- },
- ...beforeHydrateStack,
- ],
+ run: async ({ beforeHydrateStack, headStack }) => {
+ return {
+ beforeHydrateStack: [
+ {
+ source: 'elderAddSystemJs',
+ string: ``,
+ priority: 99,
+ },
+ ...beforeHydrateStack,
+ ],
- headStack: [
- {
- source: 'elderAddSystemJs',
- string: ` = [
priority: 50,
run: async ({ errors, settings }) => {
if (errors && errors.length > 0) {
- const buildOutputLocation = path.resolve(process.cwd(), `./___ELDER___/build-${Date.now()}.json`);
- console.log(`Writing details on the ${errors.length} build errors to: ${buildOutputLocation}`);
- fs.writeJSONSync(buildOutputLocation, { errors, settings });
+ const buildOutputLocation = path.resolve(settings.rootDir, `./___ELDER___/build-errors-${Date.now()}.json`);
+ console.log(
+ `Errors during Elder.js build. Writing details on the ${errors.length} build errors to: ${buildOutputLocation}`,
+ );
+ fs.writeJSONSync(buildOutputLocation, { settings, buildErrors: errors });
+
+ errors.forEach((error) => {
+ console.error(error);
+ console.error(`------`);
+ });
}
},
},
diff --git a/src/index.ts b/src/index.ts
index f9410c9a..813fcdee 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,10 +1,11 @@
/* istanbul ignore file */
-export { configSchema, hookSchema, routeSchema, pluginSchema } from './utils/validations';
-
-export { Elder, getElderConfig, build, partialHydration } from './Elder';
+export { configSchema, hookSchema, routeSchema, pluginSchema, shortcodeSchema } from './utils/validations';
+export { Elder, build, partialHydration } from './Elder';
export * from './utils/types';
export * from './utils/index';
export * from './routes/routes';
export * from './hookInterface/types';
export { hookInterface } from './hookInterface/hookInterface';
export { hookEntityDefinitions } from './hookInterface/hookEntityDefinitions';
+
+export { default as getElderConfig } from './utils/getConfig';
diff --git a/src/partialHydration/__tests__/partialHydration.spec.ts b/src/partialHydration/__tests__/partialHydration.spec.ts
index 1bdd3b60..41ed0f6e 100644
--- a/src/partialHydration/__tests__/partialHydration.spec.ts
+++ b/src/partialHydration/__tests__/partialHydration.spec.ts
@@ -39,4 +39,28 @@ test('#partialHydration', async () => {
})
).code,
).toEqual(` {
diff --git a/src/shortcodes.ts b/src/shortcodes.ts
new file mode 100644
index 00000000..b9ed52db
--- /dev/null
+++ b/src/shortcodes.ts
@@ -0,0 +1,41 @@
+import { ShortcodeDefs } from './utils/types';
+
+const shortcodes: ShortcodeDefs = [
+ {
+ shortcode: 'svelteComponent',
+ run: async ({ props, helpers }) => {
+ if (!props.name) throw new Error(`svelteComponent shortcode requires a name="" property.`);
+
+ let parsedProps = {};
+ try {
+ parsedProps = JSON.parse(props.props);
+ } catch {
+ console.error(
+ `Can't parse ${props.name} svelteComponent prop=${props.props} to JSON. It needs to be serializable.`,
+ );
+ }
+
+ let parsedOptions = {};
+ try {
+ parsedOptions = JSON.parse(props.options);
+ } catch {
+ console.error(
+ `Can't parse ${props.name} svelteComponent options=${props.options} to JSON. It needs to be serializable.`,
+ );
+ }
+ return {
+ html: helpers.inlineSvelteComponent({
+ name: props.name,
+ props: parsedProps,
+ options: parsedOptions,
+ }),
+ };
+ },
+ $$meta: {
+ addedBy: 'elder',
+ type: 'elder',
+ },
+ },
+];
+
+export default shortcodes;
diff --git a/src/utils/Page.ts b/src/utils/Page.ts
index dd3cdc4f..9a021746 100644
--- a/src/utils/Page.ts
+++ b/src/utils/Page.ts
@@ -2,7 +2,7 @@
import getUniqueId from './getUniqueId';
import perf from './perf';
import prepareProcessStack from './prepareProcessStack';
-import { QueryOptions, Stack, SettingOptions, ConfigOptions, RequestOptions } from './types';
+import { QueryOptions, Stack, SettingOptions, ConfigOptions, RequestOptions, ShortcodeDefs } from './types';
import { RoutesOptions } from '../routes/types';
import createReadOnlyProxy from './createReadOnlyProxy';
@@ -26,8 +26,11 @@ const buildPage = async (page) => {
perf: page.perf,
allRequests: createReadOnlyProxy(page.allRequests, 'allRequests', `${page.request.route}: data function`),
});
- if (dataResponse) {
- page.data = dataResponse;
+ if (dataResponse && Object.keys(dataResponse).length > 0) {
+ page.data = {
+ ...page.data,
+ ...dataResponse,
+ };
}
}
page.perf.end('data');
@@ -35,64 +38,57 @@ const buildPage = async (page) => {
// start building templates
page.perf.start('html.template');
-
- // template building starts here
-
- const routeHTML = page.route.templateComponent({
+ page.templateHtml = page.route.templateComponent({
page,
props: {
data: page.data,
helpers: page.helpers,
- settings: page.settings,
- request: page.request,
+ settings: createReadOnlyProxy(page.settings, 'settings', `${page.request.route}: Svelte Template`),
+ request: createReadOnlyProxy(page.request, 'request', `${page.request.route}: Svelte Template`),
},
});
-
page.perf.end('html.template');
+ await page.runHook('shortcodes', page);
+
page.perf.start('html.layout');
- const layoutHtml = page.route.layout({
+ page.layoutHtml = page.route.layout({
page,
props: {
data: page.data,
helpers: page.helpers,
- settings: page.settings,
- request: page.request,
- routeHTML,
+ settings: createReadOnlyProxy(page.settings, 'settings', `${page.request.route}: Svelte Layout`),
+ request: createReadOnlyProxy(page.request, 'request', `${page.request.route}: Svelte Layout`),
+ templateHtml: page.templateHtml,
},
});
page.perf.end('html.layout');
- // Run header hooks / stacks to make headString
await page.runHook('stacks', page);
+
+ // prepare for head hook
page.head = page.processStack('headStack');
page.cssString = '';
page.cssString = page.processStack('cssStack');
- page.styleTag = ``;
+ page.styleTag = ``;
page.headString = `${page.head}${page.styleTag}`;
- page.beforeHydrate = page.processStack('beforeHydrateStack');
- page.hydrate = ``;
- page.customJs = page.processStack('customJsStack');
- page.footer = page.processStack('footerStack');
await page.runHook('head', page);
- page.perf.start('html.createHtmlString');
- page.htmlString = `
-
-
- ${page.headString}
-
-
- ${layoutHtml}
- ${page.hydrateStack.length > 0 ? page.beforeHydrate : '' /* page.hydrateStack.length is correct here */}
- ${page.hydrateStack.length > 0 ? page.hydrate : ''}
- ${page.customJsStack.length > 0 ? page.customJs : ''}
- ${page.footerStack.length > 0 ? page.footer : ''}
-
-
+ // prepare for compileHtml
+ const beforeHydrate = page.processStack('beforeHydrateStack');
+ const hydrate = ``;
+ const customJs = page.processStack('customJsStack');
+ const footer = page.processStack('footerStack');
+
+ page.footerString = `
+ ${page.hydrateStack.length > 0 ? beforeHydrate : '' /* page.hydrateStack.length is correct here */}
+ ${page.hydrateStack.length > 0 ? hydrate : ''}
+ ${page.customJsStack.length > 0 ? customJs : ''}
+ ${page.footerStack.length > 0 ? footer : ''}
`;
- page.perf.end('html.createHtmlString');
+
+ await page.runHook('compileHtml', page);
await page.runHook('html', page);
@@ -108,7 +104,6 @@ const buildPage = async (page) => {
await page.runHook('error', page);
}
} catch (err) {
- console.log(err, page.permalink);
page.errors.push(err);
await page.runHook('error', page);
}
@@ -142,7 +137,11 @@ class Page {
perf: any;
- customProps: any;
+ layoutHtml: string;
+
+ templateHtml: string;
+
+ cssString: string;
htmlString: string;
@@ -158,19 +157,9 @@ class Page {
footerStack: Stack;
- constructor({
- request,
- settings,
- query,
- helpers,
- data,
- route,
- runHook,
- allRequests,
- routes,
- errors,
- customProps = {},
- }) {
+ shortcodes: ShortcodeDefs;
+
+ constructor({ request, settings, query, helpers, data, route, runHook, allRequests, routes, errors, shortcodes }) {
this.uid = getUniqueId();
perf(this);
this.perf.start('page');
@@ -185,36 +174,30 @@ class Page {
this.query = query;
this.errors = [...errors];
this.routes = routes;
- this.customProps = customProps;
+ this.cssString = '';
this.htmlString = '';
-
this.headStack = [];
this.cssStack = [];
this.beforeHydrateStack = [];
this.hydrateStack = [];
this.customJsStack = [];
this.footerStack = [];
+ this.shortcodes = shortcodes;
this.processStack = prepareProcessStack(this);
-
- this.runHook('modifyCustomProps', this);
-
this.perf.end('constructor');
-
this.perf.start('initToBuildGap');
}
build() {
- return buildPage(this);
+ return buildPage(this).then((page) => page);
}
html() {
if (this.htmlString) {
return this.htmlString;
}
- return buildPage(this)
- .then((page) => page.htmlString)
- .catch(JSON.stringify);
+ return buildPage(this).then((page) => page.htmlString);
}
}
diff --git a/src/utils/__tests__/Page.spec.ts b/src/utils/__tests__/Page.spec.ts
index be9a71e5..6f27961b 100644
--- a/src/utils/__tests__/Page.spec.ts
+++ b/src/utils/__tests__/Page.spec.ts
@@ -87,7 +87,7 @@ const settings = {
},
debug: {
stacks: false,
- hooks: false,
+ hooks: true,
performance: false,
build: false,
automagic: false,
@@ -202,49 +202,23 @@ describe('#Page', () => {
routes,
errors: [],
runHook,
+ shortcodes: [],
};
- const expectedOutput = `
-
-
- headStack
-
-
-
- beforeHydrateStack
-
- customJsStack
- footerStack
-
- `;
-
it('initialize and build', async () => {
const page = new Page(pageInput);
expect(page).toMatchSnapshot();
- expect(hooks).toEqual(['modifyCustomProps']);
await page.build();
- expect(hooks).toEqual(['modifyCustomProps', 'request', 'data', 'stacks', 'head', 'html', 'requestComplete']);
+ expect(hooks).toEqual([
+ 'request',
+ 'data',
+ 'shortcodes',
+ 'stacks',
+ 'head',
+ 'compileHtml',
+ 'html',
+ 'requestComplete',
+ ]);
expect(page).toMatchSnapshot();
- const htmlString = await page.html();
- expect(htmlString.trim()).toEqual(expectedOutput);
- });
-
- it('init and request html', async () => {
- const page = new Page({ ...pageInput, route: { ...pageInput.route, data: { worldPopulation: 7805564950 } } });
- const html = await page.html();
- expect(html.trim()).toEqual(expectedOutput);
- });
-
- it('init and request html, throw catched errors', async () => {
- const page = new Page({
- ...pageInput,
- runHook: (hook) => {
- if (hook === 'request' || hook === 'error') {
- throw new Error(`mocked for hook: ${hook}`);
- }
- return runHook(hook);
- },
- });
- expect(await page.html()).toEqual('{}');
});
});
diff --git a/src/utils/__tests__/__snapshots__/Page.spec.ts.snap b/src/utils/__tests__/__snapshots__/Page.spec.ts.snap
index 269060ba..3bbf7734 100644
--- a/src/utils/__tests__/__snapshots__/Page.spec.ts.snap
+++ b/src/utils/__tests__/__snapshots__/Page.spec.ts.snap
@@ -28,8 +28,8 @@ Page {
],
"beforeHydrateStack": Array [],
"cssStack": Array [],
+ "cssString": "",
"customJsStack": Array [],
- "customProps": Object {},
"data": Object {},
"errors": Array [],
"footerStack": Array [],
@@ -176,7 +176,7 @@ Page {
"debug": Object {
"automagic": false,
"build": false,
- "hooks": false,
+ "hooks": true,
"performance": false,
"stacks": false,
},
@@ -206,6 +206,7 @@ Page {
"typescript": false,
"worker": true,
},
+ "shortcodes": Array [],
"uid": "xxxxxxxxxx",
}
`;
@@ -236,48 +237,37 @@ Page {
"type": "build",
},
],
- "beforeHydrate": "beforeHydrateStack",
"beforeHydrateStack": Array [],
"cssStack": Array [],
"cssString": "cssStack",
- "customJs": "customJsStack",
"customJsStack": Array [
"customJsStack",
],
- "customProps": Object {},
"data": Object {
"worldPopulation": 7805564950,
},
"errors": Array [],
- "footer": "footerStack",
"footerStack": Array [
"footerStack",
],
+ "footerString": "
+ beforeHydrateStack
+
+ customJsStack
+ footerStack
+ ",
"head": "headStack",
"headStack": Array [],
- "headString": "headStack",
+ "headString": "headStack",
"helpers": Object {
"metersInAMile": 0.00062137119224,
"permalinks": Object {},
},
- "htmlString": "
-
-
- headStack
-
-
-
- beforeHydrateStack
-
- customJsStack
- footerStack
-
-
- ",
- "hydrate": "",
+ "htmlString": "",
"hydrateStack": Array [
"hydrateStack",
],
+ "layoutHtml": "
",
"perf": Object {
"end": [MockFunction] {
"calls": Array [
@@ -296,9 +286,6 @@ Page {
Array [
"html.layout",
],
- Array [
- "html.createHtmlString",
- ],
Array [
"page",
],
@@ -328,10 +315,6 @@ Page {
"type": "return",
"value": undefined,
},
- Object {
- "type": "return",
- "value": undefined,
- },
],
},
"start": [MockFunction] {
@@ -354,9 +337,6 @@ Page {
Array [
"html.layout",
],
- Array [
- "html.createHtmlString",
- ],
],
"results": Array [
Object {
@@ -383,10 +363,6 @@ Page {
"type": "return",
"value": undefined,
},
- Object {
- "type": "return",
- "value": undefined,
- },
],
},
"stop": [MockFunction] {
@@ -467,7 +443,6 @@ Page {
},
"type": "build",
},
- "routeHTML": undefined,
"settings": Object {
"$$internal": Object {
"hashedComponents": Object {
@@ -488,7 +463,7 @@ Page {
"debug": Object {
"automagic": false,
"build": false,
- "hooks": false,
+ "hooks": true,
"performance": false,
"stacks": false,
},
@@ -518,6 +493,7 @@ Page {
"typescript": false,
"worker": true,
},
+ "templateHtml": undefined,
},
},
],
@@ -575,7 +551,7 @@ Page {
"debug": Object {
"automagic": false,
"build": false,
- "hooks": false,
+ "hooks": true,
"performance": false,
"stacks": false,
},
@@ -663,7 +639,7 @@ Page {
"debug": Object {
"automagic": false,
"build": false,
- "hooks": false,
+ "hooks": true,
"performance": false,
"stacks": false,
},
@@ -693,7 +669,9 @@ Page {
"typescript": false,
"worker": true,
},
- "styleTag": "",
+ "shortcodes": Array [],
+ "styleTag": "",
+ "templateHtml": undefined,
"timings": Array [],
"uid": "xxxxxxxxxx",
}
diff --git a/src/utils/__tests__/__snapshots__/getRollupConfig.spec.ts.snap b/src/utils/__tests__/__snapshots__/getRollupConfig.spec.ts.snap
new file mode 100644
index 00000000..54c3338f
--- /dev/null
+++ b/src/utils/__tests__/__snapshots__/getRollupConfig.spec.ts.snap
@@ -0,0 +1,614 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`#getRollupConfig getRollupConfig as a whole works 1`] = `
+Array [
+ Object {
+ "input": "./node_modules/intersection-observer/intersection-observer.js",
+ "output": Array [
+ Object {
+ "file": "dist/static/intersection-observer.js",
+ "format": "iife",
+ "name": "./static/intersection-observer.js",
+ "plugins": Array [
+ Object {
+ "name": "terser",
+ "renderChunk": [Function],
+ },
+ ],
+ },
+ ],
+ },
+ Object {
+ "input": "./node_modules/systemjs/dist/s.min.js",
+ "output": Array [
+ Object {
+ "file": "dist/static/s.min.js",
+ "format": "iife",
+ "name": "./static/s.min.js",
+ "plugins": Array [
+ Object {
+ "name": "terser",
+ "renderChunk": [Function],
+ },
+ ],
+ },
+ ],
+ },
+ Object {
+ "cache": true,
+ "input": "route1.svelte",
+ "output": Object {
+ "dir": "test/___ELDER___/compiled",
+ "exports": "auto",
+ "format": "cjs",
+ },
+ "plugins": Array [
+ Object {
+ "name": "replace",
+ "renderChunk": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "json",
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "load": [Function],
+ "name": "svelte",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "generateBundle": [Function],
+ "getPackageInfoForId": [Function],
+ "load": [Function],
+ "name": "node-resolve",
+ "resolveId": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "load": [Function],
+ "name": "commonjs",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "name": "css",
+ "transform": [Function],
+ },
+ Object {
+ "name": "terser",
+ "renderChunk": [Function],
+ },
+ ],
+ "treeshake": true,
+ },
+ Object {
+ "cache": true,
+ "input": "route2.svelte",
+ "output": Object {
+ "dir": "test/___ELDER___/compiled",
+ "exports": "auto",
+ "format": "cjs",
+ },
+ "plugins": Array [
+ Object {
+ "name": "replace",
+ "renderChunk": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "json",
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "load": [Function],
+ "name": "svelte",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "generateBundle": [Function],
+ "getPackageInfoForId": [Function],
+ "load": [Function],
+ "name": "node-resolve",
+ "resolveId": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "load": [Function],
+ "name": "commonjs",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "name": "css",
+ "transform": [Function],
+ },
+ Object {
+ "name": "terser",
+ "renderChunk": [Function],
+ },
+ ],
+ "treeshake": true,
+ },
+ Object {
+ "cache": true,
+ "input": "layout1.svelte",
+ "output": Object {
+ "dir": "test/___ELDER___/compiled",
+ "exports": "auto",
+ "format": "cjs",
+ },
+ "plugins": Array [
+ Object {
+ "name": "replace",
+ "renderChunk": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "json",
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "load": [Function],
+ "name": "svelte",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "generateBundle": [Function],
+ "getPackageInfoForId": [Function],
+ "load": [Function],
+ "name": "node-resolve",
+ "resolveId": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "load": [Function],
+ "name": "commonjs",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "name": "css",
+ "transform": [Function],
+ },
+ Object {
+ "name": "terser",
+ "renderChunk": [Function],
+ },
+ ],
+ "treeshake": true,
+ },
+ Object {
+ "cache": true,
+ "input": "layout2.svelte",
+ "output": Object {
+ "dir": "test/___ELDER___/compiled",
+ "exports": "auto",
+ "format": "cjs",
+ },
+ "plugins": Array [
+ Object {
+ "name": "replace",
+ "renderChunk": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "json",
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "load": [Function],
+ "name": "svelte",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "generateBundle": [Function],
+ "getPackageInfoForId": [Function],
+ "load": [Function],
+ "name": "node-resolve",
+ "resolveId": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "load": [Function],
+ "name": "commonjs",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "name": "css",
+ "transform": [Function],
+ },
+ Object {
+ "name": "terser",
+ "renderChunk": [Function],
+ },
+ ],
+ "treeshake": true,
+ },
+ Object {
+ "cache": true,
+ "input": Array [
+ "rc/components/*/*.svelte",
+ "rc/components/*.svelte",
+ ],
+ "output": Object {
+ "dir": "test/public/svelte",
+ "entryFileNames": "entry[name]-[hash].js",
+ "format": "system",
+ "sourcemap": false,
+ },
+ "plugins": Array [
+ Object {
+ "options": [Function],
+ "pluginName": "rollup-plugin-multi-input",
+ },
+ Object {
+ "name": "replace",
+ "renderChunk": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "json",
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "load": [Function],
+ "name": "svelte",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "rollup-plugin-external-globals",
+ "transform": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "generateBundle": [Function],
+ "getPackageInfoForId": [Function],
+ "load": [Function],
+ "name": "node-resolve",
+ "resolveId": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "load": [Function],
+ "name": "commonjs",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "load": [Function],
+ "name": "babel",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "terser",
+ "renderChunk": [Function],
+ },
+ ],
+ "treeshake": true,
+ },
+ Object {
+ "cache": true,
+ "input": Array [
+ "rc/components/*/*.svelte",
+ "rc/components/*.svelte",
+ ],
+ "output": Object {
+ "dir": "test/___ELDER___/compiled",
+ "exports": "auto",
+ "format": "cjs",
+ },
+ "plugins": Array [
+ Object {
+ "options": [Function],
+ "pluginName": "rollup-plugin-multi-input",
+ },
+ Object {
+ "name": "replace",
+ "renderChunk": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "json",
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "load": [Function],
+ "name": "svelte",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "generateBundle": [Function],
+ "getPackageInfoForId": [Function],
+ "load": [Function],
+ "name": "node-resolve",
+ "resolveId": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "load": [Function],
+ "name": "commonjs",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "name": "css",
+ "transform": [Function],
+ },
+ Object {
+ "name": "terser",
+ "renderChunk": [Function],
+ },
+ ],
+ "treeshake": true,
+ },
+ Object {
+ "cache": true,
+ "input": Array [
+ "src/plugins/pluginA/*.svelte",
+ ],
+ "output": Object {
+ "dir": "test/public/svelte",
+ "entryFileNames": "entry[name]-[hash].js",
+ "format": "system",
+ "sourcemap": false,
+ },
+ "plugins": Array [
+ Object {
+ "options": [Function],
+ "pluginName": "rollup-plugin-multi-input",
+ },
+ Object {
+ "name": "replace",
+ "renderChunk": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "json",
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "load": [Function],
+ "name": "svelte",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "rollup-plugin-external-globals",
+ "transform": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "generateBundle": [Function],
+ "getPackageInfoForId": [Function],
+ "load": [Function],
+ "name": "node-resolve",
+ "resolveId": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "load": [Function],
+ "name": "commonjs",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "load": [Function],
+ "name": "babel",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "terser",
+ "renderChunk": [Function],
+ },
+ ],
+ "treeshake": true,
+ },
+ Object {
+ "cache": true,
+ "input": Array [
+ "src/plugins/pluginA/*.svelte",
+ ],
+ "output": Object {
+ "dir": "test/___ELDER___/compiled",
+ "exports": "auto",
+ "format": "cjs",
+ },
+ "plugins": Array [
+ Object {
+ "options": [Function],
+ "pluginName": "rollup-plugin-multi-input",
+ },
+ Object {
+ "name": "replace",
+ "renderChunk": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "json",
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "load": [Function],
+ "name": "svelte",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "generateBundle": [Function],
+ "getPackageInfoForId": [Function],
+ "load": [Function],
+ "name": "node-resolve",
+ "resolveId": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "load": [Function],
+ "name": "commonjs",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "name": "css",
+ "transform": [Function],
+ },
+ Object {
+ "name": "terser",
+ "renderChunk": [Function],
+ },
+ ],
+ "treeshake": true,
+ },
+ Object {
+ "cache": true,
+ "input": Array [
+ "src/plugins/pluginB/*.svelte",
+ ],
+ "output": Object {
+ "dir": "test/public/svelte",
+ "entryFileNames": "entry[name]-[hash].js",
+ "format": "system",
+ "sourcemap": false,
+ },
+ "plugins": Array [
+ Object {
+ "options": [Function],
+ "pluginName": "rollup-plugin-multi-input",
+ },
+ Object {
+ "name": "replace",
+ "renderChunk": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "json",
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "load": [Function],
+ "name": "svelte",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "rollup-plugin-external-globals",
+ "transform": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "generateBundle": [Function],
+ "getPackageInfoForId": [Function],
+ "load": [Function],
+ "name": "node-resolve",
+ "resolveId": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "load": [Function],
+ "name": "commonjs",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "load": [Function],
+ "name": "babel",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "terser",
+ "renderChunk": [Function],
+ },
+ ],
+ "treeshake": true,
+ },
+ Object {
+ "cache": true,
+ "input": Array [
+ "src/plugins/pluginB/*.svelte",
+ ],
+ "output": Object {
+ "dir": "test/___ELDER___/compiled",
+ "exports": "auto",
+ "format": "cjs",
+ },
+ "plugins": Array [
+ Object {
+ "options": [Function],
+ "pluginName": "rollup-plugin-multi-input",
+ },
+ Object {
+ "name": "replace",
+ "renderChunk": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "name": "json",
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "load": [Function],
+ "name": "svelte",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "generateBundle": [Function],
+ "getPackageInfoForId": [Function],
+ "load": [Function],
+ "name": "node-resolve",
+ "resolveId": [Function],
+ },
+ Object {
+ "buildStart": [Function],
+ "load": [Function],
+ "name": "commonjs",
+ "resolveId": [Function],
+ "transform": [Function],
+ },
+ Object {
+ "generateBundle": [Function],
+ "name": "css",
+ "transform": [Function],
+ },
+ Object {
+ "name": "terser",
+ "renderChunk": [Function],
+ },
+ ],
+ "treeshake": true,
+ },
+]
+`;
diff --git a/src/utils/__tests__/__snapshots__/validations.spec.ts.snap b/src/utils/__tests__/__snapshots__/validations.spec.ts.snap
index 2d62d34b..dcac9b99 100644
--- a/src/utils/__tests__/__snapshots__/validations.spec.ts.snap
+++ b/src/utils/__tests__/__snapshots__/validations.spec.ts.snap
@@ -14,13 +14,15 @@ ObjectSchema {
"_mutate": undefined,
"_nodes": Array [
"plugins",
- "typescript",
+ "shortcodes",
"build",
"server",
"hooks",
"debug",
- "locations",
- "siteUrl",
+ "srcDir",
+ "distDir",
+ "rootDir",
+ "origin",
],
"_options": Object {
"abortEarly": true,
@@ -136,6 +138,7 @@ ObjectSchema {
"automagic",
"build",
"performance",
+ "shortcodes",
"hooks",
"stacks",
],
@@ -240,7 +243,34 @@ ObjectSchema {
"_default": false,
"_deps": Array [],
"_exclusive": Object {},
- "_label": "Outputs a detauled speed report on each pageload.",
+ "_label": "Outputs a detailed speed report on each pageload.",
+ "_mutate": undefined,
+ "_options": Object {
+ "abortEarly": true,
+ "recursive": true,
+ },
+ "_type": "boolean",
+ "_typeError": [Function],
+ "_whitelist": RefSet {
+ "list": Set {},
+ "refs": Map {},
+ },
+ "tests": Array [],
+ "transforms": Array [
+ [Function],
+ ],
+ "type": "boolean",
+ },
+ "shortcodes": BooleanSchema {
+ "_blacklist": RefSet {
+ "list": Set {},
+ "refs": Map {},
+ },
+ "_conditions": Array [],
+ "_default": false,
+ "_deps": Array [],
+ "_exclusive": Object {},
+ "_label": "Output details of shortcode execution in the console.",
"_mutate": undefined,
"_options": Object {
"abortEarly": true,
@@ -292,6 +322,33 @@ ObjectSchema {
],
"type": "object",
},
+ "distDir": StringSchema {
+ "_blacklist": RefSet {
+ "list": Set {},
+ "refs": Map {},
+ },
+ "_conditions": Array [],
+ "_default": "public",
+ "_deps": Array [],
+ "_exclusive": Object {},
+ "_label": "Where should files be written? This represents the \\"root\\" of your site and where your html will be built.",
+ "_mutate": undefined,
+ "_options": Object {
+ "abortEarly": true,
+ "recursive": true,
+ },
+ "_type": "string",
+ "_typeError": [Function],
+ "_whitelist": RefSet {
+ "list": Set {},
+ "refs": Map {},
+ },
+ "tests": Array [],
+ "transforms": Array [
+ [Function],
+ ],
+ "type": "string",
+ },
"hooks": ObjectSchema {
"_blacklist": RefSet {
"list": Set {},
@@ -401,293 +458,32 @@ ObjectSchema {
],
"type": "object",
},
- "locations": ObjectSchema {
+ "origin": StringSchema {
"_blacklist": RefSet {
"list": Set {},
"refs": Map {},
},
"_conditions": Array [],
- "_defaultDefault": [Function],
+ "_default": "",
"_deps": Array [],
- "_excludedEdges": Array [],
"_exclusive": Object {},
- "_label": "Where various files are written and read from.",
+ "_label": "The domain your site is hosted on. https://yourdomain.com.",
"_mutate": undefined,
- "_nodes": Array [
- "intersectionObserverPoly",
- "buildFolder",
- "srcFolder",
- "systemJs",
- "svelte",
- "public",
- "assets",
- ],
"_options": Object {
"abortEarly": true,
"recursive": true,
},
- "_type": "object",
+ "_type": "string",
"_typeError": [Function],
"_whitelist": RefSet {
"list": Set {},
"refs": Map {},
},
- "fields": Object {
- "assets": StringSchema {
- "_blacklist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "_conditions": Array [],
- "_default": "./public/dist/static/",
- "_deps": Array [],
- "_exclusive": Object {},
- "_label": "Where your site's assets files should be written to if you are using the Elder.js template. (Include ./public/)\\"",
- "_mutate": undefined,
- "_options": Object {
- "abortEarly": true,
- "recursive": true,
- },
- "_type": "string",
- "_typeError": [Function],
- "_whitelist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "tests": Array [],
- "transforms": Array [
- [Function],
- ],
- "type": "string",
- },
- "buildFolder": StringSchema {
- "_blacklist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "_conditions": Array [],
- "_default": "",
- "_deps": Array [],
- "_exclusive": Object {},
- "_label": "If Elder.js doesn't find the files it is looking for in the src folder, it will look in the build folder. (used for typescript)",
- "_mutate": undefined,
- "_options": Object {
- "abortEarly": true,
- "recursive": true,
- },
- "_type": "string",
- "_typeError": [Function],
- "_whitelist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "tests": Array [],
- "transforms": Array [
- [Function],
- ],
- "type": "string",
- },
- "intersectionObserverPoly": StringSchema {
- "_blacklist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "_conditions": Array [],
- "_default": "/dist/static/intersection-observer.js",
- "_deps": Array [],
- "_exclusive": Object {},
- "_label": "Elder.js uses a poly fill for the intersection observer. This is where it will be found on your site. (exclude /public/)",
- "_mutate": undefined,
- "_options": Object {
- "abortEarly": true,
- "recursive": true,
- },
- "_type": "string",
- "_typeError": [Function],
- "_whitelist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "tests": Array [],
- "transforms": Array [
- [Function],
- ],
- "type": "string",
- },
- "public": StringSchema {
- "_blacklist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "_conditions": Array [],
- "_default": "./public/",
- "_deps": Array [],
- "_exclusive": Object {},
- "_label": "Where should files be written? This represents the \\"root\\" of your site and where your html will be built.",
- "_mutate": undefined,
- "_options": Object {
- "abortEarly": true,
- "recursive": true,
- },
- "_type": "string",
- "_typeError": [Function],
- "_whitelist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "tests": Array [],
- "transforms": Array [
- [Function],
- ],
- "type": "string",
- },
- "srcFolder": StringSchema {
- "_blacklist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "_conditions": Array [],
- "_default": "./src/",
- "_deps": Array [],
- "_exclusive": Object {},
- "_label": "Elder.js and plugins use this to resolve where things should be in the expected file structure.",
- "_mutate": undefined,
- "_options": Object {
- "abortEarly": true,
- "recursive": true,
- },
- "_type": "string",
- "_typeError": [Function],
- "_whitelist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "tests": Array [],
- "transforms": Array [
- [Function],
- ],
- "type": "string",
- },
- "svelte": ObjectSchema {
- "_blacklist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "_conditions": Array [],
- "_defaultDefault": [Function],
- "_deps": Array [],
- "_excludedEdges": Array [],
- "_exclusive": Object {},
- "_mutate": undefined,
- "_nodes": Array [
- "clientComponents",
- "ssrComponents",
- ],
- "_options": Object {
- "abortEarly": true,
- "recursive": true,
- },
- "_type": "object",
- "_typeError": [Function],
- "_whitelist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "fields": Object {
- "clientComponents": StringSchema {
- "_blacklist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "_conditions": Array [],
- "_default": "./public/dist/svelte/",
- "_deps": Array [],
- "_exclusive": Object {},
- "_label": "Location where Svelte components that are bundled for the client should be saved. (Include ./public/)",
- "_mutate": undefined,
- "_options": Object {
- "abortEarly": true,
- "recursive": true,
- },
- "_type": "string",
- "_typeError": [Function],
- "_whitelist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "tests": Array [],
- "transforms": Array [
- [Function],
- ],
- "type": "string",
- },
- "ssrComponents": StringSchema {
- "_blacklist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "_conditions": Array [],
- "_default": "./___ELDER___/compiled/",
- "_deps": Array [],
- "_exclusive": Object {},
- "_label": "Location where should SSR components be stored.",
- "_mutate": undefined,
- "_options": Object {
- "abortEarly": true,
- "recursive": true,
- },
- "_type": "string",
- "_typeError": [Function],
- "_whitelist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "tests": Array [],
- "transforms": Array [
- [Function],
- ],
- "type": "string",
- },
- },
- "tests": Array [],
- "transforms": Array [
- [Function],
- ],
- "type": "object",
- },
- "systemJs": StringSchema {
- "_blacklist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "_conditions": Array [],
- "_default": "/dist/static/s.min.js",
- "_deps": Array [],
- "_exclusive": Object {},
- "_label": "If you are using the recommended Elder.js rollup file it is using Systemjs. This defines is where the systemjs file will be found on your site. (exclude /public/)",
- "_mutate": undefined,
- "_options": Object {
- "abortEarly": true,
- "recursive": true,
- },
- "_type": "string",
- "_typeError": [Function],
- "_whitelist": RefSet {
- "list": Set {},
- "refs": Map {},
- },
- "tests": Array [],
- "transforms": Array [
- [Function],
- ],
- "type": "string",
- },
- },
"tests": Array [],
"transforms": Array [
[Function],
],
- "type": "object",
+ "type": "string",
},
"plugins": ObjectSchema {
"_blacklist": RefSet {
@@ -720,6 +516,33 @@ ObjectSchema {
],
"type": "object",
},
+ "rootDir": StringSchema {
+ "_blacklist": RefSet {
+ "list": Set {},
+ "refs": Map {},
+ },
+ "_conditions": Array [],
+ "_default": "process.cwd()",
+ "_deps": Array [],
+ "_exclusive": Object {},
+ "_label": "Here your package.json lives.",
+ "_mutate": undefined,
+ "_options": Object {
+ "abortEarly": true,
+ "recursive": true,
+ },
+ "_type": "string",
+ "_typeError": [Function],
+ "_whitelist": RefSet {
+ "list": Set {},
+ "refs": Map {},
+ },
+ "tests": Array [],
+ "transforms": Array [
+ [Function],
+ ],
+ "type": "string",
+ },
"server": ObjectSchema {
"_blacklist": RefSet {
"list": Set {},
@@ -779,49 +602,109 @@ ObjectSchema {
],
"type": "object",
},
- "siteUrl": StringSchema {
+ "shortcodes": ObjectSchema {
"_blacklist": RefSet {
"list": Set {},
"refs": Map {},
},
"_conditions": Array [],
- "_default": "",
+ "_defaultDefault": [Function],
"_deps": Array [],
+ "_excludedEdges": Array [],
"_exclusive": Object {},
- "_label": "The domain your site is hosted on. https://yourdomain.com.",
"_mutate": undefined,
+ "_nodes": Array [
+ "closePattern",
+ "openPattern",
+ ],
"_options": Object {
"abortEarly": true,
"recursive": true,
},
- "_type": "string",
+ "_type": "object",
"_typeError": [Function],
"_whitelist": RefSet {
"list": Set {},
"refs": Map {},
},
+ "fields": Object {
+ "closePattern": StringSchema {
+ "_blacklist": RefSet {
+ "list": Set {},
+ "refs": Map {},
+ },
+ "_conditions": Array [],
+ "_default": "}}",
+ "_deps": Array [],
+ "_exclusive": Object {},
+ "_label": "closing pattern for identifying shortcodes in html output.",
+ "_mutate": undefined,
+ "_options": Object {
+ "abortEarly": true,
+ "recursive": true,
+ },
+ "_type": "string",
+ "_typeError": [Function],
+ "_whitelist": RefSet {
+ "list": Set {},
+ "refs": Map {},
+ },
+ "tests": Array [],
+ "transforms": Array [
+ [Function],
+ ],
+ "type": "string",
+ },
+ "openPattern": StringSchema {
+ "_blacklist": RefSet {
+ "list": Set {},
+ "refs": Map {},
+ },
+ "_conditions": Array [],
+ "_default": "{{",
+ "_deps": Array [],
+ "_exclusive": Object {},
+ "_label": "Opening pattern for identifying shortcodes in html output.",
+ "_mutate": undefined,
+ "_options": Object {
+ "abortEarly": true,
+ "recursive": true,
+ },
+ "_type": "string",
+ "_typeError": [Function],
+ "_whitelist": RefSet {
+ "list": Set {},
+ "refs": Map {},
+ },
+ "tests": Array [],
+ "transforms": Array [
+ [Function],
+ ],
+ "type": "string",
+ },
+ },
"tests": Array [],
"transforms": Array [
[Function],
],
- "type": "string",
+ "type": "object",
},
- "typescript": BooleanSchema {
+ "srcDir": StringSchema {
"_blacklist": RefSet {
"list": Set {},
"refs": Map {},
},
"_conditions": Array [],
- "_default": false,
+ "_default": "src",
"_deps": Array [],
"_exclusive": Object {},
- "_label": "This causes Elder.js to look in the /build/ folder ",
+ "_label": "Where Elder.js should find it's expected file structure. If you are using a build step such as typescript on your project, you may need to edit this. ",
"_mutate": undefined,
"_options": Object {
"abortEarly": true,
"recursive": true,
},
- "_type": "boolean",
+ "_type": "string",
"_typeError": [Function],
"_whitelist": RefSet {
"list": Set {},
@@ -831,7 +714,7 @@ ObjectSchema {
"transforms": Array [
[Function],
],
- "type": "boolean",
+ "type": "string",
},
},
"tests": Array [],
@@ -1074,7 +957,7 @@ ObjectSchema {
"max": true,
"min": true,
},
- "_label": "The priority level a hook should run at. Elder.js hooks run at 1 or 100 where 1 is the highest priorty and 100 is the lowest priority.",
+ "_label": "The priority level a hook should run at. Elder.js hooks run here 100 is the highest priority and 1 is the lowest priority.",
"_mutate": undefined,
"_options": Object {
"abortEarly": true,
@@ -1151,6 +1034,7 @@ ObjectSchema {
"_exclusive": Object {},
"_mutate": undefined,
"_nodes": Array [
+ "shortcodes",
"config",
"hooks",
"routes",
@@ -1346,6 +1230,35 @@ ObjectSchema {
],
"type": "object",
},
+ "shortcodes": ArraySchema {
+ "_blacklist": RefSet {
+ "list": Set {},
+ "refs": Map {},
+ },
+ "_conditions": Array [],
+ "_default": Array [],
+ "_deps": Array [],
+ "_exclusive": Object {},
+ "_label": "Array of shortcodes",
+ "_mutate": undefined,
+ "_options": Object {
+ "abortEarly": true,
+ "recursive": true,
+ },
+ "_subType": undefined,
+ "_type": "array",
+ "_typeError": [Function],
+ "_whitelist": RefSet {
+ "list": Set {},
+ "refs": Map {},
+ },
+ "innerType": undefined,
+ "tests": Array [],
+ "transforms": Array [
+ [Function],
+ ],
+ "type": "array",
+ },
},
"tests": Array [],
"transforms": Array [
@@ -1368,7 +1281,7 @@ ObjectSchema {
"_exclusive": Object {},
"_mutate": undefined,
"_nodes": Array [
- "hooks",
+ "data",
"permalink",
"all",
"template",
@@ -1414,34 +1327,30 @@ ObjectSchema {
"transforms": Array [],
"type": "mixed",
},
- "hooks": ArraySchema {
+ "data": SchemaType {
"_blacklist": RefSet {
"list": Set {},
"refs": Map {},
},
"_conditions": Array [],
- "_default": Array [],
+ "_default": Object {},
"_deps": Array [],
"_exclusive": Object {},
- "_label": "An array of hooks. NOTE/TODO: These run on all routes, not just the one defined on.",
+ "_label": "Async/sync function that returns a JS object. Can also be a plain JS object.",
"_mutate": undefined,
"_options": Object {
"abortEarly": true,
"recursive": true,
},
- "_subType": undefined,
- "_type": "array",
+ "_type": "mixed",
"_typeError": [Function],
"_whitelist": RefSet {
"list": Set {},
"refs": Map {},
},
- "innerType": undefined,
"tests": Array [],
- "transforms": Array [
- [Function],
- ],
- "type": "array",
+ "transforms": Array [],
+ "type": "mixed",
},
"permalink": SchemaType {
"_blacklist": RefSet {
diff --git a/src/utils/__tests__/getConfig.spec.ts b/src/utils/__tests__/getConfig.spec.ts
index 54398277..a217e38e 100644
--- a/src/utils/__tests__/getConfig.spec.ts
+++ b/src/utils/__tests__/getConfig.spec.ts
@@ -1,5 +1,4 @@
-const defaultConfig = { debug: { automagic: true }, locations: { buildFolder: '' } };
-jest.mock('../tsConfigExist.ts', () => () => true);
+const defaultConfig = { debug: { automagic: true }, distDir: 'public', srcDir: 'src', rootDir: 'test' };
jest.mock('../validations.ts', () => ({
getDefaultConfig: () => defaultConfig,
}));
@@ -14,7 +13,7 @@ jest.mock('cosmiconfig', () => {
jest.mock('path', () => {
return {
- resolve: (...strings) => strings.join('/').replace('./', ''),
+ resolve: (...strings) => strings.join('/').replace('./', '').replace('test/test', 'test'),
};
});
@@ -22,13 +21,16 @@ process.cwd = () => 'test';
describe('#getConfig', () => {
const output = {
+ $$internal: {
+ clientComponents: 'test/public/svelte/',
+ ssrComponents: 'test/___ELDER___/compiled/',
+ },
debug: {
automagic: true,
},
- locations: {
- buildFolder: './build/',
- },
- typescript: true,
+ distDir: 'test/public',
+ rootDir: 'test',
+ srcDir: 'test/src',
};
beforeEach(() => {
@@ -47,22 +49,6 @@ describe('#getConfig', () => {
expect(getConfig()).toEqual(defaultConfig);
});
- it('not able to set build folder from tsconfig', () => {
- jest.mock('fs', () => ({
- readFileSync: () =>
- JSON.stringify({
- compilerOptions: {
- outDir: '/build',
- },
- }),
- }));
-
- // eslint-disable-next-line global-require
- const getConfig = require('../getConfig').default;
-
- expect(getConfig()).toEqual(defaultConfig);
- });
-
it('works', () => {
jest.mock('fs', () => ({
readFileSync: () =>
diff --git a/src/utils/__tests__/getRollupConfig.spec.ts b/src/utils/__tests__/getRollupConfig.spec.ts
new file mode 100644
index 00000000..12b71cc6
--- /dev/null
+++ b/src/utils/__tests__/getRollupConfig.spec.ts
@@ -0,0 +1,376 @@
+/* eslint-disable global-require */
+import multiInput from 'rollup-plugin-multi-input';
+import path from 'path';
+import { createBrowserConfig, createSSRConfig } from '../getRollupConfig';
+
+describe('#getRollupConfig', () => {
+ beforeEach(() => {
+ jest.resetModules();
+ });
+
+ it('createBrowserConfig works', () => {
+ [true, false].forEach((sourcemap) => {
+ expect(
+ createBrowserConfig({
+ input: [`./components/*/*.svelte`],
+ output: {
+ dir: './public/dist/svelte/',
+ entryFileNames: 'entry[name]-[hash].js',
+ sourcemap,
+ format: 'system',
+ },
+ multiInputConfig: multiInput({
+ // TODO: test with false
+ relative: `./components`,
+ transformOutputPath: (output) => `${path.basename(output)}`,
+ }),
+ svelteConfig: {},
+ }),
+ ).toEqual({
+ cache: true,
+ input: ['./components/*/*.svelte'],
+ output: {
+ dir: './public/dist/svelte/',
+ entryFileNames: 'entry[name]-[hash].js',
+ format: 'system',
+ sourcemap,
+ },
+ plugins: [
+ {
+ options: expect.any(Function),
+ pluginName: 'rollup-plugin-multi-input',
+ },
+ {
+ name: 'replace',
+ renderChunk: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ name: 'json',
+ transform: expect.any(Function),
+ },
+ {
+ generateBundle: expect.any(Function),
+ load: expect.any(Function),
+ name: 'svelte',
+ resolveId: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ name: 'rollup-plugin-external-globals',
+ transform: expect.any(Function),
+ },
+ {
+ buildStart: expect.any(Function),
+ generateBundle: expect.any(Function),
+ getPackageInfoForId: expect.any(Function),
+ load: expect.any(Function),
+ name: 'node-resolve',
+ resolveId: expect.any(Function),
+ },
+ {
+ buildStart: expect.any(Function),
+ load: expect.any(Function),
+ name: 'commonjs',
+ resolveId: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ load: expect.any(Function),
+ name: 'babel',
+ resolveId: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ name: 'terser',
+ renderChunk: expect.any(Function),
+ },
+ ],
+ treeshake: true,
+ });
+ });
+ });
+
+ it('createBrowserConfig multiInputConfig = false', () => {
+ expect(
+ createBrowserConfig({
+ input: [`./components/*/*.svelte`],
+ output: {
+ dir: './public/dist/svelte/',
+ entryFileNames: 'entry[name]-[hash].js',
+ sourcemap: true,
+ format: 'system',
+ },
+ svelteConfig: {},
+ }).plugins,
+ ).toEqual([
+ {
+ name: 'replace',
+ renderChunk: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ name: 'json',
+ transform: expect.any(Function),
+ },
+ {
+ generateBundle: expect.any(Function),
+ load: expect.any(Function),
+ name: 'svelte',
+ resolveId: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ name: 'rollup-plugin-external-globals',
+ transform: expect.any(Function),
+ },
+ {
+ buildStart: expect.any(Function),
+ generateBundle: expect.any(Function),
+ getPackageInfoForId: expect.any(Function),
+ load: expect.any(Function),
+ name: 'node-resolve',
+ resolveId: expect.any(Function),
+ },
+ {
+ buildStart: expect.any(Function),
+ load: expect.any(Function),
+ name: 'commonjs',
+ resolveId: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ load: expect.any(Function),
+ name: 'babel',
+ resolveId: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ name: 'terser',
+ renderChunk: expect.any(Function),
+ },
+ ]);
+ });
+
+ it('createSSRConfig works', () => {
+ expect(
+ createSSRConfig({
+ input: [`./components/*/*.svelte`],
+ output: {
+ dir: './___ELDER___/compiled/',
+ format: 'cjs',
+ exports: 'auto',
+ },
+ multiInputConfig: multiInput({
+ relative: `./components`,
+ transformOutputPath: (output) => `${path.basename(output)}`,
+ }),
+ svelteConfig: {
+ preprocess: [
+ {
+ style: ({ content }) => {
+ return content.toUpperCase();
+ },
+ },
+ ],
+ },
+ }),
+ ).toEqual({
+ cache: true,
+ input: ['./components/*/*.svelte'],
+ output: {
+ dir: './___ELDER___/compiled/',
+ exports: 'auto',
+ format: 'cjs',
+ },
+ plugins: [
+ {
+ options: expect.any(Function),
+ pluginName: 'rollup-plugin-multi-input',
+ },
+ {
+ name: 'replace',
+ renderChunk: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ name: 'json',
+ transform: expect.any(Function),
+ },
+ {
+ generateBundle: expect.any(Function),
+ load: expect.any(Function),
+ name: 'svelte',
+ resolveId: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ buildStart: expect.any(Function),
+ generateBundle: expect.any(Function),
+ getPackageInfoForId: expect.any(Function),
+ load: expect.any(Function),
+ name: 'node-resolve',
+ resolveId: expect.any(Function),
+ },
+ {
+ buildStart: expect.any(Function),
+ load: expect.any(Function),
+ name: 'commonjs',
+ resolveId: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ generateBundle: expect.any(Function),
+ name: 'css',
+ transform: expect.any(Function),
+ },
+ {
+ name: 'terser',
+ renderChunk: expect.any(Function),
+ },
+ ],
+ treeshake: true,
+ });
+ });
+
+ it('createSSRConfig multiInputConfig = false', () => {
+ expect(
+ createSSRConfig({
+ input: [`./components/*/*.svelte`],
+ output: {
+ dir: './___ELDER___/compiled/',
+ format: 'cjs',
+ exports: 'auto',
+ },
+ svelteConfig: {
+ preprocess: [
+ {
+ style: ({ content }) => {
+ return content.toUpperCase();
+ },
+ },
+ ],
+ },
+ }).plugins,
+ ).toEqual([
+ {
+ name: 'replace',
+ renderChunk: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ name: 'json',
+ transform: expect.any(Function),
+ },
+ {
+ generateBundle: expect.any(Function),
+ load: expect.any(Function),
+ name: 'svelte',
+ resolveId: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ buildStart: expect.any(Function),
+ generateBundle: expect.any(Function),
+ getPackageInfoForId: expect.any(Function),
+ load: expect.any(Function),
+ name: 'node-resolve',
+ resolveId: expect.any(Function),
+ },
+ {
+ buildStart: expect.any(Function),
+ load: expect.any(Function),
+ name: 'commonjs',
+ resolveId: expect.any(Function),
+ transform: expect.any(Function),
+ },
+ {
+ generateBundle: expect.any(Function),
+ name: 'css',
+ transform: expect.any(Function),
+ },
+ {
+ name: 'terser',
+ renderChunk: expect.any(Function),
+ },
+ ]);
+ });
+
+ it('getPluginPaths works', () => {
+ jest.mock('glob', () => ({
+ sync: jest
+ .fn()
+ .mockImplementationOnce(() => ['a-file1.svelte', 'a-file2.svelte'])
+ .mockImplementationOnce(() => ['b-file1.svelte', 'b-file2.svelte']),
+ }));
+
+ jest.mock('path', () => ({
+ resolve: (...strings) => strings.join('/').replace('./', '').replace('//', '/').replace('/./', '/'),
+ posix: () => ({ dirname: () => '' }),
+ }));
+
+ jest.mock('fs-extra', () => ({
+ existsSync: jest
+ .fn()
+ .mockImplementationOnce(() => true) // first plugin from src
+ .mockImplementationOnce(() => false) // 2nd from node modules
+ .mockImplementationOnce(() => true),
+ }));
+
+ expect(
+ // @ts-ignore
+ require('../getRollupConfig').getPluginPaths({
+ srcDir: './src',
+ rootDir: './',
+ plugins: {
+ pluginA: {},
+ pluginB: {},
+ },
+ }),
+ ).toEqual(['src/plugins/pluginA/', '/node_modules/pluginB/']);
+ });
+
+ it('getRollupConfig as a whole works', () => {
+ jest.mock('../getConfig', () => () => ({
+ $$internal: {
+ clientComponents: 'test/public/svelte',
+ ssrComponents: 'test/___ELDER___/compiled',
+ },
+ distDir: './dist',
+ srcDir: './src',
+ rootDir: './',
+ plugins: {
+ pluginA: {},
+ pluginB: {},
+ },
+ }));
+
+ jest.mock('path', () => ({
+ resolve: (...strings) => strings.join('/').replace('./', '').replace('//', '/').replace('/./', '/'),
+ posix: () => ({ dirname: () => '' }),
+ }));
+ jest.mock('del');
+ jest.mock('fs-extra', () => ({
+ existsSync: jest.fn().mockImplementation(() => true),
+ }));
+ jest.mock('glob', () => ({
+ sync: jest
+ .fn()
+ .mockImplementationOnce(() => ['route1.svelte', 'route2.svelte'])
+ .mockImplementationOnce(() => ['layout1.svelte', 'layout2.svelte'])
+ .mockImplementationOnce(() => ['pluginA.svelte', 'pluginB.svelte'])
+ .mockImplementationOnce(() => ['foo.svelte', 'bar.svelte']),
+ }));
+
+ const svelteConfig = {
+ preprocess: [
+ {
+ style: ({ content }) => {
+ return content.toUpperCase();
+ },
+ },
+ ],
+ };
+ expect(require('../getRollupConfig').default({ svelteConfig })).toMatchSnapshot();
+ });
+});
diff --git a/src/utils/__tests__/hookEntityDefinitions.spec.ts b/src/utils/__tests__/hookEntityDefinitions.spec.ts
new file mode 100644
index 00000000..c7f202d7
--- /dev/null
+++ b/src/utils/__tests__/hookEntityDefinitions.spec.ts
@@ -0,0 +1,8 @@
+import { hookEntityDefinitions } from '../../hookInterface/hookEntityDefinitions';
+import hookInterface from '../../hookInterface/hookInterface';
+
+test('#hookEntityDefinitions', async () => {
+ const entities = [...new Set(hookInterface.reduce((out, hook) => [...out, ...hook.props, ...hook.mutable], []))];
+ const definitions = Object.keys(hookEntityDefinitions);
+ entities.forEach((entity) => expect(definitions).toContain(entity));
+});
diff --git a/src/utils/__tests__/index.spec.ts b/src/utils/__tests__/index.spec.ts
index 3495c53e..4d039fdd 100644
--- a/src/utils/__tests__/index.spec.ts
+++ b/src/utils/__tests__/index.spec.ts
@@ -7,6 +7,7 @@ test('includes all', () => {
'svelteComponent',
'getHashedSvelteComponents',
'getUniqueId',
+ 'validateShortcode',
'IntersectionObserver',
'Page',
'parseBuildPerf',
@@ -20,5 +21,7 @@ test('includes all', () => {
'prepareServer',
'prepareProcessStack',
'getConfig',
+ 'getRollupConfig',
+ 'prepareInlineShortcode',
]);
});
diff --git a/src/utils/__tests__/prepareInlineShortcode.spec.ts b/src/utils/__tests__/prepareInlineShortcode.spec.ts
new file mode 100644
index 00000000..317b89ae
--- /dev/null
+++ b/src/utils/__tests__/prepareInlineShortcode.spec.ts
@@ -0,0 +1,68 @@
+import prepareInlineShortcode from '../prepareInlineShortcode';
+
+describe('#prepareInlineShortcode', () => {
+ it('works - no content, no props', () => {
+ const settings = {
+ shortcodes: {
+ openPattern: '<12345',
+ closePattern: '54321>',
+ },
+ };
+ const fn = prepareInlineShortcode({ settings });
+ // @ts-ignore
+ expect(() => fn({})).toThrow('helpers.shortcode requires a name prop');
+ expect(
+ fn({
+ name: 'Test',
+ props: {},
+ content: '',
+ }),
+ ).toEqual('<12345Test/54321>');
+ });
+
+ it('works - with content and props', () => {
+ const settings = {
+ shortcodes: {
+ openPattern: '<',
+ closePattern: '>',
+ },
+ };
+ const fn = prepareInlineShortcode({ settings });
+ expect(
+ fn({
+ name: 'Test',
+ props: {
+ foo: 'bar',
+ answer: 42,
+ nested: {
+ prop: 'porp',
+ },
+ },
+ content: 'Hi, I am content
',
+ }),
+ ).toEqual("Hi, I am content
Hi, I am content
',
+ }),
+ ).toEqual("[Test foo='bar' answer='42' nested='{\"prop\":\"porp\"}']Hi, I am content
[/Test]");
+ });
+});
diff --git a/src/utils/__tests__/prepareProcessStack.spec.ts b/src/utils/__tests__/prepareProcessStack.spec.ts
index 57dd7f51..5d9fad64 100644
--- a/src/utils/__tests__/prepareProcessStack.spec.ts
+++ b/src/utils/__tests__/prepareProcessStack.spec.ts
@@ -30,5 +30,5 @@ test('#prepareProcessStack', () => {
},
};
const processStackFn = prepareProcessStack(page);
- expect(processStackFn('testStack')).toEqual('-1--10--50-');
+ expect(processStackFn('testStack')).toEqual('-50--10--1-');
});
diff --git a/src/utils/__tests__/prepareRunHook.spec.ts b/src/utils/__tests__/prepareRunHook.spec.ts
index fd80215d..2116bfa6 100644
--- a/src/utils/__tests__/prepareRunHook.spec.ts
+++ b/src/utils/__tests__/prepareRunHook.spec.ts
@@ -72,29 +72,11 @@ describe('#prepareRunHook', () => {
expect(errors).toEqual(['something bad happened']);
});
- it('works for custom props', async () => {
- const errors = [];
- await expect(
- await prepareRunHookFn('bootstrap-custom', { settings, errors, perf, customProps: { customProp: 'testProp' } }),
- ).toEqual({
- customProps: {
- customProp: 'testProp',
- },
- errors: [],
- perf,
- settings: {
- debug: {
- hooks: true,
- },
- magicNumber: 42,
- },
- });
- expect(errors).toEqual([]);
- });
-
it('cannot mutate not mutable prop', async () => {
prepareRunHookFn = prepareRunHook({ hooks, allSupportedHooks, settings });
const errors = [];
- await expect(prepareRunHookFn('bootstrap', { settings, errors, perf })).rejects.toThrow();
+ await prepareRunHookFn('bootstrap', { settings, errors, perf });
+ expect(errors).toHaveLength(2);
+ expect(errors[1]).toEqual('something bad happened');
});
});
diff --git a/src/utils/__tests__/prepareServer.spec.ts b/src/utils/__tests__/prepareServer.spec.ts
index f07ebc6c..b46d44e8 100644
--- a/src/utils/__tests__/prepareServer.spec.ts
+++ b/src/utils/__tests__/prepareServer.spec.ts
@@ -1,117 +1,45 @@
import { prepareServer } from '../prepareServer';
-jest.mock('../Page');
-
describe('#prepareServer', () => {
it('works', async () => {
const hooks = [];
- const runHook = (hookName) => {
- hooks.push(hookName);
+ const runHook = async (name, props) => {
+ hooks.push({ name, props });
};
-
- const input = {
- serverLookupObject: {
- '/dev/north-dakota/': {
- id: 37,
- slug: 'north-dakota',
- random: 82,
- route: 'state',
- type: 'server',
- premalink: '/north-dakota/',
- },
- },
- settings: { server: { prefix: '/dev' } },
- query: {
- db: {
- db: {},
- pool: {},
- cnString: {
- connectionString: 'postgresql://user:user@localhost:5099/db',
- },
- },
+ const nextMock = jest.fn();
+ const prepServer = prepareServer({
+ bootstrapComplete: Promise.resolve({
+ runHook,
+ foo: 'bar',
+ bar: 'foo',
+ }),
+ });
+ await prepServer(
+ {
+ desc: 'req',
},
- helpers: {
- permalinks: {},
- metersInAMile: 0.00062137119224,
+ {
+ desc: 'res',
},
- data: {},
- routes: {
- state: {
- hooks: [],
- permalink: jest.fn(),
- all: jest.fn(),
- template: 'State.svelte',
- parent: 'home',
- breadcrumbLabel: jest.fn(),
- templateComponent: jest.fn(),
- data: jest.fn(),
- layout: jest.fn(),
- $$meta: { type: 'route', addedBy: 'routejs' },
+ nextMock,
+ );
+ expect(hooks).toEqual([
+ {
+ name: 'middleware',
+ props: {
+ runHook,
+ bar: 'foo',
+ foo: 'bar',
+ next: nextMock,
+ req: {
+ desc: 'req',
+ },
+ request: {},
+ res: {
+ desc: 'res',
+ },
},
},
- allRequests: [
- {
- id: 37,
- slug: 'north-dakota',
- random: 82,
- route: 'state',
- type: 'server',
- premalink: '/north-dakota/',
- },
- ],
- runHook,
- errors: [],
- customProps: {},
- };
-
- const bootstrapComplete = Promise.resolve(input);
-
- const prepServerFn = prepareServer({ bootstrapComplete });
- const nextMock = jest.fn(() => 'nextMockResult');
- const setHeaderMock = jest.fn();
- const endMock = jest.fn();
- const res = {
- setHeader: setHeaderMock,
- end: endMock,
- };
- expect(await prepServerFn({}, res, nextMock)).toEqual(undefined);
- // path doesn't include server prefix
- expect(
- await prepServerFn(
- {
- path: '/north-dakota',
- },
- res,
- nextMock,
- ),
- ).toEqual('nextMockResult');
- expect(nextMock).toHaveBeenCalledTimes(1);
- // request for path
- expect(
- await prepServerFn(
- {
- path: '/dev/north-dakota',
- },
- res,
- nextMock,
- ),
- ).toEqual(undefined);
- expect(hooks).toEqual(['middleware']);
- expect(setHeaderMock).toHaveBeenCalledTimes(1);
- expect(endMock).toHaveBeenCalledTimes(1);
- expect(nextMock).toHaveBeenCalledTimes(1); // no new calls
- // no requestObject
- expect(
- await prepServerFn(
- {
- path: '/dev/south-dakota',
- },
- res,
- nextMock,
- ),
- ).toEqual(undefined);
- expect(setHeaderMock).toHaveBeenCalledTimes(2);
- expect(endMock).toHaveBeenCalledTimes(2);
- expect(nextMock).toHaveBeenCalledTimes(2); // new call
+ ]);
});
});
diff --git a/src/utils/__tests__/prepareShortcodeParser.spec.ts b/src/utils/__tests__/prepareShortcodeParser.spec.ts
new file mode 100644
index 00000000..e57b339a
--- /dev/null
+++ b/src/utils/__tests__/prepareShortcodeParser.spec.ts
@@ -0,0 +1,216 @@
+import prepareShortcodeParser from '../prepareShortcodeParser';
+
+class ShortcodeParser {
+ opts: any = {}; // just store them so we know what got passed over
+
+ shortcodes: string[] = [];
+
+ constructor(opts) {
+ this.opts = opts;
+ }
+
+ add(shortcode: string, fn: (props: any, content: string) => Promise) {
+ fn({}, 'someContent').then(() => {
+ this.shortcodes.push(shortcode);
+ });
+ }
+}
+
+jest.mock('@elderjs/shortcodes', () => (opts) => new ShortcodeParser(opts));
+jest.mock('../createReadOnlyProxy');
+
+const args = {
+ helpers: {},
+ data: {},
+ request: {},
+ query: {},
+ allRequests: [],
+ cssStack: [],
+ headStack: [],
+ customJsStack: [],
+};
+
+describe('#prepareShortcodeParser', () => {
+ it('works with empty shortcodes', () => {
+ const shortcodeParser = prepareShortcodeParser({
+ ...args,
+ shortcodes: [],
+
+ settings: {
+ debug: {
+ stacks: true,
+ hooks: true,
+ build: true,
+ automagic: true,
+ shortcodes: true,
+ },
+ shortcodes: {
+ openPattern: '\\[',
+ closePattern: '\\]',
+ },
+ },
+ });
+ expect(shortcodeParser).toBeInstanceOf(ShortcodeParser);
+ expect(shortcodeParser).toEqual({
+ opts: {
+ openPattern: '\\[',
+ closePattern: '\\]',
+ },
+ shortcodes: [],
+ });
+ });
+
+ it('throws errors if you try to add invalid shortcodes', () => {
+ expect(() =>
+ prepareShortcodeParser({
+ ...args,
+ shortcodes: [
+ {
+ run: jest.fn(),
+ foo: 'bar',
+ },
+ ],
+ settings: {
+ debug: {
+ stacks: true,
+ hooks: true,
+ build: true,
+ automagic: true,
+ shortcodes: true,
+ },
+ shortcodes: {
+ openPattern: '\\<',
+ closePattern: '\\>',
+ },
+ },
+ }),
+ ).toThrow(
+ `Shortcodes must have a shortcode property to define their usage. Problem code: ${JSON.stringify({
+ run: jest.fn(),
+ foo: 'bar',
+ })}`,
+ );
+ expect(() =>
+ prepareShortcodeParser({
+ ...args,
+ shortcodes: [
+ {
+ shortcode: 'svelteComponent',
+ },
+ ],
+ settings: {
+ debug: {
+ stacks: true,
+ hooks: true,
+ build: true,
+ automagic: true,
+ shortcodes: true,
+ },
+ shortcodes: {
+ openPattern: '\\<',
+ closePattern: '\\>',
+ },
+ },
+ }),
+ ).toThrow(`Shortcodes must have a run function. Problem code: ${JSON.stringify({ shortcode: 'svelteComponent' })}`);
+ });
+
+ it('works with valid shortcode that returns html but doesnt set anything else', async () => {
+ const shortcodeParser = prepareShortcodeParser({
+ ...args,
+ shortcodes: [
+ {
+ shortcode: 'sayHi',
+ run: async () => ({
+ html: 'hi
',
+ }),
+ },
+ ],
+ settings: {
+ debug: {
+ stacks: true,
+ hooks: true,
+ build: true,
+ automagic: true,
+ shortcodes: true,
+ },
+ shortcodes: {
+ openPattern: '\\👍',
+ closePattern: '\\👎',
+ },
+ },
+ });
+ expect(shortcodeParser).toBeInstanceOf(ShortcodeParser);
+ // wait for our mock class to run the functions to ensure coverage
+ // CAUTION: this could turn out into non-deterministic test if the async fn doesn't finish
+ await new Promise((r) => setTimeout(r, 250));
+ expect(shortcodeParser).toEqual({
+ opts: {
+ openPattern: '\\👍',
+ closePattern: '\\👎',
+ },
+ shortcodes: ['sayHi'],
+ });
+ expect(args.cssStack).toEqual([]);
+ expect(args.headStack).toEqual([]);
+ expect(args.customJsStack).toEqual([]);
+ });
+
+ it('works with valid shortcode that sets css, head and js', async () => {
+ const shortcodeParser = prepareShortcodeParser({
+ ...args,
+ shortcodes: [
+ {
+ shortcode: 'svelteComponent',
+ run: async () => ({
+ css: 'body{font-size:1rem;}',
+ js: 'alert("hello, I am test");',
+ head: ';
+ plugin?: any; // reference to the plugin closure scope.
+ $$meta: {
+ addedBy: string;
+ type: string;
+ };
+}
+
+export type ShortcodeDefs = Array;
+
export type PluginOptions = {
name: string;
description: string;
@@ -109,6 +146,7 @@ export type PluginOptions = {
routes?: RoutesOptions;
hooks: Array;
config?: Object;
+ shortcodes?: ShortcodeDefs;
};
// eslint-disable-next-line no-undef
diff --git a/src/utils/validations.ts b/src/utils/validations.ts
index 7024b357..6e8d4bf2 100644
--- a/src/utils/validations.ts
+++ b/src/utils/validations.ts
@@ -1,85 +1,52 @@
import * as yup from 'yup';
-import type { ConfigOptions, PluginOptions } from './types';
+import type { ConfigOptions, PluginOptions, ShortcodeDef } from './types';
import type { RouteOptions } from '../routes/types';
import type { HookOptions } from '../hookInterface/types';
import hookInterface from '../hookInterface/hookInterface';
-const configSchema = yup.object({
- siteUrl: yup.string().notRequired().default('').label(`The domain your site is hosted on. https://yourdomain.com.`),
- locations: yup
- .object({
- assets: yup
- .string()
- .notRequired()
- .default('./public/dist/static/')
- .label(
- 'Where your site\'s assets files should be written to if you are using the Elder.js template. (Include ./public/)"',
- ),
- public: yup
- .string()
- .notRequired()
- .default('./public/')
- .label(
- 'Where should files be written? This represents the "root" of your site and where your html will be built.',
- ),
- svelte: yup
- .object()
- .shape({
- ssrComponents: yup
- .string()
- .notRequired()
- .default('./___ELDER___/compiled/')
- .label('Location where should SSR components be stored.'),
- clientComponents: yup
- .string()
- .notRequired()
- .default('./public/dist/svelte/')
- .label(
- 'Location where Svelte components that are bundled for the client should be saved. (Include ./public/)',
- ),
- })
- .notRequired(),
- systemJs: yup
- .string()
- .notRequired()
- .default('/dist/static/s.min.js')
- .label(
- 'If you are using the recommended Elder.js rollup file it is using Systemjs. This defines is where the systemjs file will be found on your site. (exclude /public/)',
- ),
- srcFolder: yup
- .string()
- .notRequired()
- .default('./src/')
- .label('Elder.js and plugins use this to resolve where things should be in the expected file structure.'),
-
- buildFolder: yup
- .string()
- .notRequired()
- .default('')
- .label(
- `If Elder.js doesn't find the files it is looking for in the src folder, it will look in the build folder. (used for typescript)`,
- ),
+const shortcodeSchema = yup.object({
+ shortcode: yup.string().required().label(`The 'name' of the shortcode. {{name /}}`),
+ run: yup
+ .mixed()
+ .required()
+ .test(
+ 'isFunction',
+ 'run() should be a function or async function',
+ (value) => typeof value === 'function' || (typeof value === 'object' && value.then === 'function'),
+ )
+ .label(`A sync/async function that returns the html, css, js, and head to be added to the html.`),
+});
- intersectionObserverPoly: yup
- .string()
- .notRequired()
- .default('/dist/static/intersection-observer.js')
- .label(
- 'Elder.js uses a poly fill for the intersection observer. This is where it will be found on your site. (exclude /public/)',
- ),
- })
+const configSchema = yup.object({
+ origin: yup.string().notRequired().default('').label(`The domain your site is hosted on. https://yourdomain.com.`),
+ rootDir: yup.string().notRequired().default('process.cwd()').label('Here your package.json lives.'),
+ distDir: yup
+ .string()
+ .notRequired()
+ .default('public')
+ .label('Where should files be written? This represents the "root" of your site and where your html will be built.'),
+ srcDir: yup
+ .string()
.notRequired()
- .label('Where various files are written and read from.'),
+ .default('src')
+ .label(
+ "Where Elder.js should find it's expected file structure. If you are using a build step such as typescript on your project, you may need to edit this. ",
+ ),
debug: yup
.object()
.shape({
stacks: yup.boolean().notRequired().default(false).label('Outputs details of stack processing in the console.'),
hooks: yup.boolean().notRequired().default(false).label('Output details of hook execution in the console.'),
+ shortcodes: yup
+ .boolean()
+ .notRequired()
+ .default(false)
+ .label('Output details of shortcode execution in the console.'),
performance: yup
.boolean()
.notRequired()
.default(false)
- .label('Outputs a detauled speed report on each pageload.'),
+ .label('Outputs a detailed speed report on each pageload.'),
build: yup.boolean().notRequired().default(false).label('Displays detailed build information for each worker.'),
automagic: yup
.boolean()
@@ -117,7 +84,10 @@ const configSchema = yup.object({
`If you have some pages that take longer to generate than others, you may want to shuffle your requests so they are spread out more evenly across processes when building.`,
),
}),
- typescript: yup.boolean().default(false).label('This causes Elder.js to look in the /build/ folder '),
+ shortcodes: yup.object({
+ openPattern: yup.string().default('{{').label('Opening pattern for identifying shortcodes in html output.'),
+ closePattern: yup.string().default('}}').label('closing pattern for identifying shortcodes in html output.'),
+ }),
plugins: yup.object().default({}).label('Used to define Elder.js plugins.'),
});
@@ -143,11 +113,11 @@ const routeSchema = yup.object({
.label(
'Sync function that turns request objects from the all() function into permalinks which are relative to the site root',
),
- hooks: yup
- .array()
+ data: yup
+ .mixed()
.notRequired()
- .default([])
- .label('An array of hooks. NOTE/TODO: These run on all routes, not just the one defined on.'),
+ .default({})
+ .label(`Async/sync function that returns a JS object. Can also be a plain JS object.`),
});
const pluginSchema = yup.object({
@@ -171,6 +141,7 @@ const pluginSchema = yup.object({
.default({})
.notRequired()
.label('(optional) An object of default configs. These will be used when none are set in their elder.config.js.'),
+ shortcodes: yup.array().notRequired().default([]).label('Array of shortcodes'),
});
const hookSchema = yup
@@ -192,7 +163,7 @@ const hookSchema = yup
.optional()
.default(50)
.label(
- 'The priority level a hook should run at. Elder.js hooks run at 1 or 100 where 1 is the highest priorty and 100 is the lowest priority.',
+ 'The priority level a hook should run at. Elder.js hooks run here 100 is the highest priority and 1 is the lowest priority.',
),
run: yup
.mixed()
@@ -277,14 +248,35 @@ function validateHook(hook): HookOptions | false {
}
}
+function validateShortcode(shortcode): ShortcodeDef | false {
+ try {
+ shortcodeSchema.validateSync(shortcode);
+ const validated = shortcodeSchema.cast(shortcode);
+ return validated;
+ } catch (err) {
+ if (shortcode && shortcode.$$meta && shortcode.$$meta.type === 'plugin') {
+ console.error(
+ `Plugin ${shortcode.$$meta.addedBy} uses a shortcode, but it is ignored due to error(s). Please create a ticket with that plugin so the author can investigate it.`,
+ err.errors,
+ err.value,
+ );
+ } else {
+ console.error(`Hook ignored due to error(s).`, err.errors, err.value);
+ }
+ return false;
+ }
+}
+
export {
validateRoute,
validatePlugin,
validateHook,
+ validateShortcode,
// validateConfig,
getDefaultConfig,
configSchema,
hookSchema,
routeSchema,
pluginSchema,
+ shortcodeSchema,
};
diff --git a/src/workerBuild.ts b/src/workerBuild.ts
index a7bc4f96..24cdb9b9 100644
--- a/src/workerBuild.ts
+++ b/src/workerBuild.ts
@@ -9,8 +9,8 @@ async function workerBuild({ bootstrapComplete, workerRequests }) {
runHook,
routes: workerRoutes,
errors,
- customProps,
allRequests,
+ shortcodes,
} = await bootstrapComplete;
// potential issue that since builds are split across processes,
@@ -37,21 +37,24 @@ async function workerBuild({ bootstrapComplete, workerRequests }) {
runHook,
routes: workerRoutes,
errors,
- customProps,
+ shortcodes,
});
- const { errors: buildErrors, timings } = await page.build();
i += 1;
+ const response: any = ['requestComplete', i];
+
+ // try {
+ const { errors: buildErrors, timings } = await page.build();
bTimes.push(timings);
- const response: any = ['requestComplete', i];
if (buildErrors && buildErrors.length > 0) {
errs += 1;
response.push(errs);
- response.push({ request, errors: buildErrors });
+ response.push({ request, errors: buildErrors.map((e) => JSON.stringify(e, Object.getOwnPropertyNames(e))) });
bErrors.push({ request, errors: buildErrors });
} else {
response.push(errs);
}
+ // } catch (e) {}
if (process.send) {
process.send(response);
diff --git a/yarn.lock b/yarn.lock
index ea16c463..20258438 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,7 @@
# yarn lockfile v1
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.8.3":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
@@ -63,7 +63,7 @@
dependencies:
"@babel/types" "^7.11.0"
-"@babel/helper-module-imports@^7.10.4":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
@@ -225,6 +225,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
+"@babel/runtime@^7.0.0-beta.55":
+ version "7.11.2"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
+ integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
+ dependencies:
+ regenerator-runtime "^0.13.4"
+
"@babel/runtime@^7.10.5":
version "7.10.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.5.tgz#303d8bd440ecd5a491eae6117fd3367698674c5c"
@@ -311,14 +318,25 @@
resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-9.1.2.tgz#d05f66db03e3a3638a654e8badf2deb489eb220d"
integrity sha512-r3fwVbVH+M8W0qYlBBZFsUwKe6NT5qvz+EmU7sr8VeN1cQ63z+3cfXyTo7WGGEMEgKiT0jboNAK3b1FZp8k9LQ==
-"@eslint/eslintrc@^0.1.0":
- version "0.1.0"
- resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.0.tgz#3d1f19fb797d42fb1c85458c1c73541eeb1d9e76"
- integrity sha512-bfL5365QSCmH6cPeFT7Ywclj8C7LiF7sO6mUGzZhtAMV7iID1Euq6740u/SRi4C80NOnVz/CEfK8/HO+nCAPJg==
+"@elderjs/shortcodes@^1.0.6":
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/@elderjs/shortcodes/-/shortcodes-1.0.6.tgz#11a675a6aab1446422dd597c8013508729404b7a"
+ integrity sha512-8n6FpnCbr4RnJYQDs7869zeywYXNyVtZnA5E4fHYWp2/fJX3OlDp7eYfMj6AnoE+E3Ehs5LVn9uT+rqUXcA0pQ==
+
+"@eslint/eslintrc@^0.1.3":
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085"
+ integrity sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==
dependencies:
ajv "^6.12.4"
debug "^4.1.1"
+ espree "^7.3.0"
+ globals "^12.1.0"
+ ignore "^4.0.6"
import-fresh "^3.2.1"
+ js-yaml "^3.13.1"
+ lodash "^4.17.19"
+ minimatch "^3.0.4"
strip-json-comments "^3.1.1"
"@istanbuljs/load-nyc-config@^1.0.0":
@@ -550,6 +568,56 @@
"@nodelib/fs.scandir" "2.1.3"
fastq "^1.6.0"
+"@rollup/plugin-commonjs@^14.0.0":
+ version "14.0.0"
+ resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-14.0.0.tgz#4285f9ec2db686a31129e5a2b415c94aa1f836f0"
+ integrity sha512-+PSmD9ePwTAeU106i9FRdc+Zb3XUWyW26mo5Atr2mk82hor8+nPwkztEjFo8/B1fJKfaQDg9aM2bzQkjhi7zOw==
+ dependencies:
+ "@rollup/pluginutils" "^3.0.8"
+ commondir "^1.0.1"
+ estree-walker "^1.0.1"
+ glob "^7.1.2"
+ is-reference "^1.1.2"
+ magic-string "^0.25.2"
+ resolve "^1.11.0"
+
+"@rollup/plugin-json@^4.1.0":
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3"
+ integrity sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==
+ dependencies:
+ "@rollup/pluginutils" "^3.0.8"
+
+"@rollup/plugin-node-resolve@^8.4.0":
+ version "8.4.0"
+ resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.4.0.tgz#261d79a680e9dc3d86761c14462f24126ba83575"
+ integrity sha512-LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ==
+ dependencies:
+ "@rollup/pluginutils" "^3.1.0"
+ "@types/resolve" "1.17.1"
+ builtin-modules "^3.1.0"
+ deep-freeze "^0.0.1"
+ deepmerge "^4.2.2"
+ is-module "^1.0.0"
+ resolve "^1.17.0"
+
+"@rollup/plugin-replace@^2.3.3":
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.3.3.tgz#cd6bae39444de119f5d905322b91ebd4078562e7"
+ integrity sha512-XPmVXZ7IlaoWaJLkSCDaa0Y6uVo5XQYHhiMFzOd5qSv5rE+t/UJToPIOE56flKIxBFQI27ONsxb7dqHnwSsjKQ==
+ dependencies:
+ "@rollup/pluginutils" "^3.0.8"
+ magic-string "^0.25.5"
+
+"@rollup/pluginutils@^3.0.0", "@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0":
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
+ integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
+ dependencies:
+ "@types/estree" "0.0.39"
+ estree-walker "^1.0.1"
+ picomatch "^2.2.2"
+
"@sinonjs/commons@^1.7.0":
version "1.8.1"
resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
@@ -602,6 +670,16 @@
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+"@types/estree@*":
+ version "0.0.45"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884"
+ integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==
+
+"@types/estree@0.0.39":
+ version "0.0.39"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+ integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
+
"@types/fs-extra@^9.0.1":
version "9.0.1"
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.1.tgz#91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918"
@@ -609,6 +687,14 @@
dependencies:
"@types/node" "*"
+"@types/glob@^7.1.1":
+ version "7.1.3"
+ resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
+ integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
+ dependencies:
+ "@types/minimatch" "*"
+ "@types/node" "*"
+
"@types/graceful-fs@^4.1.2":
version "4.1.3"
resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f"
@@ -651,10 +737,10 @@
jest-diff "^25.2.1"
pretty-format "^25.2.1"
-"@types/jest@^26.0.12":
- version "26.0.12"
- resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.12.tgz#0f20fef9e74f55a312530284e6178f3b3254f501"
- integrity sha512-vZOFjm562IPb1EmaKxMjdcouxVb1l3NqoUH4XC4tDQ2R/AWde+0HXBUhyfc6L+7vc3mJ393U+5vr3nH2CLSVVg==
+"@types/jest@^26.0.14":
+ version "26.0.14"
+ resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz#078695f8f65cb55c5a98450d65083b2b73e5a3f3"
+ integrity sha512-Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg==
dependencies:
jest-diff "^25.2.1"
pretty-format "^25.2.1"
@@ -669,15 +755,20 @@
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+"@types/minimatch@*":
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
"@types/node@*":
version "14.0.27"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1"
integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==
-"@types/node@^14.6.2":
- version "14.6.2"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.2.tgz#264b44c5a28dfa80198fc2f7b6d3c8a054b9491f"
- integrity sha512-onlIwbaeqvZyniGPfdw/TEhKIh79pz66L1q06WUQqJLnAb6wbjvOtepLYTGHTqzdXgBYIE3ZdmqHDGsRsbBz7A==
+"@types/node@^14.10.3":
+ version "14.10.3"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.10.3.tgz#5ae1f119c96643fc9b19b2d1a83bfa2ec3dbb7ea"
+ integrity sha512-zdN0hor7TLkjAdKTnYW+Y22oIhUUpil5ZD1V1OFq0CR0CLKw+NdR6dkziTfkWRLo6sKzisayoj/GNpNbe4LY9Q==
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
@@ -694,6 +785,13 @@
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.2.tgz#5bb52ee68d0f8efa9cc0099920e56be6cc4e37f3"
integrity sha512-IkVfat549ggtkZUthUzEX49562eGikhSYeVGX97SkMFn+sTZrgRewXjQ4tPKFPCykZHkX1Zfd9OoELGqKU2jJA==
+"@types/resolve@1.17.1":
+ version "1.17.1"
+ resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
+ integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
+ dependencies:
+ "@types/node" "*"
+
"@types/stack-utils@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -711,28 +809,28 @@
dependencies:
"@types/yargs-parser" "*"
-"@typescript-eslint/eslint-plugin@^4.0.1":
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.0.1.tgz#88bde9239e29d688315718552cf80a3490491017"
- integrity sha512-pQZtXupCn11O4AwpYVUX4PDFfmIJl90ZgrEBg0CEcqlwvPiG0uY81fimr1oMFblZnpKAq6prrT9a59pj1x58rw==
+"@typescript-eslint/eslint-plugin@^4.1.1":
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.1.1.tgz#78d5b18e259b13c2f4ec41dd9105af269a161a75"
+ integrity sha512-Hoxyt99EA9LMmqo/5PuWWPeWeB3mKyvibfJ1Hy5SfiUpjE8Nqp+5QNd9fOkzL66+fqvIWSIE+Ett16LGMzCGnQ==
dependencies:
- "@typescript-eslint/experimental-utils" "4.0.1"
- "@typescript-eslint/scope-manager" "4.0.1"
+ "@typescript-eslint/experimental-utils" "4.1.1"
+ "@typescript-eslint/scope-manager" "4.1.1"
debug "^4.1.1"
functional-red-black-tree "^1.0.1"
regexpp "^3.0.0"
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/experimental-utils@4.0.1":
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.0.1.tgz#7d9a3ab6821ad5274dad2186c1aa0d93afd696eb"
- integrity sha512-gAqOjLiHoED79iYTt3F4uSHrYmg/GPz/zGezdB0jAdr6S6gwNiR/j7cTZ8nREKVzMVKLd9G3xbg1sV9GClW3sw==
+"@typescript-eslint/experimental-utils@4.1.1":
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.1.1.tgz#52ff4e37c93113eb96385a4e6d075abece1ea72d"
+ integrity sha512-jzYsNciHoa4Z3c1URtmeT/bamYm8Dwfw6vuN3WHIE/BXb1iC4KveAnXDErTAZtPVxTYBaYn3n2gbt6F6D2rm1A==
dependencies:
"@types/json-schema" "^7.0.3"
- "@typescript-eslint/scope-manager" "4.0.1"
- "@typescript-eslint/types" "4.0.1"
- "@typescript-eslint/typescript-estree" "4.0.1"
+ "@typescript-eslint/scope-manager" "4.1.1"
+ "@typescript-eslint/types" "4.1.1"
+ "@typescript-eslint/typescript-estree" "4.1.1"
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
@@ -746,28 +844,28 @@
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
-"@typescript-eslint/parser@^4.0.1":
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.0.1.tgz#73772080db7a7a4534a35d719e006f503e664dc3"
- integrity sha512-1+qLmXHNAWSQ7RB6fdSQszAiA7JTwzakj5cNYjBTUmpH2cqilxMZEIV+DRKjVZs8NzP3ALmKexB0w/ExjcK9Iw==
+"@typescript-eslint/parser@^4.1.1":
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.1.1.tgz#324b4b35e314075adbc92bd8330cf3ef0c88cf3e"
+ integrity sha512-NLIhmicpKGfJbdXyQBz9j48PA6hq6e+SDOoXy7Ak6bq1ebGqbgG+fR1UIDAuay6OjQdot69c/URu2uLlsP8GQQ==
dependencies:
- "@typescript-eslint/scope-manager" "4.0.1"
- "@typescript-eslint/types" "4.0.1"
- "@typescript-eslint/typescript-estree" "4.0.1"
+ "@typescript-eslint/scope-manager" "4.1.1"
+ "@typescript-eslint/types" "4.1.1"
+ "@typescript-eslint/typescript-estree" "4.1.1"
debug "^4.1.1"
-"@typescript-eslint/scope-manager@4.0.1":
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.0.1.tgz#24d93c3000bdfcc5a157dc4d32b742405a8631b5"
- integrity sha512-u3YEXVJ8jsj7QCJk3om0Y457fy2euEOkkzxIB/LKU3MdyI+FJ2gI0M4aKEaXzwCSfNDiZ13a3lDo5DVozc+XLQ==
+"@typescript-eslint/scope-manager@4.1.1":
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.1.1.tgz#bdb8526e82435f32b4ccd9dd4cec01af97b48850"
+ integrity sha512-0W8TTobCvIIQ2FsrYTffyZGAAFUyIbEHq5EYJb1m7Rpd005jrnOvKOo8ywCLhs/Bm17C+KsrUboBvBAARQVvyA==
dependencies:
- "@typescript-eslint/types" "4.0.1"
- "@typescript-eslint/visitor-keys" "4.0.1"
+ "@typescript-eslint/types" "4.1.1"
+ "@typescript-eslint/visitor-keys" "4.1.1"
-"@typescript-eslint/types@4.0.1":
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.0.1.tgz#1cf72582f764931f085cb8230ff215980fe467b2"
- integrity sha512-S+gD3fgbkZYW2rnbjugNMqibm9HpEjqZBZkTiI3PwbbNGWmAcxolWIUwZ0SKeG4Dy2ktpKKaI/6+HGYVH8Qrlg==
+"@typescript-eslint/types@4.1.1":
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.1.1.tgz#57500c4a86b28cb47094c1a62f1177ea279a09cb"
+ integrity sha512-zrBiqOKYerMTllKcn+BP+i1b7LW/EbMMYytroXMxUTvFPn1smkCu0D7lSAx29fTUO4jnwV0ljSvYQtn2vNrNxA==
"@typescript-eslint/typescript-estree@2.34.0":
version "2.34.0"
@@ -782,13 +880,13 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/typescript-estree@4.0.1":
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.0.1.tgz#29a43c7060641ec51c902d9f50ac7c5866ec479f"
- integrity sha512-zGzleORFXrRWRJAMLTB2iJD1IZbCPkg4hsI8mGdpYlKaqzvKYSEWVAYh14eauaR+qIoZVWrXgYSXqLtTlxotiw==
+"@typescript-eslint/typescript-estree@4.1.1":
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.1.1.tgz#2015a84d71303ecdb6f46efd807ac19a51aab490"
+ integrity sha512-2AUg5v0liVBsqbGxBphbJ0QbGqSRVaF5qPoTPWcxop+66vMdU1h4CCvHxTC47+Qb+Pr4l2RhXDd41JNpwcQEKw==
dependencies:
- "@typescript-eslint/types" "4.0.1"
- "@typescript-eslint/visitor-keys" "4.0.1"
+ "@typescript-eslint/types" "4.1.1"
+ "@typescript-eslint/visitor-keys" "4.1.1"
debug "^4.1.1"
globby "^11.0.1"
is-glob "^4.0.1"
@@ -796,12 +894,12 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/visitor-keys@4.0.1":
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.0.1.tgz#d4e8de62775f2a6db71c7e8539633680039fdd6c"
- integrity sha512-yBSqd6FjnTzbg5RUy9J+9kJEyQjTI34JdGMJz+9ttlJzLCnGkBikxw+N5n2VDcc3CesbIEJ0MnZc5uRYnrEnCw==
+"@typescript-eslint/visitor-keys@4.1.1":
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.1.1.tgz#bb05664bf4bea28dc120d1da94f3027d42ab0f6f"
+ integrity sha512-/EOOXbA2ferGLG6RmCHEQ0lTTLkOlXYDgblCmQk3tIU7mTPLm4gKhFMeeUSe+bcchTUsKeCk8xcpbop5Zr/8Rw==
dependencies:
- "@typescript-eslint/types" "4.0.1"
+ "@typescript-eslint/types" "4.1.1"
eslint-visitor-keys "^2.0.0"
abab@^2.0.3:
@@ -832,6 +930,14 @@ acorn@^7.1.1, acorn@^7.4.0:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
+aggregate-error@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+ integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+ dependencies:
+ clean-stack "^2.0.0"
+ indent-string "^4.0.0"
+
ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3:
version "6.12.3"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
@@ -1156,6 +1262,11 @@ buffer-from@1.x, buffer-from@^1.0.0:
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+builtin-modules@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
+ integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
+
cache-base@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -1253,6 +1364,11 @@ class-utils@^0.3.5:
isobject "^3.0.0"
static-extend "^0.1.1"
+clean-stack@^2.0.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+ integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
cli-cursor@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -1336,6 +1452,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
dependencies:
delayed-stream "~1.0.0"
+commander@^2.20.0:
+ version "2.20.3"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+ integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
commitizen@^4.0.3:
version "4.2.1"
resolved "https://registry.yarnpkg.com/commitizen/-/commitizen-4.2.1.tgz#3b098b16c6b1a37f0d129018dff6751b20cd3103"
@@ -1356,6 +1477,11 @@ commitizen@^4.0.3:
strip-bom "4.0.0"
strip-json-comments "3.0.1"
+commondir@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+ integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
component-emitter@^1.2.1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
@@ -1393,6 +1519,11 @@ copy-descriptor@^0.1.0:
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+core-js@^3.1.3:
+ version "3.6.5"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
+ integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
+
core-util-is@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -1535,6 +1666,11 @@ dedent@0.7.0:
resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
+deep-freeze@^0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/deep-freeze/-/deep-freeze-0.0.1.tgz#3a0b0005de18672819dfd38cd31f91179c893e84"
+ integrity sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ=
+
deep-is@^0.1.3, deep-is@~0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -1574,6 +1710,20 @@ define-property@^2.0.2:
is-descriptor "^1.0.2"
isobject "^3.0.1"
+del@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7"
+ integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==
+ dependencies:
+ globby "^10.0.1"
+ graceful-fs "^4.2.2"
+ is-glob "^4.0.1"
+ is-path-cwd "^2.2.0"
+ is-path-inside "^3.0.1"
+ p-map "^3.0.0"
+ rimraf "^3.0.0"
+ slash "^3.0.0"
+
delayed-stream@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -1594,6 +1744,11 @@ detect-newline@^3.0.0:
resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
+devalue@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/devalue/-/devalue-2.0.1.tgz#5d368f9adc0928e47b77eea53ca60d2f346f9762"
+ integrity sha512-I2TiqT5iWBEyB8GRfTDP0hiLZ0YeDJZ+upDxjBfOC2lebO5LezQMv7QvIUTzdb64jQyAKLf1AHADtGN+jw6v8Q==
+
diff-sequences@^25.2.6:
version "25.2.6"
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd"
@@ -1820,13 +1975,13 @@ eslint-visitor-keys@^2.0.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
-eslint@^7.8.0:
- version "7.8.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.8.0.tgz#9a3e2e6e4d0a3f8c42686073c25ebf2e91443e8a"
- integrity sha512-qgtVyLZqKd2ZXWnLQA4NtVbOyH56zivOAdBFWE54RFkSZjokzNrcP4Z0eVWsZ+84ByXv+jL9k/wE1ENYe8xRFw==
+eslint@^7.9.0:
+ version "7.9.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337"
+ integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==
dependencies:
"@babel/code-frame" "^7.0.0"
- "@eslint/eslintrc" "^0.1.0"
+ "@eslint/eslintrc" "^0.1.3"
ajv "^6.10.0"
chalk "^4.0.0"
cross-spawn "^7.0.2"
@@ -1901,6 +2056,16 @@ estraverse@^5.1.0:
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+estree-walker@^0.6.1:
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
+ integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
+
+estree-walker@^1.0.0, estree-walker@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
+ integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
+
esutils@^2.0.2:
version "2.0.3"
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -2039,7 +2204,7 @@ fast-diff@^1.1.2:
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
-fast-glob@^3.1.1:
+fast-glob@^3.0.0, fast-glob@^3.0.3, fast-glob@^3.1.1:
version "3.2.4"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
@@ -2198,7 +2363,7 @@ fs-extra@8.1.0:
jsonfile "^4.0.0"
universalify "^0.1.0"
-fs-extra@^9.0.1:
+fs-extra@^9.0.0, fs-extra@^9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
@@ -2213,7 +2378,7 @@ fs.realpath@^1.0.0:
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-fsevents@^2.1.2:
+fsevents@^2.1.2, fsevents@~2.1.2:
version "2.1.3"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
@@ -2344,6 +2509,20 @@ globals@^12.1.0:
dependencies:
type-fest "^0.8.1"
+globby@^10.0.1:
+ version "10.0.2"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
+ integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==
+ dependencies:
+ "@types/glob" "^7.1.1"
+ array-union "^2.1.0"
+ dir-glob "^3.0.1"
+ fast-glob "^3.0.3"
+ glob "^7.1.3"
+ ignore "^5.1.1"
+ merge2 "^1.2.3"
+ slash "^3.0.0"
+
globby@^11.0.1:
version "11.0.1"
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
@@ -2356,7 +2535,7 @@ globby@^11.0.1:
merge2 "^1.3.0"
slash "^3.0.0"
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
version "4.2.4"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
@@ -2477,7 +2656,12 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
dependencies:
safer-buffer ">= 2.1.2 < 3"
-ignore@^5.1.4:
+ignore@^4.0.6:
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+ integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
+ignore@^5.1.1, ignore@^5.1.4:
version "5.1.8"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
@@ -2503,6 +2687,11 @@ imurmurhash@^0.1.4:
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+indent-string@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+ integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
inflight@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -2540,11 +2729,6 @@ inquirer@6.5.2:
strip-ansi "^5.1.0"
through "^2.3.6"
-intersection-observer@^0.11.0:
- version "0.11.0"
- resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.11.0.tgz#f4ea067070326f68393ee161cc0a2ca4c0040c6f"
- integrity sha512-KZArj2QVnmdud9zTpKf279m2bbGfG+4/kn16UU0NL3pTVl52ZHiJ9IRNSsnn6jaHrL9EGLFM5eWjTx2fz/+zoQ==
-
ip-regex@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -2667,6 +2851,11 @@ is-glob@^4.0.0, is-glob@^4.0.1:
dependencies:
is-extglob "^2.1.1"
+is-module@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+ integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+
is-number@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -2679,6 +2868,16 @@ is-number@^7.0.0:
resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+is-path-cwd@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
+ integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
+
+is-path-inside@^3.0.1:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"
+ integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==
+
is-plain-object@^2.0.3, is-plain-object@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -2691,6 +2890,13 @@ is-potential-custom-element-name@^1.0.0:
resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
+is-reference@^1.1.2, is-reference@^1.1.4:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
+ integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
+ dependencies:
+ "@types/estree" "*"
+
is-regex@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
@@ -3189,7 +3395,7 @@ jest-watcher@^26.3.0:
jest-util "^26.3.0"
string-length "^4.0.1"
-jest-worker@^26.3.0:
+jest-worker@^26.0.0, jest-worker@^26.3.0:
version "26.3.0"
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f"
integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==
@@ -3432,7 +3638,7 @@ lodash.sortby@^4.7.0:
resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
-lodash@^4.17.12, lodash@^4.17.20:
+lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.20:
version "4.17.20"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -3447,6 +3653,13 @@ longest@^2.0.1:
resolved "https://registry.yarnpkg.com/longest/-/longest-2.0.1.tgz#781e183296aa94f6d4d916dc335d0d17aefa23f8"
integrity sha1-eB4YMpaqlPbU2RbcM10NF676I/g=
+magic-string@^0.25.2, magic-string@^0.25.4, magic-string@^0.25.5:
+ version "0.25.7"
+ resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+ integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
+ dependencies:
+ sourcemap-codec "^1.4.4"
+
make-dir@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -3483,11 +3696,16 @@ merge-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-merge2@^1.3.0:
+merge2@^1.2.3, merge2@^1.3.0:
version "1.4.1"
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+merge@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+ integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
+
micromatch@^3.0.4, micromatch@^3.1.4:
version "3.1.10"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -3834,6 +4052,13 @@ p-locate@^4.1.0:
dependencies:
p-limit "^2.2.0"
+p-map@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
+ integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
+ dependencies:
+ aggregate-error "^3.0.0"
+
p-try@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -3930,7 +4155,7 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -3983,10 +4208,10 @@ prettier-linter-helpers@^1.0.0:
dependencies:
fast-diff "^1.1.2"
-prettier@^2.1.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6"
- integrity sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==
+prettier@^2.1.2:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
+ integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
pretty-format@^25.2.1, pretty-format@^25.5.0:
version "25.5.0"
@@ -4049,6 +4274,13 @@ qs@~6.5.2:
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+randombytes@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+ integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+ dependencies:
+ safe-buffer "^5.1.0"
+
react-is@^16.12.0:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -4175,6 +4407,11 @@ require-main-filename@^2.0.0:
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+require-relative@^0.8.7:
+ version "0.8.7"
+ resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
+ integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=
+
resolve-cwd@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -4212,7 +4449,7 @@ resolve-url@^0.2.1:
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-resolve@^1.10.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2:
+resolve@^1.10.0, resolve@^1.11.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2:
version "1.17.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -4251,6 +4488,82 @@ rimraf@^3.0.0, rimraf@^3.0.2:
dependencies:
glob "^7.1.3"
+rollup-plugin-babel@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz#d15bd259466a9d1accbdb2fe2fff17c52d030acb"
+ integrity sha512-Lek/TYp1+7g7I+uMfJnnSJ7YWoD58ajo6Oarhlex7lvUce+RCKRuGRSgztDO3/MF/PuGKmUL5iTHKf208UNszw==
+ dependencies:
+ "@babel/helper-module-imports" "^7.0.0"
+ rollup-pluginutils "^2.8.1"
+
+rollup-plugin-css-only@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/rollup-plugin-css-only/-/rollup-plugin-css-only-2.1.0.tgz#b9e8505eb01c5257b5eab65bd51eec9050bed9a3"
+ integrity sha512-pfdcqAWEmRMFy+ABXAQPA/DKyPqLuBTOf+lWSOgtrVs1v/q7DSXzYa9QZg4myd8/1F7NHcdvPkWnfWqMxq9vrw==
+ dependencies:
+ "@rollup/pluginutils" "^3.0.0"
+ fs-extra "^9.0.0"
+
+rollup-plugin-delete@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/rollup-plugin-delete/-/rollup-plugin-delete-2.0.0.tgz#262acf80660d48c3b167fb0baabd0c3ab985c153"
+ integrity sha512-/VpLMtDy+8wwRlDANuYmDa9ss/knGsAgrDhM+tEwB1npHwNu4DYNmDfUL55csse/GHs9Q+SMT/rw9uiaZ3pnzA==
+ dependencies:
+ del "^5.1.0"
+
+rollup-plugin-external-globals@^0.5.0:
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/rollup-plugin-external-globals/-/rollup-plugin-external-globals-0.5.0.tgz#1662cacfb240a6e4e0618db2b79e9feae0134603"
+ integrity sha512-v3qjync/2wcqdSesNP3qPnYeOnnV39ydCU+2fTxjlmux8uA1VqM4cUVffkgzoDh3TBOEhN8JWAHrN7Hs9ZD0Sg==
+ dependencies:
+ estree-walker "^1.0.0"
+ is-reference "^1.1.4"
+ magic-string "^0.25.4"
+ rollup-pluginutils "^2.8.2"
+
+rollup-plugin-multi-input@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/rollup-plugin-multi-input/-/rollup-plugin-multi-input-1.1.1.tgz#c77fbb8d042952fb7b877de5c00da553a914f28d"
+ integrity sha512-q/sFiS7h7AQk0V/fFREt5Gizewov01V1RZgORFmXL6W9emkJOPu94GFJ21KYtSob4bmEmDq9Hpr+3ukKNi84CA==
+ dependencies:
+ "@babel/runtime" "^7.0.0-beta.55"
+ core-js "^3.1.3"
+ fast-glob "^3.0.0"
+ lodash "^4.17.11"
+
+rollup-plugin-svelte@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-6.0.1.tgz#a4fc9c19c5c4277e6dbf8e79185c4cbd6b4383bf"
+ integrity sha512-kS9/JZMBNgpKTqVKlwV8mhmGwxu8NiNf6+n5ZzdZ8yDp3+ADqjf8Au+JNEpoOn6kLlh1hLS2Gsa76k9RP57HDQ==
+ dependencies:
+ require-relative "^0.8.7"
+ rollup-pluginutils "^2.8.2"
+ sourcemap-codec "^1.4.8"
+
+rollup-plugin-terser@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-6.1.0.tgz#071866585aea104bfbb9dd1019ac523e63c81e45"
+ integrity sha512-4fB3M9nuoWxrwm39habpd4hvrbrde2W2GG4zEGPQg1YITNkM3Tqur5jSuXlWNzbv/2aMLJ+dZJaySc3GCD8oDw==
+ dependencies:
+ "@babel/code-frame" "^7.8.3"
+ jest-worker "^26.0.0"
+ serialize-javascript "^3.0.0"
+ terser "^4.7.0"
+
+rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2:
+ version "2.8.2"
+ resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
+ integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
+ dependencies:
+ estree-walker "^0.6.1"
+
+rollup@^2.21.0:
+ version "2.27.1"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.27.1.tgz#372744e1d36eba0fd942d997600c2fc2ca266305"
+ integrity sha512-GiWHQvnmMgBktSpY/1+nrGpwPsTw4b9P28og2uedfeq4JZ16rzAmnQ5Pm/E0/BEmDNia1ZbY7+qu3nBgNa19Hg==
+ optionalDependencies:
+ fsevents "~2.1.2"
+
rsvp@^4.8.4:
version "4.8.5"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
@@ -4273,7 +4586,7 @@ rxjs@^6.4.0:
dependencies:
tslib "^1.9.0"
-safe-buffer@^5.0.1, safe-buffer@^5.1.2:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2:
version "5.2.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -4332,6 +4645,13 @@ semver@^6.0.0, semver@^6.3.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+serialize-javascript@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
+ integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
+ dependencies:
+ randombytes "^2.1.0"
+
set-blocking@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -4441,7 +4761,7 @@ source-map-resolve@^0.5.0:
source-map-url "^0.4.0"
urix "^0.1.0"
-source-map-support@^0.5.17, source-map-support@^0.5.6:
+source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12:
version "0.5.19"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -4469,6 +4789,11 @@ source-map@^0.7.3:
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8:
+ version "1.4.8"
+ resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+ integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
spdx-correct@^3.0.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -4665,6 +4990,11 @@ supports-hyperlinks@^2.0.0:
has-flag "^4.0.0"
supports-color "^7.0.0"
+svelte@^3.25.1:
+ version "3.25.1"
+ resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.25.1.tgz#218def1243fea5a97af6eb60f5e232315bb57ac4"
+ integrity sha512-IbrVKTmuR0BvDw4ii8/gBNy8REu7nWTRy9uhUz+Yuae5lIjWgSGwKlWtJGC2Vg95s+UnXPqDu0Kk/sUwe0t2GQ==
+
symbol-tree@^3.2.4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -4675,11 +5005,6 @@ synchronous-promise@^2.0.13:
resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.13.tgz#9d8c165ddee69c5a6542862b405bc50095926702"
integrity sha512-R9N6uDkVsghHePKh1TEqbnLddO2IY25OcsksyFp/qBe7XYd0PVbKEWxhcdMhpLzE1I6skj5l4aEZ3CRxcbArlA==
-systemjs@^6.5.0:
- version "6.5.0"
- resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-6.5.0.tgz#42e5e19e324e99b6e96a946697fddb3de9f6f3d5"
- integrity sha512-B+NzKJD1srC/URfNVBdDExAUAsAVXpVQxZxX54AtqU0xiK9imkqurQu3qi6JdyA2GBAw2ssjolYIa7kh+xY1uw==
-
table@^5.2.3:
version "5.4.6"
resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
@@ -4698,6 +5023,15 @@ terminal-link@^2.0.0:
ansi-escapes "^4.2.1"
supports-hyperlinks "^2.0.0"
+terser@^4.7.0:
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+ integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+ dependencies:
+ commander "^2.20.0"
+ source-map "~0.6.1"
+ source-map-support "~0.5.12"
+
test-exclude@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"