Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix typing issues with latest Components.js generator

Browse Source
This commit is contained in:
Joachim Van Herwegen 2022-02-08 11:03:14 +01:00
parent 58bc42994c
commit 0e32d9ad9b
6 changed files with 1047 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.componentsignore
View File

@ -3,12 +3,25 @@
"BaseHttpError", "BaseHttpError",
"BasicConditions", "BasicConditions",
"BasicRepresentation", "BasicRepresentation",
"CredentialSet",
"Dict",
"Error", "Error",
"EventEmitter", "EventEmitter",
"HttpErrorOptions", "HttpErrorOptions",
"HttpResponse",
"NodeJS.Dict",
"Permission", "Permission",
"PermissionSet",
"Promise",
"Readonly",
"RegExp",
"Set",
"Settings",
"Template", "Template",
"TemplateEngine", "TemplateEngine",
"ValuePreferencesArg", "ValuePreferencesArg",
"WinstonLogger" "VariableBindings",
"UnionHandler",
"WinstonLogger",
"YargsArgOptions"
] ]

1111
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@ -40,7 +40,7 @@
"homepage": "https://github.com/CommunitySolidServer/CommunitySolidServer#readme", "homepage": "https://github.com/CommunitySolidServer/CommunitySolidServer#readme",
"scripts": { "scripts": {
"build": "npm run build:ts && npm run build:components", "build": "npm run build:ts && npm run build:components",
"build:components": "componentsjs-generator -s src -c dist/components -r scs -i .componentsignore --typeScopedContexts", "build:components": "componentsjs-generator -s src -c dist/components -r scs -i .componentsignore",
"build:ts": "tsc", "build:ts": "tsc",
"docker": "npm run docker:setup && npm run docker:start", "docker": "npm run docker:setup && npm run docker:start",
"docker:clean": "./test/docker/docker-clean.sh", "docker:clean": "./test/docker/docker-clean.sh",
@ -99,7 +99,7 @@
"arrayify-stream": "^2.0.0", "arrayify-stream": "^2.0.0",
"async-lock": "^1.3.0", "async-lock": "^1.3.0",
"bcrypt": "^5.0.1", "bcrypt": "^5.0.1",
"componentsjs": "^4.5.0", "componentsjs": "^5.0.1",
"cors": "^2.8.5", "cors": "^2.8.5",
"cross-fetch": "^3.1.5", "cross-fetch": "^3.1.5",
"ejs": "^3.1.6", "ejs": "^3.1.6",
@ -144,7 +144,7 @@
"@typescript-eslint/eslint-plugin": "^5.3.0", "@typescript-eslint/eslint-plugin": "^5.3.0",
"@typescript-eslint/parser": "^5.3.0", "@typescript-eslint/parser": "^5.3.0",
"cheerio": "^1.0.0-rc.10", "cheerio": "^1.0.0-rc.10",
"componentsjs-generator": "^2.6.1", "componentsjs-generator": "^3.0.2",
"eslint": "^8.8.0", "eslint": "^8.8.0",
"eslint-config-es": "4.1.0", "eslint-config-es": "4.1.0",
"eslint-import-resolver-typescript": "^2.5.0", "eslint-import-resolver-typescript": "^2.5.0",

1
src/init/AppRunner.ts
View File

@ -120,6 +120,7 @@ export class AppRunner {
mainModulePath: resolveAssetPath(params.mainModulePath), mainModulePath: resolveAssetPath(params.mainModulePath),
dumpErrorState: true, dumpErrorState: true,
logLevel: params.loggingLevel, logLevel: params.loggingLevel,
typeChecking: false,
}; };
const config = resolveAssetPath(params.config); const config = resolveAssetPath(params.config);

1
src/pods/generate/BaseComponentsJsFactory.ts
View File

@ -17,6 +17,7 @@ export class BaseComponentsJsFactory implements ComponentsJsFactory {
mainModulePath: joinFilePath(__dirname, relativeModulePath), mainModulePath: joinFilePath(__dirname, relativeModulePath),
logLevel: logLevel as LogLevel, logLevel: logLevel as LogLevel,
dumpErrorState: false, dumpErrorState: false,
typeChecking: false,
}; };
} }

7
test/integration/Config.ts
View File

@ -12,7 +12,12 @@ export async function instantiateFromConfig(componentUrl: string, configPaths: s
variables?: Record<string, any>): Promise<any> { variables?: Record<string, any>): Promise<any> {
// Initialize the Components.js loader // Initialize the Components.js loader
const mainModulePath = joinFilePath(__dirname, '../../'); const mainModulePath = joinFilePath(__dirname, '../../');
const manager = await ComponentsManager.build({ mainModulePath, logLevel: 'error', moduleState: cachedModuleState }); const manager = await ComponentsManager.build({
mainModulePath,
logLevel: 'error',
moduleState: cachedModuleState,
typeChecking: false,
});
cachedModuleState = manager.moduleState; cachedModuleState = manager.moduleState;
if (!Array.isArray(configPaths)) { if (!Array.isArray(configPaths)) {