From fcef1f4d273f8f792ec70ac75c1ea77fc9b03cd1 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Mon, 15 Aug 2022 06:22:22 +0200 Subject: Fix missing stuff --- fosscord-server.code-workspace | 4 -- package.json | 1 - plugins/example-plugin/build.sh | 5 -- plugins/example-plugin/index.ts | 7 --- plugins/example-plugin/plugin.json | 9 ---- plugins/example-plugin/tsconfig.json | 85 -------------------------------- scripts/build.js | 79 ++++++++++++++--------------- scripts/utils.js | 1 - src/plugins/example-plugin/build.sh | 5 ++ src/plugins/example-plugin/index.ts | 7 +++ src/plugins/example-plugin/plugin.json | 9 ++++ src/plugins/example-plugin/tsconfig.json | 85 ++++++++++++++++++++++++++++++++ 12 files changed, 142 insertions(+), 155 deletions(-) delete mode 100755 plugins/example-plugin/build.sh delete mode 100644 plugins/example-plugin/index.ts delete mode 100644 plugins/example-plugin/plugin.json delete mode 100644 plugins/example-plugin/tsconfig.json create mode 100755 src/plugins/example-plugin/build.sh create mode 100644 src/plugins/example-plugin/index.ts create mode 100644 src/plugins/example-plugin/plugin.json create mode 100644 src/plugins/example-plugin/tsconfig.json diff --git a/fosscord-server.code-workspace b/fosscord-server.code-workspace index 1d6774ad..f2df1e9e 100644 --- a/fosscord-server.code-workspace +++ b/fosscord-server.code-workspace @@ -15,10 +15,6 @@ ], "settings": { "files.exclude": { - ".gitignore": true, - ".npmignore": true, - ".prettierrc": true, - ".vscode": true, "*.ansi": true, } } diff --git a/package.json b/package.json index 59c66811..f1242d2b 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "setup": "npm install --omit optional && ts-patch install -s && patch-package && npm run build", "depclean": "node scripts/depclean.js", "depcheck": "node scripts/depcheck.js", - "syncdeps": "node scripts/install.js", "build": "node scripts/build.js", "postinstall": "patch-package", "genschemas": "node scripts/generate_schemas.js", diff --git a/plugins/example-plugin/build.sh b/plugins/example-plugin/build.sh deleted file mode 100755 index 1b36607b..00000000 --- a/plugins/example-plugin/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#rm -rf dist/ -#mkdir dist -rm -rfv *.js *.js.map -ln -s ../../bundle/node_modules node_modules -tsc -p . diff --git a/plugins/example-plugin/index.ts b/plugins/example-plugin/index.ts deleted file mode 100644 index ec1ed7b5..00000000 --- a/plugins/example-plugin/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Plugin } from "@fosscord/util" - -export default class TestPlugin extends Plugin { - onPluginLoaded(): void { - console.log("Hello from test plugin! IT WORKS!!!!!!!"); - } -} \ No newline at end of file diff --git a/plugins/example-plugin/plugin.json b/plugins/example-plugin/plugin.json deleted file mode 100644 index 980edbdf..00000000 --- a/plugins/example-plugin/plugin.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "id": "example-plugin", - "name": "Fosscord example plugin", - "authors": [ - "The Arcane Brony" - ], - "repository": "https://github.com/fosscord/fosscord-server", - "license": "" -} diff --git a/plugins/example-plugin/tsconfig.json b/plugins/example-plugin/tsconfig.json deleted file mode 100644 index 7efe9434..00000000 --- a/plugins/example-plugin/tsconfig.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "include": ["./**/*.ts"], - "exclude": [], - "compilerOptions": { - - /* Basic Options */ - "incremental": false /* Enable incremental compilation */, - "target": "ESNext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */, - "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */, - "lib": [ - "ESNext" - ] /* Specify library files to be included in the compilation. */, - "allowJs": true /* Allow javascript files to be compiled. */, - "checkJs": true /* Report errors in .js files. */, - // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ - "declaration": false /* Generates corresponding '.d.ts' file. */, - "declarationMap": false /* Generates a sourcemap for each corresponding '.d.ts' file. */, - "sourceMap": true /* Generates corresponding '.map' file. */, - // "outFile": "./", /* Concatenate and emit output to single file. */ - "outDir": "./dist/" /* Redirect output structure to the directory. */, - "rootDir": "./" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */, - // "composite": true, /* Enable project compilation */ - // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ - // "removeComments": true, /* Do not emit comments to output. */ - // "noEmit": true, /* Do not emit outputs. */ - // "importHelpers": true, /* Import emit helpers from 'tslib'. */ - // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ - // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ - - /* Strict Type-Checking Options */ - "strict": true /* Enable all strict type-checking options. */, - "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */, - "strictNullChecks": true /* Enable strict null checks. */, - // "strictFunctionTypes": true, /* Enable strict checking of function types. */ - // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ - "strictPropertyInitialization": false /* Enable strict checking of property initialization in classes. */, - // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ - "alwaysStrict": true /* Parse in strict mode and emit "use strict" for each source file. */, - - /* Additional Checks */ - // "noUnusedLocals": true, /* Report errors on unused locals. */ - // "noUnusedParameters": true, /* Report errors on unused parameters. */ - // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ - // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ - - /* Module Resolution Options */ - "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ - // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ - // "typeRoots": [], /* List of folders to include type definitions from. */ - "types": [ - "node" - ] /* Type declaration files to be included in compilation. */, - // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ - "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */, - // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - - /* Source Map Options */ - // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ - // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ - - /* Experimental Options */ - // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ - // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ - - /* Advanced Options */ - "skipLibCheck": true /* Skip type checking of declaration files. */, - "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "resolveJsonModule": true, - "baseUrl": "../../bundle/dist/", - "paths": { - "@fosscord/api": ["../../api/src/index"], - "@fosscord/gateway": ["../../gateway/src/index"], - "@fosscord/cdn": ["../../cdn/src/index"], - "@fosscord/util": ["../../util/src/index"] - }, - "plugins": [{ "transform": "@ovos-media/ts-transform-paths" }], - "noEmitHelpers": true, - "importHelpers": true - } -} diff --git a/scripts/build.js b/scripts/build.js index 49353c87..f5ec6bac 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -8,7 +8,6 @@ if(argv.includes("help")) { console.log(`Fosscord build script help: Arguments: clean Cleans up previous builds - copyonly Only copy source files, don't build (useful for updating assets) verbose Enable verbose logging logerrors Log build errors to console pretty-errors Pretty-print build errors @@ -18,7 +17,6 @@ Arguments: let steps = 3, i = 0; if (argv.includes("clean")) steps++; -if (argv.includes("copyonly")) steps--; const verbose = argv.includes("verbose") || argv.includes("v"); const logerr = argv.includes("logerrors"); @@ -29,13 +27,11 @@ if(silent) console.error = console.log = function(){} if (argv.includes("clean")) { console.log(`[${++i}/${steps}] Cleaning...`); - parts.forEach((a) => { - let d = "../" + a + "/dist"; - if (fs.existsSync(d)) { - fs.rmSync(d, { recursive: true }); - if (verbose) console.log(`Deleted ${d}!`); - } - }); + let d = "dist"; + if (fs.existsSync(d)) { + fs.rmSync(d, { recursive: true }); + if (verbose) console.log(`Deleted ${d}!`); + } } console.log(`[${++i}/${steps}] Checking if dependencies were installed correctly...`); @@ -43,42 +39,39 @@ console.log(`[${++i}/${steps}] Checking if dependencies were installed correctly if(!fs.existsSync(path.join(__dirname, "..", "node_modules", "exif-be-gone", "index.js"))) execIn("npm run build", path.join(__dirname, "..", "node_modules", "exif-be-gone")); +console.log(`[${++i}/${steps}] Compiling src files ...`); -if (!argv.includes("copyonly")) { - console.log(`[${++i}/${steps}] Compiling src files ...`); +let buildFlags = '' +if(pretty) buildFlags += '--pretty ' - let buildFlags = '' - if(pretty) buildFlags += '--pretty ' - - try { - execSync( - 'node "' + - path.join(__dirname, "..", "node_modules", "typescript", "lib", "tsc.js") + - '" -p "' + - path.join(__dirname, "..") + - '" ' + buildFlags, - { - cwd: path.join(__dirname, ".."), - shell: true, - env: process.env, - encoding: "utf8" - } - ) - } catch (error) { - if(verbose || logerr) { - error.stdout.split(/\r?\n/).forEach((line) => { - let _line = line.replace('dist/','',1); - if(!pretty && _line.includes('.ts(')) { - //reformat file path for easy jumping - _line = _line.replace('(',':',1).replace(',',':',1).replace(')','',1) - } - console.error(_line); - }) - } - console.error(`Build failed! Please check build.log for info!`); - if(!silent){ - if(pretty) fs.writeFileSync("build.log.ansi", error.stdout); - fs.writeFileSync("build.log", error.stdout.replaceAll(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '')); +try { + execSync( + 'node "' + + path.join(__dirname, "..", "node_modules", "typescript", "lib", "tsc.js") + + '" -p "' + + path.join(__dirname, "..") + + '" ' + buildFlags, + { + cwd: path.join(__dirname, ".."), + shell: true, + env: process.env, + encoding: "utf8" } + ) +} catch (error) { + if(verbose || logerr) { + error.stdout.split(/\r?\n/).forEach((line) => { + let _line = line.replace('dist/','',1); + if(!pretty && _line.includes('.ts(')) { + //reformat file path for easy jumping + _line = _line.replace('(',':',1).replace(',',':',1).replace(')','',1) + } + console.error(_line); + }) + } + console.error(`Build failed! Please check build.log for info!`); + if(!silent){ + if(pretty) fs.writeFileSync("build.log.ansi", error.stdout); + fs.writeFileSync("build.log", error.stdout.replaceAll(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '')); } } \ No newline at end of file diff --git a/scripts/utils.js b/scripts/utils.js index ca41bcf2..84aaeed6 100644 --- a/scripts/utils.js +++ b/scripts/utils.js @@ -46,7 +46,6 @@ function getLines(output) { module.exports = { //consts - parts, //functions copyRecursiveSync, execIn, getLines }; diff --git a/src/plugins/example-plugin/build.sh b/src/plugins/example-plugin/build.sh new file mode 100755 index 00000000..1b36607b --- /dev/null +++ b/src/plugins/example-plugin/build.sh @@ -0,0 +1,5 @@ +#rm -rf dist/ +#mkdir dist +rm -rfv *.js *.js.map +ln -s ../../bundle/node_modules node_modules +tsc -p . diff --git a/src/plugins/example-plugin/index.ts b/src/plugins/example-plugin/index.ts new file mode 100644 index 00000000..d5db6563 --- /dev/null +++ b/src/plugins/example-plugin/index.ts @@ -0,0 +1,7 @@ +/*import { Plugin } from "@fosscord/util" + +export default class TestPlugin extends Plugin { + onPluginLoaded(): void { + console.log("Hello from test plugin! IT WORKS!!!!!!!"); + } +}*/ \ No newline at end of file diff --git a/src/plugins/example-plugin/plugin.json b/src/plugins/example-plugin/plugin.json new file mode 100644 index 00000000..980edbdf --- /dev/null +++ b/src/plugins/example-plugin/plugin.json @@ -0,0 +1,9 @@ +{ + "id": "example-plugin", + "name": "Fosscord example plugin", + "authors": [ + "The Arcane Brony" + ], + "repository": "https://github.com/fosscord/fosscord-server", + "license": "" +} diff --git a/src/plugins/example-plugin/tsconfig.json b/src/plugins/example-plugin/tsconfig.json new file mode 100644 index 00000000..7efe9434 --- /dev/null +++ b/src/plugins/example-plugin/tsconfig.json @@ -0,0 +1,85 @@ +{ + "include": ["./**/*.ts"], + "exclude": [], + "compilerOptions": { + + /* Basic Options */ + "incremental": false /* Enable incremental compilation */, + "target": "ESNext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */, + "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */, + "lib": [ + "ESNext" + ] /* Specify library files to be included in the compilation. */, + "allowJs": true /* Allow javascript files to be compiled. */, + "checkJs": true /* Report errors in .js files. */, + // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ + "declaration": false /* Generates corresponding '.d.ts' file. */, + "declarationMap": false /* Generates a sourcemap for each corresponding '.d.ts' file. */, + "sourceMap": true /* Generates corresponding '.map' file. */, + // "outFile": "./", /* Concatenate and emit output to single file. */ + "outDir": "./dist/" /* Redirect output structure to the directory. */, + "rootDir": "./" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */, + // "composite": true, /* Enable project compilation */ + // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ + // "removeComments": true, /* Do not emit comments to output. */ + // "noEmit": true, /* Do not emit outputs. */ + // "importHelpers": true, /* Import emit helpers from 'tslib'. */ + // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ + // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ + + /* Strict Type-Checking Options */ + "strict": true /* Enable all strict type-checking options. */, + "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */, + "strictNullChecks": true /* Enable strict null checks. */, + // "strictFunctionTypes": true, /* Enable strict checking of function types. */ + // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ + "strictPropertyInitialization": false /* Enable strict checking of property initialization in classes. */, + // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ + "alwaysStrict": true /* Parse in strict mode and emit "use strict" for each source file. */, + + /* Additional Checks */ + // "noUnusedLocals": true, /* Report errors on unused locals. */ + // "noUnusedParameters": true, /* Report errors on unused parameters. */ + // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + + /* Module Resolution Options */ + "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ + // "typeRoots": [], /* List of folders to include type definitions from. */ + "types": [ + "node" + ] /* Type declaration files to be included in compilation. */, + // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */, + // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + + /* Source Map Options */ + // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ + // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ + + /* Experimental Options */ + // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ + // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + + /* Advanced Options */ + "skipLibCheck": true /* Skip type checking of declaration files. */, + "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "resolveJsonModule": true, + "baseUrl": "../../bundle/dist/", + "paths": { + "@fosscord/api": ["../../api/src/index"], + "@fosscord/gateway": ["../../gateway/src/index"], + "@fosscord/cdn": ["../../cdn/src/index"], + "@fosscord/util": ["../../util/src/index"] + }, + "plugins": [{ "transform": "@ovos-media/ts-transform-paths" }], + "noEmitHelpers": true, + "importHelpers": true + } +} -- cgit 1.5.1