diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 38edf8e94..2b66e4bfd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -650,6 +650,12 @@ importers: ts-node-dev: specifier: ^1.0.0-pre.49 version: 1.1.8(typescript@5.2.2) + tsup: + specifier: ^7.2.0 + version: 7.2.0(@swc/core@1.3.93)(typescript@5.2.2) + tsup-config: + specifier: workspace:* + version: link:../../../packages/tsup-config typescript: specifier: ^5.2.2 version: 5.2.2 diff --git a/services/cron-jobs/sync-named-polls/.env.local b/services/cron-jobs/sync-named-polls/.env.local index 873d1170b..90558731e 100644 --- a/services/cron-jobs/sync-named-polls/.env.local +++ b/services/cron-jobs/sync-named-polls/.env.local @@ -1,2 +1,2 @@ DB_URL=mongodb://localhost/democracy -BUNDESTAGIO_SERVER_URL=http://localhost:4000 +BUNDESTAGIO_SERVER_URL=http://localhost:3100 diff --git a/services/cron-jobs/sync-named-polls/apollo.config.js b/services/cron-jobs/sync-named-polls/apollo.config.js index 27699ff7a..81136eb28 100644 --- a/services/cron-jobs/sync-named-polls/apollo.config.js +++ b/services/cron-jobs/sync-named-polls/apollo.config.js @@ -1,9 +1,9 @@ module.exports = { client: { - includes: ["./src/**/*.ts"], + includes: ['./src/**/*.ts'], service: { - name: "Bundestag.io API Local", - url: "http://localhost:4000", + name: 'Bundestag.io API Local', + url: 'http://localhost:3100', skipSSLValidation: true, }, }, diff --git a/services/cron-jobs/sync-named-polls/package.json b/services/cron-jobs/sync-named-polls/package.json index a4f743e12..49b9913eb 100644 --- a/services/cron-jobs/sync-named-polls/package.json +++ b/services/cron-jobs/sync-named-polls/package.json @@ -4,9 +4,9 @@ "main": "build/index.js", "license": "MIT", "scripts": { - "dev": "ts-node-dev -r dotenv/config ./src/index dotenv_config_path=./.env.local", + "dev": "tsup src/index.ts --watch --onSuccess 'node build/index.js'", + "build": "tsup-node", "lint": "tsc --noEmit", - "build": "tsc", "start": "node ./build/index.js", "apollo:codegen": "apollo client:codegen --target typescript --globalTypesFile=./src/__generated__/globalTypes.ts" }, @@ -28,6 +28,8 @@ "apollo": "^2.28.3", "dotenv": "^10.0.0", "ts-node-dev": "^1.0.0-pre.49", + "tsup": "^7.2.0", + "tsup-config": "workspace:*", "typescript": "^5.2.2" } } diff --git a/services/cron-jobs/sync-named-polls/src/graphql/client.ts b/services/cron-jobs/sync-named-polls/src/graphql/client.ts index 3c3dc97ca..e9e369067 100644 --- a/services/cron-jobs/sync-named-polls/src/graphql/client.ts +++ b/services/cron-jobs/sync-named-polls/src/graphql/client.ts @@ -1,7 +1,7 @@ -import { ApolloClient } from "apollo-client"; -import { createHttpLink } from "apollo-link-http"; -import { InMemoryCache } from "apollo-cache-inmemory"; -import fetch from "cross-fetch"; +import { ApolloClient } from 'apollo-client'; +import { createHttpLink } from 'apollo-link-http'; +import { InMemoryCache } from 'apollo-cache-inmemory'; +import fetch from 'cross-fetch'; const createClient = () => new ApolloClient({ @@ -13,7 +13,7 @@ const createClient = () => cache: new InMemoryCache(), defaultOptions: { query: { - fetchPolicy: "no-cache", + fetchPolicy: 'no-cache', }, }, }); diff --git a/services/cron-jobs/sync-named-polls/src/graphql/queries/getNamedPollUpdates.ts b/services/cron-jobs/sync-named-polls/src/graphql/queries/getNamedPollUpdates.ts index 441f144aa..b00fa2048 100644 --- a/services/cron-jobs/sync-named-polls/src/graphql/queries/getNamedPollUpdates.ts +++ b/services/cron-jobs/sync-named-polls/src/graphql/queries/getNamedPollUpdates.ts @@ -1,6 +1,7 @@ import gql from 'graphql-tag'; +import { DocumentNode } from 'graphql'; -export default gql` +export const namedPollUpdates: DocumentNode = gql` query NamedPollUpdates($since: Date!, $limit: Int, $offset: Int, $associated: Boolean) { namedPollUpdates(since: $since, limit: $limit, offset: $offset, associated: $associated) { beforeCount diff --git a/services/cron-jobs/sync-named-polls/src/index.ts b/services/cron-jobs/sync-named-polls/src/index.ts index d806bc274..e071f4013 100644 --- a/services/cron-jobs/sync-named-polls/src/index.ts +++ b/services/cron-jobs/sync-named-polls/src/index.ts @@ -3,7 +3,7 @@ import { forEachSeries } from 'p-iteration'; // GraphQL import createClient from './graphql/client'; -import getNamedPollUpdates from './graphql/queries/getNamedPollUpdates'; +import { namedPollUpdates as getNamedPollUpdates } from './graphql/queries/getNamedPollUpdates'; import { DeputyModel, getCron, diff --git a/services/cron-jobs/sync-named-polls/tsconfig.json b/services/cron-jobs/sync-named-polls/tsconfig.json index ef9a850c6..9e13a8918 100644 --- a/services/cron-jobs/sync-named-polls/tsconfig.json +++ b/services/cron-jobs/sync-named-polls/tsconfig.json @@ -1,69 +1,28 @@ { "compilerOptions": { - /* Visit https://aka.ms/tsconfig.json to read more about this file */ + "target": "ES2015", + "module": "commonjs", + "declaration": true, + "declarationMap": true, + "sourceMap": true, - /* Basic Options */ - // "incremental": true, /* Enable incremental compilation */ - "target": "es6" /* 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": [], /* 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": true, /* Generates corresponding '.d.ts' file. */ - // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ - // "sourceMap": true, /* Generates corresponding '.map' file. */ - // "outFile": "./", /* Concatenate and emit output to single file. */ - "outDir": "./build" /* Redirect output structure to the directory. */, - "rootDir": "./src" /* 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": true, + "noImplicitAny": true, + "strictNullChecks": true, + "strictFunctionTypes": true, + "strictBindCallApply": true, + "strictPropertyInitialization": true, + "noImplicitThis": true, + "alwaysStrict": true, - /* 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": true, /* 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. */ + "noUnusedLocals": true, + "noUnusedParameters": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, - /* 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. */ + "esModuleInterop": true, - /* Module Resolution Options */ - // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ - // "baseUrl": "./src/" /* Base directory to resolve non-absolute module names. */, - // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ - // "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": [], /* 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. */ + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true } } diff --git a/services/cron-jobs/sync-named-polls/tsup.config.ts b/services/cron-jobs/sync-named-polls/tsup.config.ts new file mode 100644 index 000000000..af5ec3392 --- /dev/null +++ b/services/cron-jobs/sync-named-polls/tsup.config.ts @@ -0,0 +1,6 @@ +import { defineConfig } from 'tsup'; +import { tsupConfig } from 'tsup-config'; + +export default defineConfig({ + ...tsupConfig, +});