@jungvonmatt/contentful-ssg 1.11.0 → 1.11.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/__test__/mock.d.ts +0 -0
- package/dist/__test__/mock.js +0 -0
- package/dist/__test__/mock.js.map +0 -0
- package/dist/cli.d.ts +0 -0
- package/dist/cli.js +13 -10
- package/dist/cli.js.map +1 -1
- package/dist/converter/index.d.ts +0 -0
- package/dist/converter/index.js +0 -0
- package/dist/converter/index.js.map +0 -0
- package/dist/converter/json.d.ts +0 -0
- package/dist/converter/json.js +0 -0
- package/dist/converter/json.js.map +0 -0
- package/dist/converter/markdown.d.ts +0 -0
- package/dist/converter/markdown.js +0 -0
- package/dist/converter/markdown.js.map +0 -0
- package/dist/converter/toml.d.ts +0 -0
- package/dist/converter/toml.js +0 -0
- package/dist/converter/toml.js.map +0 -0
- package/dist/converter/yaml.d.ts +0 -0
- package/dist/converter/yaml.js +0 -0
- package/dist/converter/yaml.js.map +0 -0
- package/dist/index.d.ts +0 -0
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/array.d.ts +0 -0
- package/dist/lib/array.js +0 -0
- package/dist/lib/array.js.map +0 -0
- package/dist/lib/cf-cache.d.ts +0 -0
- package/dist/lib/cf-cache.js +0 -0
- package/dist/lib/cf-cache.js.map +0 -0
- package/dist/lib/config.d.ts +0 -0
- package/dist/lib/config.js +66 -7
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/contentful.d.ts +0 -0
- package/dist/lib/contentful.js +0 -0
- package/dist/lib/contentful.js.map +0 -0
- package/dist/lib/create-require.d.ts +3 -0
- package/dist/lib/create-require.js +41 -3
- package/dist/lib/create-require.js.map +1 -1
- package/dist/lib/error.d.ts +0 -0
- package/dist/lib/error.js +0 -0
- package/dist/lib/error.js.map +0 -0
- package/dist/lib/file-manager.d.ts +0 -0
- package/dist/lib/file-manager.js +0 -0
- package/dist/lib/file-manager.js.map +0 -0
- package/dist/lib/hook-manager.d.ts +0 -0
- package/dist/lib/hook-manager.js +0 -0
- package/dist/lib/hook-manager.js.map +0 -0
- package/dist/lib/object.d.ts +0 -0
- package/dist/lib/object.js +0 -0
- package/dist/lib/object.js.map +0 -0
- package/dist/lib/observable.d.ts +0 -0
- package/dist/lib/observable.js +0 -0
- package/dist/lib/observable.js.map +0 -0
- package/dist/lib/stats.d.ts +0 -0
- package/dist/lib/stats.js +0 -0
- package/dist/lib/stats.js.map +0 -0
- package/dist/lib/ui.d.ts +0 -0
- package/dist/lib/ui.js +0 -0
- package/dist/lib/ui.js.map +0 -0
- package/dist/lib/utils.d.ts +0 -0
- package/dist/lib/utils.js +0 -0
- package/dist/lib/utils.js.map +0 -0
- package/dist/mapper/map-date-field.d.ts +0 -0
- package/dist/mapper/map-date-field.js +0 -0
- package/dist/mapper/map-date-field.js.map +0 -0
- package/dist/mapper/map-entry.d.ts +0 -0
- package/dist/mapper/map-entry.js +0 -0
- package/dist/mapper/map-entry.js.map +0 -0
- package/dist/mapper/map-field.d.ts +0 -0
- package/dist/mapper/map-field.js +0 -0
- package/dist/mapper/map-field.js.map +0 -0
- package/dist/mapper/map-meta-fields.d.ts +0 -0
- package/dist/mapper/map-meta-fields.js +0 -0
- package/dist/mapper/map-meta-fields.js.map +0 -0
- package/dist/mapper/map-reference-field.d.ts +0 -0
- package/dist/mapper/map-reference-field.js +0 -0
- package/dist/mapper/map-reference-field.js.map +0 -0
- package/dist/mapper/map-rich-text-field.d.ts +1 -1
- package/dist/mapper/map-rich-text-field.js +0 -0
- package/dist/mapper/map-rich-text-field.js.map +0 -0
- package/dist/server/index.d.ts +0 -0
- package/dist/server/index.js +0 -0
- package/dist/server/index.js.map +0 -0
- package/dist/tasks/fetch.d.ts +0 -0
- package/dist/tasks/fetch.js +0 -0
- package/dist/tasks/fetch.js.map +0 -0
- package/dist/tasks/localize.d.ts +0 -0
- package/dist/tasks/localize.js +0 -0
- package/dist/tasks/localize.js.map +0 -0
- package/dist/tasks/remove.d.ts +0 -0
- package/dist/tasks/remove.js +0 -0
- package/dist/tasks/remove.js.map +0 -0
- package/dist/tasks/setup.d.ts +0 -0
- package/dist/tasks/setup.js +0 -0
- package/dist/tasks/setup.js.map +0 -0
- package/dist/tasks/transform.d.ts +0 -0
- package/dist/tasks/transform.js +0 -0
- package/dist/tasks/transform.js.map +0 -0
- package/dist/tasks/write.d.ts +0 -0
- package/dist/tasks/write.js +0 -0
- package/dist/tasks/write.js.map +0 -0
- package/dist/types.d.ts +11 -0
- package/dist/types.js +0 -0
- package/dist/types.js.map +0 -0
- package/package.json +4 -5
- package/src/cli.ts +35 -25
- package/src/index.test.ts +18 -9
- package/src/index.ts +2 -1
- package/src/lib/config.ts +79 -8
- package/src/lib/create-require.ts +55 -2
- package/src/types.ts +9 -0
package/dist/__test__/mock.d.ts
CHANGED
|
File without changes
|
package/dist/__test__/mock.js
CHANGED
|
File without changes
|
|
File without changes
|
package/dist/cli.d.ts
CHANGED
|
File without changes
|
package/dist/cli.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import
|
|
2
|
+
import { asyncExitHook, gracefulExit } from 'exit-hook';
|
|
3
3
|
import chalk from 'chalk';
|
|
4
4
|
import { Command } from 'commander';
|
|
5
5
|
import dotenv from 'dotenv';
|
|
@@ -41,9 +41,11 @@ const errorHandler = (error, silence) => {
|
|
|
41
41
|
logError(error);
|
|
42
42
|
});
|
|
43
43
|
}
|
|
44
|
-
|
|
44
|
+
gracefulExit(1);
|
|
45
45
|
};
|
|
46
|
-
const actionRunner = (fn, log = true) => (...args) => fn(...args).catch((error) =>
|
|
46
|
+
const actionRunner = (fn, log = true) => (...args) => fn(...args).catch((error) => {
|
|
47
|
+
errorHandler(error, !log);
|
|
48
|
+
});
|
|
47
49
|
const program = new Command();
|
|
48
50
|
program
|
|
49
51
|
.command('init')
|
|
@@ -151,7 +153,7 @@ program
|
|
|
151
153
|
if (useCache) {
|
|
152
154
|
await cache.setSyncState(prev);
|
|
153
155
|
}
|
|
154
|
-
|
|
156
|
+
asyncExitHook(async () => {
|
|
155
157
|
try {
|
|
156
158
|
await Promise.all([
|
|
157
159
|
!useCache && cache.reset(),
|
|
@@ -161,9 +163,8 @@ program
|
|
|
161
163
|
catch (error) {
|
|
162
164
|
console.error('\nError:', error);
|
|
163
165
|
}
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
}
|
|
166
|
+
}, {
|
|
167
|
+
minimumWait: 2000,
|
|
167
168
|
});
|
|
168
169
|
if (cmd.poll) {
|
|
169
170
|
const poll = () => {
|
|
@@ -212,7 +213,7 @@ program
|
|
|
212
213
|
const url = process.env.CSSG_WEBHOOK_URL || cmd.url || (await ngrok.connect(port));
|
|
213
214
|
console.log(` Listening for hooks on ${chalk.cyan(url)}`);
|
|
214
215
|
const webhook = await addWatchWebhook(verified, url);
|
|
215
|
-
|
|
216
|
+
asyncExitHook(async () => {
|
|
216
217
|
try {
|
|
217
218
|
const results = await Promise.allSettled([webhook.delete(), stopServer()]);
|
|
218
219
|
results.forEach((result) => {
|
|
@@ -221,9 +222,11 @@ program
|
|
|
221
222
|
}
|
|
222
223
|
});
|
|
223
224
|
}
|
|
224
|
-
|
|
225
|
-
|
|
225
|
+
catch (error) {
|
|
226
|
+
console.error('\nError:', error);
|
|
226
227
|
}
|
|
228
|
+
}, {
|
|
229
|
+
minimumWait: 2000,
|
|
227
230
|
});
|
|
228
231
|
}
|
|
229
232
|
}));
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
package/dist/converter/index.js
CHANGED
|
File without changes
|
|
File without changes
|
package/dist/converter/json.d.ts
CHANGED
|
File without changes
|
package/dist/converter/json.js
CHANGED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
package/dist/converter/toml.d.ts
CHANGED
|
File without changes
|
package/dist/converter/toml.js
CHANGED
|
File without changes
|
|
File without changes
|
package/dist/converter/yaml.d.ts
CHANGED
|
File without changes
|
package/dist/converter/yaml.js
CHANGED
|
File without changes
|
|
File without changes
|
package/dist/index.d.ts
CHANGED
|
File without changes
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import Listr from 'listr';
|
|
3
|
+
import { gracefulExit } from 'exit-hook';
|
|
3
4
|
import { ReplaySubject } from 'rxjs';
|
|
4
5
|
import { initializeCache } from './lib/cf-cache.js';
|
|
5
6
|
import { getContentId, getContentTypeId } from './lib/contentful.js';
|
|
@@ -231,7 +232,7 @@ export const run = async (config, prev = {
|
|
|
231
232
|
await ctx.stats.print(hasPrev && prev);
|
|
232
233
|
console.log('\n -------------------------------------------');
|
|
233
234
|
if (!ctx.config.sync && ctx.stats.errors?.length && !config.ignoreErrors) {
|
|
234
|
-
|
|
235
|
+
gracefulExit(1);
|
|
235
236
|
}
|
|
236
237
|
return prev;
|
|
237
238
|
};
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/array.d.ts
CHANGED
|
File without changes
|
package/dist/lib/array.js
CHANGED
|
File without changes
|
package/dist/lib/array.js.map
CHANGED
|
File without changes
|
package/dist/lib/cf-cache.d.ts
CHANGED
|
File without changes
|
package/dist/lib/cf-cache.js
CHANGED
|
File without changes
|
package/dist/lib/cf-cache.js.map
CHANGED
|
File without changes
|
package/dist/lib/config.d.ts
CHANGED
|
File without changes
|
package/dist/lib/config.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import
|
|
1
|
+
import vm from 'vm';
|
|
2
2
|
import chalk from 'chalk';
|
|
3
|
+
import { transformSync } from '@swc/core';
|
|
4
|
+
import { gracefulExit } from 'exit-hook';
|
|
3
5
|
import { cosmiconfig } from 'cosmiconfig';
|
|
4
6
|
import mergeOptionsModule from 'merge-options';
|
|
5
7
|
import { dirname, isAbsolute, resolve } from 'path';
|
|
@@ -7,12 +9,64 @@ import slash from 'slash';
|
|
|
7
9
|
import { reduceAsync } from './array.js';
|
|
8
10
|
import { createRequire } from './create-require.js';
|
|
9
11
|
import { isObject, removeEmpty } from './object.js';
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
const getContext = (filename) => {
|
|
13
|
+
const module = {
|
|
14
|
+
exports: {},
|
|
15
|
+
isPreloading: false,
|
|
16
|
+
require: createRequire(dirname(filename)),
|
|
17
|
+
id: '',
|
|
18
|
+
filename,
|
|
19
|
+
loaded: false,
|
|
20
|
+
parent: undefined,
|
|
21
|
+
children: [],
|
|
22
|
+
path: dirname(filename),
|
|
23
|
+
paths: [dirname(filename)],
|
|
24
|
+
};
|
|
25
|
+
const sandbox = {
|
|
26
|
+
module,
|
|
27
|
+
exports: {},
|
|
28
|
+
process: { env: process.env },
|
|
29
|
+
require: module.require,
|
|
30
|
+
__dirname: dirname(filename),
|
|
31
|
+
__filename: filename,
|
|
32
|
+
};
|
|
33
|
+
vm.createContext(sandbox);
|
|
34
|
+
return sandbox;
|
|
35
|
+
};
|
|
36
|
+
const getLoader = (syntax) => (filename, content) => {
|
|
37
|
+
const context = getContext(filename);
|
|
38
|
+
const script = transformSync(content, {
|
|
39
|
+
isModule: /\s(export|import)\s/.test(content),
|
|
40
|
+
module: {
|
|
41
|
+
type: 'commonjs',
|
|
42
|
+
},
|
|
43
|
+
cwd: dirname(filename),
|
|
44
|
+
jsc: {
|
|
45
|
+
parser: {
|
|
46
|
+
syntax,
|
|
47
|
+
dynamicImport: true,
|
|
48
|
+
},
|
|
49
|
+
},
|
|
50
|
+
});
|
|
51
|
+
const vmScript = new vm.Script(script.code);
|
|
52
|
+
try {
|
|
53
|
+
vmScript.runInContext(context, { filename, timeout: 10000 });
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
console.log(error);
|
|
57
|
+
}
|
|
58
|
+
if (Object.keys(context.module.exports).length > 0) {
|
|
59
|
+
const result = (context.module.exports.default || context.module.exports);
|
|
60
|
+
return { ...result };
|
|
61
|
+
}
|
|
62
|
+
if (Object.keys(context.exports).length > 0) {
|
|
63
|
+
const result = (context.exports.default || context.exports);
|
|
64
|
+
return { ...result };
|
|
65
|
+
}
|
|
66
|
+
return {};
|
|
15
67
|
};
|
|
68
|
+
const typescriptLoader = getLoader('typescript');
|
|
69
|
+
const ecmascriptLoader = getLoader('ecmascript');
|
|
16
70
|
const mergeOptions = mergeOptionsModule.bind({ ignoreUndefined: true });
|
|
17
71
|
const resolvePlugin = async (plugin, config) => {
|
|
18
72
|
let pluginName;
|
|
@@ -52,7 +106,7 @@ const resolvePlugin = async (plugin, config) => {
|
|
|
52
106
|
else {
|
|
53
107
|
console.error(chalk.red(`There was a problem loading plugin "${pluginName}". Perhaps you need to install its package?\nUse --verbose to see actual error.`));
|
|
54
108
|
}
|
|
55
|
-
|
|
109
|
+
gracefulExit(1);
|
|
56
110
|
}
|
|
57
111
|
};
|
|
58
112
|
const loadConfig = async (moduleName) => {
|
|
@@ -66,9 +120,14 @@ const loadConfig = async (moduleName) => {
|
|
|
66
120
|
`.${moduleName}rc.js`,
|
|
67
121
|
`${moduleName}.config.ts`,
|
|
68
122
|
`${moduleName}.config.js`,
|
|
123
|
+
`${moduleName}.config.cjs`,
|
|
124
|
+
`${moduleName}.config.mjs`,
|
|
69
125
|
],
|
|
70
126
|
loaders: {
|
|
71
127
|
'.ts': typescriptLoader,
|
|
128
|
+
'.js': ecmascriptLoader,
|
|
129
|
+
'.cjs': ecmascriptLoader,
|
|
130
|
+
'.mjs': ecmascriptLoader,
|
|
72
131
|
},
|
|
73
132
|
});
|
|
74
133
|
return explorer.search();
|
package/dist/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/contentful.d.ts
CHANGED
|
File without changes
|
package/dist/lib/contentful.js
CHANGED
|
File without changes
|
|
File without changes
|
|
@@ -1,2 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
export declare function compile(sourcecode: string, filename: string, async?: false): string;
|
|
3
|
+
export declare function compile(sourcecode: string, filename: string, async?: boolean): string | Promise<string>;
|
|
4
|
+
export declare function registerRequireHook(hookOpts?: {}): () => void;
|
|
2
5
|
export declare const createRequire: (rootDir?: string) => NodeRequire;
|
|
@@ -1,5 +1,43 @@
|
|
|
1
|
+
import { dirname } from 'path';
|
|
2
|
+
import { transform, transformSync } from '@swc/core';
|
|
3
|
+
import { addHook } from 'pirates';
|
|
1
4
|
import { createRequire as moduleCreateRequire } from 'module';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
:
|
|
5
|
+
const defaultExtensions = ['.js', '.jsx', '.es6', '.es', '.mjs', '.ts', '.tsx'];
|
|
6
|
+
const getTsOptions = (filename) => ({
|
|
7
|
+
module: {
|
|
8
|
+
type: 'commonjs',
|
|
9
|
+
},
|
|
10
|
+
cwd: dirname(filename),
|
|
11
|
+
jsc: {
|
|
12
|
+
parser: {
|
|
13
|
+
syntax: 'typescript',
|
|
14
|
+
dynamicImport: true,
|
|
15
|
+
},
|
|
16
|
+
},
|
|
17
|
+
});
|
|
18
|
+
export function compile(sourcecode, filename, async = false) {
|
|
19
|
+
if (filename.endsWith('.d.ts')) {
|
|
20
|
+
return '';
|
|
21
|
+
}
|
|
22
|
+
if (async) {
|
|
23
|
+
return transform(sourcecode, getTsOptions(filename)).then(({ code }) => {
|
|
24
|
+
return code;
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
const { code } = transformSync(sourcecode, getTsOptions(filename));
|
|
28
|
+
return code;
|
|
29
|
+
}
|
|
30
|
+
export function registerRequireHook(hookOpts = {}) {
|
|
31
|
+
return addHook((code, filename) => compile(code, filename), {
|
|
32
|
+
exts: defaultExtensions,
|
|
33
|
+
ignoreNodeModules: true,
|
|
34
|
+
...hookOpts,
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
export const createRequire = (rootDir = null) => {
|
|
38
|
+
registerRequireHook();
|
|
39
|
+
return rootDir === null
|
|
40
|
+
? moduleCreateRequire(import.meta.url)
|
|
41
|
+
: moduleCreateRequire(`${rootDir}/:internal:`);
|
|
42
|
+
};
|
|
5
43
|
//# sourceMappingURL=create-require.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-require.js","sourceRoot":"","sources":["../../src/lib/create-require.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAE9D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,UAAkB,IAAI,EAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"create-require.js","sourceRoot":"","sources":["../../src/lib/create-require.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,aAAa,EAAW,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,aAAa,IAAI,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAE9D,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AAEhF,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAW,EAAE,CAAC,CAAC;IACnD,MAAM,EAAE;QACN,IAAI,EAAE,UAAU;KACjB;IACD,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAC;IACtB,GAAG,EAAE;QACH,MAAM,EAAE;YACN,MAAM,EAAE,YAAY;YACpB,aAAa,EAAE,IAAI;SACpB;KACF;CACF,CAAC,CAAC;AAUH,MAAM,UAAU,OAAO,CAAC,UAAkB,EAAE,QAAgB,EAAE,KAAK,GAAG,KAAK;IACzE,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC9B,OAAO,EAAE,CAAC;KACX;IAED,IAAI,KAAK,EAAE;QACT,OAAO,SAAS,CAAC,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YACrE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEnE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAAQ,GAAG,EAAE;IAC/C,OAAO,OAAO,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;QAC1D,IAAI,EAAE,iBAAiB;QACvB,iBAAiB,EAAE,IAAI;QACvB,GAAG,QAAQ;KACZ,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,UAAkB,IAAI,EAAe,EAAE;IACnE,mBAAmB,EAAE,CAAC;IAEtB,OAAO,OAAO,KAAK,IAAI;QACrB,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;QACtC,CAAC,CAAC,mBAAmB,CAAC,GAAG,OAAO,aAAa,CAAC,CAAC;AACnD,CAAC,CAAC"}
|
package/dist/lib/error.d.ts
CHANGED
|
File without changes
|
package/dist/lib/error.js
CHANGED
|
File without changes
|
package/dist/lib/error.js.map
CHANGED
|
File without changes
|
|
File without changes
|
package/dist/lib/file-manager.js
CHANGED
|
File without changes
|
|
File without changes
|
|
File without changes
|
package/dist/lib/hook-manager.js
CHANGED
|
File without changes
|
|
File without changes
|
package/dist/lib/object.d.ts
CHANGED
|
File without changes
|
package/dist/lib/object.js
CHANGED
|
File without changes
|
package/dist/lib/object.js.map
CHANGED
|
File without changes
|
package/dist/lib/observable.d.ts
CHANGED
|
File without changes
|
package/dist/lib/observable.js
CHANGED
|
File without changes
|
|
File without changes
|
package/dist/lib/stats.d.ts
CHANGED
|
File without changes
|
package/dist/lib/stats.js
CHANGED
|
File without changes
|
package/dist/lib/stats.js.map
CHANGED
|
File without changes
|
package/dist/lib/ui.d.ts
CHANGED
|
File without changes
|
package/dist/lib/ui.js
CHANGED
|
File without changes
|
package/dist/lib/ui.js.map
CHANGED
|
File without changes
|
package/dist/lib/utils.d.ts
CHANGED
|
File without changes
|
package/dist/lib/utils.js
CHANGED
|
File without changes
|
package/dist/lib/utils.js.map
CHANGED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
package/dist/mapper/map-entry.js
CHANGED
|
File without changes
|
|
File without changes
|
|
File without changes
|
package/dist/mapper/map-field.js
CHANGED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Document, Mark, Node as RichTextNode, TopLevelBlock } from '@contentful/rich-text-types';
|
|
2
2
|
import type { Config, RichTextData, RuntimeContext, TransformContext } from '../types.js';
|
|
3
|
-
export declare const mapRichTextDataNode: (node: RichTextData, transformContext: TransformContext, runtimeContext: RuntimeContext) =>
|
|
3
|
+
export declare const mapRichTextDataNode: (node: RichTextData, transformContext: TransformContext, runtimeContext: RuntimeContext) => Promise<import("../types.js").KeyValueMap<any>> | RichTextData;
|
|
4
4
|
export declare const mapRichTextContentNode: (nodes: TopLevelBlock[], transformContext: TransformContext, runtimeContext: RuntimeContext) => Promise<Record<string, any>[]>;
|
|
5
5
|
export declare const mapRichTextMarks: (nodes?: Mark[]) => string[];
|
|
6
6
|
export declare const mapRichTextNodes: (node: RichTextNode, transformContext: TransformContext, runtimeContext: RuntimeContext) => Promise<Record<string, any>>;
|
|
File without changes
|
|
File without changes
|
package/dist/server/index.d.ts
CHANGED
|
File without changes
|
package/dist/server/index.js
CHANGED
|
File without changes
|
package/dist/server/index.js.map
CHANGED
|
File without changes
|
package/dist/tasks/fetch.d.ts
CHANGED
|
File without changes
|
package/dist/tasks/fetch.js
CHANGED
|
File without changes
|
package/dist/tasks/fetch.js.map
CHANGED
|
File without changes
|
package/dist/tasks/localize.d.ts
CHANGED
|
File without changes
|
package/dist/tasks/localize.js
CHANGED
|
File without changes
|
|
File without changes
|
package/dist/tasks/remove.d.ts
CHANGED
|
File without changes
|
package/dist/tasks/remove.js
CHANGED
|
File without changes
|
package/dist/tasks/remove.js.map
CHANGED
|
File without changes
|
package/dist/tasks/setup.d.ts
CHANGED
|
File without changes
|
package/dist/tasks/setup.js
CHANGED
|
File without changes
|
package/dist/tasks/setup.js.map
CHANGED
|
File without changes
|
|
File without changes
|
package/dist/tasks/transform.js
CHANGED
|
File without changes
|
|
File without changes
|
package/dist/tasks/write.d.ts
CHANGED
|
File without changes
|
package/dist/tasks/write.js
CHANGED
|
File without changes
|
package/dist/tasks/write.js.map
CHANGED
|
File without changes
|
package/dist/types.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
import type { Options } from '@contentful/rich-text-html-renderer';
|
|
2
3
|
import type { Document } from '@contentful/rich-text-types';
|
|
3
4
|
import type { Observable, ReplaySubject } from 'rxjs';
|
|
@@ -219,3 +220,13 @@ export interface ErrorEntry {
|
|
|
219
220
|
locale: Locale;
|
|
220
221
|
missingFields: string[];
|
|
221
222
|
}
|
|
223
|
+
export declare type SandboxContext = {
|
|
224
|
+
module?: NodeModule;
|
|
225
|
+
exports: Record<string, any>;
|
|
226
|
+
process: {
|
|
227
|
+
env: NodeJS.ProcessEnv;
|
|
228
|
+
};
|
|
229
|
+
require: NodeRequire;
|
|
230
|
+
__dirname: string;
|
|
231
|
+
__filename: string;
|
|
232
|
+
};
|
package/dist/types.js
CHANGED
|
File without changes
|
package/dist/types.js.map
CHANGED
|
File without changes
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jungvonmatt/contentful-ssg",
|
|
3
|
-
"version": "1.11.
|
|
3
|
+
"version": "1.11.2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -73,8 +73,6 @@
|
|
|
73
73
|
"@contentful/rich-text-types": "^15.6.2",
|
|
74
74
|
"@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2",
|
|
75
75
|
"@iarna/toml": "^2.2.5",
|
|
76
|
-
"@swc-node/register": "^1.4.0",
|
|
77
|
-
"async-exit-hook": "^2.0.1",
|
|
78
76
|
"chalk": "^4.1.2",
|
|
79
77
|
"commander": "^8.3.0",
|
|
80
78
|
"contentful": "^9.1.4",
|
|
@@ -84,6 +82,7 @@
|
|
|
84
82
|
"dotenv": "^10.0.0",
|
|
85
83
|
"dotenv-expand": "^5.1.0",
|
|
86
84
|
"esbuild": "^0.13.13",
|
|
85
|
+
"exit-hook": "^3.2.0",
|
|
87
86
|
"express": "^4.18.1",
|
|
88
87
|
"find-cache-dir": "^3.3.2",
|
|
89
88
|
"find-up": "^6.2.0",
|
|
@@ -110,7 +109,7 @@
|
|
|
110
109
|
},
|
|
111
110
|
"devDependencies": {
|
|
112
111
|
"@swc/core": "^1.2.207",
|
|
113
|
-
"@swc/jest": "^0.2.
|
|
112
|
+
"@swc/jest": "^0.2.24",
|
|
114
113
|
"@types/dlv": "^1.1.2",
|
|
115
114
|
"@types/express": "^4.17.13",
|
|
116
115
|
"@types/fs-extra": "^9.0.13",
|
|
@@ -145,5 +144,5 @@
|
|
|
145
144
|
"module": "es2020"
|
|
146
145
|
}
|
|
147
146
|
},
|
|
148
|
-
"gitHead": "
|
|
147
|
+
"gitHead": "8a7914920a6c1d50e0f4971c2a746ea7043e73a6"
|
|
149
148
|
}
|
package/src/cli.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
3
3
|
|
|
4
4
|
/* eslint-env node */
|
|
5
|
-
import
|
|
5
|
+
import { asyncExitHook, gracefulExit } from 'exit-hook';
|
|
6
6
|
import chalk from 'chalk';
|
|
7
7
|
import { Command } from 'commander';
|
|
8
8
|
import { QueryOptions } from 'contentful-management/types.js';
|
|
@@ -60,14 +60,16 @@ const errorHandler = (error: CommandError, silence: boolean) => {
|
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
62
|
|
|
63
|
-
|
|
63
|
+
gracefulExit(1);
|
|
64
64
|
};
|
|
65
65
|
|
|
66
66
|
const actionRunner =
|
|
67
67
|
(fn, log = true) =>
|
|
68
68
|
(...args) =>
|
|
69
69
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
|
|
70
|
-
fn(...args).catch((error) =>
|
|
70
|
+
fn(...args).catch((error) => {
|
|
71
|
+
errorHandler(error, !log);
|
|
72
|
+
});
|
|
71
73
|
const program = new Command();
|
|
72
74
|
program
|
|
73
75
|
.command('init')
|
|
@@ -236,18 +238,21 @@ program
|
|
|
236
238
|
}
|
|
237
239
|
|
|
238
240
|
// Handle cache on exit
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
241
|
+
asyncExitHook(
|
|
242
|
+
async () => {
|
|
243
|
+
try {
|
|
244
|
+
await Promise.all([
|
|
245
|
+
!useCache && cache.reset(),
|
|
246
|
+
useCache && prev && cache.setSyncState(prev),
|
|
247
|
+
]);
|
|
248
|
+
} catch (error: unknown) {
|
|
249
|
+
console.error('\nError:', error);
|
|
250
|
+
}
|
|
251
|
+
},
|
|
252
|
+
{
|
|
253
|
+
minimumWait: 2000,
|
|
249
254
|
}
|
|
250
|
-
|
|
255
|
+
);
|
|
251
256
|
|
|
252
257
|
if (cmd.poll) {
|
|
253
258
|
const poll = () => {
|
|
@@ -306,18 +311,23 @@ program
|
|
|
306
311
|
const webhook = await addWatchWebhook(verified as ContentfulConfig, url);
|
|
307
312
|
|
|
308
313
|
// Remove webhook & stop server on exit
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
314
|
+
asyncExitHook(
|
|
315
|
+
async () => {
|
|
316
|
+
try {
|
|
317
|
+
const results = await Promise.allSettled([webhook.delete(), stopServer()]);
|
|
318
|
+
results.forEach((result) => {
|
|
319
|
+
if (result.status === 'rejected') {
|
|
320
|
+
console.error('\nError:', result?.reason?.message ?? result?.reason);
|
|
321
|
+
}
|
|
322
|
+
});
|
|
323
|
+
} catch (error: unknown) {
|
|
324
|
+
console.error('\nError:', error);
|
|
325
|
+
}
|
|
326
|
+
},
|
|
327
|
+
{
|
|
328
|
+
minimumWait: 2000,
|
|
319
329
|
}
|
|
320
|
-
|
|
330
|
+
);
|
|
321
331
|
}
|
|
322
332
|
})
|
|
323
333
|
);
|
package/src/index.test.ts
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import { run, cleanupPrevData } from './index.js';
|
|
3
|
+
import { gracefulExit } from 'exit-hook';
|
|
3
4
|
import { write } from './tasks/write.js';
|
|
4
5
|
import { RunResult, RuntimeContext } from './types.js';
|
|
5
6
|
import { getContent } from './__test__/mock.js';
|
|
6
7
|
|
|
8
|
+
const mockedGracefulExit = <jest.Mock<typeof gracefulExit>>gracefulExit;
|
|
9
|
+
|
|
7
10
|
jest.mock('./lib/contentful.js', () => {
|
|
8
11
|
const originalModule = jest.requireActual('./lib/contentful.js');
|
|
9
12
|
return {
|
|
@@ -28,6 +31,10 @@ jest.mock('./lib/file-manager.js', () => ({
|
|
|
28
31
|
},
|
|
29
32
|
}));
|
|
30
33
|
|
|
34
|
+
jest.mock('exit-hook', () => ({
|
|
35
|
+
gracefulExit: jest.fn(),
|
|
36
|
+
}));
|
|
37
|
+
|
|
31
38
|
describe('Run', () => {
|
|
32
39
|
test('main loop', async () => {
|
|
33
40
|
console.log = jest.fn();
|
|
@@ -112,7 +119,8 @@ describe('Run', () => {
|
|
|
112
119
|
|
|
113
120
|
test('fails on transform exception', async () => {
|
|
114
121
|
console.log = jest.fn();
|
|
115
|
-
|
|
122
|
+
|
|
123
|
+
mockedGracefulExit.mockImplementation((number) => {
|
|
116
124
|
throw new Error('process.exit: ' + number);
|
|
117
125
|
});
|
|
118
126
|
|
|
@@ -125,13 +133,14 @@ describe('Run', () => {
|
|
|
125
133
|
});
|
|
126
134
|
}).rejects.toThrowError();
|
|
127
135
|
|
|
128
|
-
expect(
|
|
129
|
-
|
|
136
|
+
expect(mockedGracefulExit).toHaveBeenCalledWith(1);
|
|
137
|
+
mockedGracefulExit.mockRestore();
|
|
130
138
|
});
|
|
131
139
|
|
|
132
140
|
test('does not fail on transform exception with ignoreErrors option', async () => {
|
|
133
141
|
console.log = jest.fn();
|
|
134
|
-
|
|
142
|
+
|
|
143
|
+
mockedGracefulExit.mockImplementation((number) => {
|
|
135
144
|
throw new Error('process.exit: ' + number);
|
|
136
145
|
});
|
|
137
146
|
|
|
@@ -143,13 +152,13 @@ describe('Run', () => {
|
|
|
143
152
|
},
|
|
144
153
|
});
|
|
145
154
|
|
|
146
|
-
expect(
|
|
147
|
-
|
|
155
|
+
expect(mockedGracefulExit).toBeCalledTimes(0);
|
|
156
|
+
mockedGracefulExit.mockRestore();
|
|
148
157
|
});
|
|
149
158
|
|
|
150
159
|
test('does not fail on transform exception in sync mode', async () => {
|
|
151
160
|
console.log = jest.fn();
|
|
152
|
-
|
|
161
|
+
mockedGracefulExit.mockImplementation((number) => {
|
|
153
162
|
throw new Error('process.exit: ' + number);
|
|
154
163
|
});
|
|
155
164
|
|
|
@@ -161,8 +170,8 @@ describe('Run', () => {
|
|
|
161
170
|
},
|
|
162
171
|
});
|
|
163
172
|
|
|
164
|
-
expect(
|
|
165
|
-
|
|
173
|
+
expect(mockedGracefulExit).toBeCalledTimes(0);
|
|
174
|
+
mockedGracefulExit.mockRestore();
|
|
166
175
|
});
|
|
167
176
|
|
|
168
177
|
test('cleanupPrevData', async () => {
|
package/src/index.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import Listr from 'listr';
|
|
3
|
+
import { gracefulExit } from 'exit-hook';
|
|
3
4
|
import { ReplaySubject } from 'rxjs';
|
|
4
5
|
import { initializeCache } from './lib/cf-cache.js';
|
|
5
6
|
import { getContentId, getContentTypeId } from './lib/contentful.js';
|
|
@@ -319,7 +320,7 @@ export const run = async (
|
|
|
319
320
|
console.log('\n -------------------------------------------');
|
|
320
321
|
|
|
321
322
|
if (!ctx.config.sync && ctx.stats.errors?.length && !config.ignoreErrors) {
|
|
322
|
-
|
|
323
|
+
gracefulExit(1);
|
|
323
324
|
}
|
|
324
325
|
|
|
325
326
|
return prev;
|
package/src/lib/config.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import
|
|
1
|
+
import vm from 'vm';
|
|
2
2
|
import chalk from 'chalk';
|
|
3
|
+
import { transformSync, Options } from '@swc/core';
|
|
4
|
+
import { gracefulExit } from 'exit-hook';
|
|
3
5
|
import { cosmiconfig, Loader } from 'cosmiconfig';
|
|
4
6
|
import type { CosmiconfigResult } from 'cosmiconfig/dist/types';
|
|
5
7
|
import mergeOptionsModule from 'merge-options';
|
|
@@ -13,20 +15,83 @@ import type {
|
|
|
13
15
|
KeyValueMap,
|
|
14
16
|
PluginInfo,
|
|
15
17
|
PluginModule,
|
|
18
|
+
SandboxContext,
|
|
16
19
|
} from '../types.js';
|
|
17
20
|
import { reduceAsync } from './array.js';
|
|
18
21
|
import { createRequire } from './create-require.js';
|
|
19
22
|
import { isObject, removeEmpty } from './object.js';
|
|
20
23
|
|
|
21
|
-
const
|
|
22
|
-
|
|
24
|
+
const getContext = (filename: string): vm.Context => {
|
|
25
|
+
const module: NodeModule = {
|
|
26
|
+
exports: {},
|
|
27
|
+
isPreloading: false,
|
|
28
|
+
require: createRequire(dirname(filename)),
|
|
29
|
+
id: '',
|
|
30
|
+
filename,
|
|
31
|
+
loaded: false,
|
|
32
|
+
parent: undefined,
|
|
33
|
+
children: [],
|
|
34
|
+
path: dirname(filename),
|
|
35
|
+
paths: [dirname(filename)],
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
const sandbox: SandboxContext = {
|
|
39
|
+
module,
|
|
40
|
+
exports: {},
|
|
41
|
+
process: { env: process.env },
|
|
42
|
+
require: module.require,
|
|
43
|
+
__dirname: dirname(filename),
|
|
44
|
+
__filename: filename,
|
|
45
|
+
};
|
|
46
|
+
vm.createContext(sandbox);
|
|
23
47
|
|
|
24
|
-
|
|
25
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
|
|
26
|
-
const configModule = require(filePath);
|
|
27
|
-
return configModule.default || configModule;
|
|
48
|
+
return sandbox;
|
|
28
49
|
};
|
|
29
50
|
|
|
51
|
+
const getLoader =
|
|
52
|
+
(syntax: Options['jsc']['parser']['syntax']) => (filename: string, content: string) => {
|
|
53
|
+
const context = getContext(filename);
|
|
54
|
+
const script = transformSync(content, {
|
|
55
|
+
isModule: /\s(export|import)\s/.test(content),
|
|
56
|
+
module: {
|
|
57
|
+
type: 'commonjs',
|
|
58
|
+
},
|
|
59
|
+
cwd: dirname(filename),
|
|
60
|
+
jsc: {
|
|
61
|
+
parser: {
|
|
62
|
+
syntax,
|
|
63
|
+
dynamicImport: true,
|
|
64
|
+
},
|
|
65
|
+
},
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
const vmScript = new vm.Script(script.code);
|
|
69
|
+
|
|
70
|
+
try {
|
|
71
|
+
vmScript.runInContext(context, { filename, timeout: 10000 });
|
|
72
|
+
} catch (error: unknown) {
|
|
73
|
+
console.log(error);
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
// Handle module (even if the transpiled code should be commonjs exports)
|
|
77
|
+
if (Object.keys(context.module.exports).length > 0) {
|
|
78
|
+
const result = (context.module.exports.default || context.module.exports) as Config;
|
|
79
|
+
return { ...result };
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
// Handle commonjs export
|
|
83
|
+
if (Object.keys(context.exports).length > 0) {
|
|
84
|
+
const result = (context.exports.default || context.exports) as Config;
|
|
85
|
+
|
|
86
|
+
return { ...result };
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
return {};
|
|
90
|
+
};
|
|
91
|
+
|
|
92
|
+
const typescriptLoader: Loader = getLoader('typescript');
|
|
93
|
+
const ecmascriptLoader: Loader = getLoader('ecmascript');
|
|
94
|
+
|
|
30
95
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
31
96
|
const mergeOptions = mergeOptionsModule.bind({ ignoreUndefined: true });
|
|
32
97
|
|
|
@@ -82,7 +147,7 @@ const resolvePlugin = async (
|
|
|
82
147
|
);
|
|
83
148
|
}
|
|
84
149
|
|
|
85
|
-
|
|
150
|
+
gracefulExit(1);
|
|
86
151
|
}
|
|
87
152
|
};
|
|
88
153
|
|
|
@@ -97,9 +162,14 @@ const loadConfig = async (moduleName: string): Promise<CosmiconfigResult> => {
|
|
|
97
162
|
`.${moduleName}rc.js`,
|
|
98
163
|
`${moduleName}.config.ts`,
|
|
99
164
|
`${moduleName}.config.js`,
|
|
165
|
+
`${moduleName}.config.cjs`,
|
|
166
|
+
`${moduleName}.config.mjs`,
|
|
100
167
|
],
|
|
101
168
|
loaders: {
|
|
102
169
|
'.ts': typescriptLoader,
|
|
170
|
+
'.js': ecmascriptLoader,
|
|
171
|
+
'.cjs': ecmascriptLoader,
|
|
172
|
+
'.mjs': ecmascriptLoader,
|
|
103
173
|
},
|
|
104
174
|
});
|
|
105
175
|
|
|
@@ -167,6 +237,7 @@ export const getConfig = async (args: Partial<Config> = {}): Promise<Config> =>
|
|
|
167
237
|
try {
|
|
168
238
|
// Get configuration from contentful-ssg rc file
|
|
169
239
|
const configFile = await loadConfig('contentful-ssg');
|
|
240
|
+
|
|
170
241
|
if (configFile && !configFile.isEmpty) {
|
|
171
242
|
configFileOptions = configFile.config as Partial<Config>;
|
|
172
243
|
args.rootDir = dirname(configFile.filepath);
|
|
@@ -1,6 +1,59 @@
|
|
|
1
|
+
import { dirname } from 'path';
|
|
2
|
+
import { transform, transformSync, Options } from '@swc/core';
|
|
3
|
+
import { addHook } from 'pirates';
|
|
1
4
|
import { createRequire as moduleCreateRequire } from 'module';
|
|
2
5
|
|
|
3
|
-
|
|
4
|
-
|
|
6
|
+
const defaultExtensions = ['.js', '.jsx', '.es6', '.es', '.mjs', '.ts', '.tsx'];
|
|
7
|
+
|
|
8
|
+
const getTsOptions = (filename: string): Options => ({
|
|
9
|
+
module: {
|
|
10
|
+
type: 'commonjs',
|
|
11
|
+
},
|
|
12
|
+
cwd: dirname(filename),
|
|
13
|
+
jsc: {
|
|
14
|
+
parser: {
|
|
15
|
+
syntax: 'typescript',
|
|
16
|
+
dynamicImport: true,
|
|
17
|
+
},
|
|
18
|
+
},
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
export function compile(sourcecode: string, filename: string, async?: false): string;
|
|
22
|
+
|
|
23
|
+
export function compile(
|
|
24
|
+
sourcecode: string,
|
|
25
|
+
filename: string,
|
|
26
|
+
async?: boolean
|
|
27
|
+
): string | Promise<string>;
|
|
28
|
+
|
|
29
|
+
export function compile(sourcecode: string, filename: string, async = false) {
|
|
30
|
+
if (filename.endsWith('.d.ts')) {
|
|
31
|
+
return '';
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
if (async) {
|
|
35
|
+
return transform(sourcecode, getTsOptions(filename)).then(({ code }) => {
|
|
36
|
+
return code;
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
const { code } = transformSync(sourcecode, getTsOptions(filename));
|
|
41
|
+
|
|
42
|
+
return code;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
export function registerRequireHook(hookOpts = {}) {
|
|
46
|
+
return addHook((code, filename) => compile(code, filename), {
|
|
47
|
+
exts: defaultExtensions,
|
|
48
|
+
ignoreNodeModules: true,
|
|
49
|
+
...hookOpts,
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
export const createRequire = (rootDir: string = null): NodeRequire => {
|
|
54
|
+
registerRequireHook();
|
|
55
|
+
|
|
56
|
+
return rootDir === null
|
|
5
57
|
? moduleCreateRequire(import.meta.url)
|
|
6
58
|
: moduleCreateRequire(`${rootDir}/:internal:`);
|
|
59
|
+
};
|
package/src/types.ts
CHANGED
|
@@ -309,3 +309,12 @@ export interface ErrorEntry {
|
|
|
309
309
|
locale: Locale;
|
|
310
310
|
missingFields: string[];
|
|
311
311
|
}
|
|
312
|
+
|
|
313
|
+
export type SandboxContext = {
|
|
314
|
+
module?: NodeModule;
|
|
315
|
+
exports: Record<string, any>;
|
|
316
|
+
process: { env: NodeJS.ProcessEnv };
|
|
317
|
+
require: NodeRequire;
|
|
318
|
+
__dirname: string;
|
|
319
|
+
__filename: string;
|
|
320
|
+
};
|