mirror of
https://github.com/directus/directus.git
synced 2026-02-18 13:55:11 -05:00
The Great TypeScript Modernization Program Season 3 Episode 6: The Big One (#18014)
* Step 1 * Step 2 * False sense of confidence * Couple more before dinner * Update schema package * Update format-title * Upgrade specs file * Close * Replace ts-node-dev with tsx, and various others * Replace lodash with lodash-es * Add lodash-es types * Update knex import * More fun is had * FSE * Consolidate repos * Various tweaks and fixes * Fix specs * Remove dependency on knex-schema-inspector * Fix wrong imports of inspector * Move shared exceptions to new package * Move constants to separate module * Move types to new types package * Use directus/types * I believe this is no longer needed * [WIP] Start moving utils to esm * ESMify Shared * Move shared utils to @directus/utils * Use @directus/utils instead of @directus/shared/utils * It runs! * Use correct schemaoverview type * Fix imports * Fix the thing * Start on new update-checker lib * Use new update-check package * Swap out directus/shared in app * Pushing through the last bits now * Dangerously make extensions SDK ESM * Use @directus/types in tests * Copy util function to test * Fix linter config * Add missing import * Hot takes * Fix build * Curse these default exports * No tests in constants * Add tests * Remove tests from types * Add tests for exceptions * Fix test * Fix app tests * Fix import in test * Fix various tests * Fix specs export * Some more tests * Remove broken integration tests These were broken beyond repair.. They were also written before we really knew what we we're doing with tests, so I think it's better to say goodbye and start over with these * Regenerate lockfile * Fix imports from merge * I create my own problems * Make sharp play nice * Add vitest config * Install missing blackbox dep * Consts shouldn't be in types tsk tsk tsk tsk * Fix type/const usage in extensions-sdk * cursed.default * Reduce circular deps * Fix circular dep in items service * vvv * Trigger testing for all vendors * Add workaround for rollup * Prepend the file protocol for the ESM loader to be compatible with Windows "WARN: Only URLs with a scheme in: file and data are supported by the default ESM loader. On Windows, absolute paths must be valid file:// URLs. Received protocol 'c:'" * Fix postgres * Schema package updates Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com> * Resolve cjs/mjs extensions * Clean-up eslint config * fixed extension concatination * using string interpolation for consistency * Revert MySQL optimisation * Revert testing for all vendors * Replace tsx with esbuild-kit/esm-loader Is a bit faster and we can rely on the built-in `watch` and `inspect` functionalities of Node.js Note: The possibility to watch other files (.env in our case) might be added in the future, see https://github.com/nodejs/node/issues/45467 * Use exact version for esbuild-kit/esm-loader * Fix import --------- Co-authored-by: ian <licitdev@gmail.com> Co-authored-by: Brainslug <tim@brainslug.nl> Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com> Co-authored-by: Pascal Jufer <pascal-jufer@bluewin.ch>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { test, vi, afterEach, beforeEach, expect } from 'vitest';
|
||||
import { getAxios, _cache } from './index';
|
||||
import { getAxios, _cache } from './index.js';
|
||||
import axios from 'axios';
|
||||
import type { AxiosInstance } from 'axios';
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import type { AxiosInstance } from 'axios';
|
||||
import { requestInterceptor } from './request-interceptor';
|
||||
import { responseInterceptor } from './response-interceptor';
|
||||
import { requestInterceptor } from './request-interceptor.js';
|
||||
import { responseInterceptor } from './response-interceptor.js';
|
||||
|
||||
export const _cache: { axiosInstance: AxiosInstance | null } = {
|
||||
axiosInstance: null,
|
||||
|
||||
@@ -6,9 +6,9 @@ import { lookup } from 'node:dns/promises';
|
||||
import { isIP } from 'node:net';
|
||||
import { URL } from 'node:url';
|
||||
import { afterEach, beforeEach, expect, test, vi } from 'vitest';
|
||||
import logger from '../logger';
|
||||
import { requestInterceptor } from './request-interceptor';
|
||||
import { validateIP } from './validate-ip';
|
||||
import logger from '../logger.js';
|
||||
import { requestInterceptor } from './request-interceptor.js';
|
||||
import { validateIP } from './validate-ip.js';
|
||||
|
||||
vi.mock('axios');
|
||||
vi.mock('node:net');
|
||||
|
||||
@@ -3,8 +3,8 @@ import axios from 'axios';
|
||||
import { lookup } from 'node:dns/promises';
|
||||
import { isIP } from 'node:net';
|
||||
import { URL } from 'node:url';
|
||||
import logger from '../logger';
|
||||
import { validateIP } from './validate-ip';
|
||||
import logger from '../logger.js';
|
||||
import { validateIP } from './validate-ip.js';
|
||||
|
||||
export const requestInterceptor = async (config: InternalAxiosRequestConfig) => {
|
||||
const uri = axios.getUri(config);
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { randIp, randUrl } from '@ngneat/falso';
|
||||
import type { AxiosResponse } from 'axios';
|
||||
import { afterEach, beforeEach, expect, test, vi } from 'vitest';
|
||||
import { responseInterceptor } from './response-interceptor';
|
||||
import { validateIP } from './validate-ip';
|
||||
import { responseInterceptor } from './response-interceptor.js';
|
||||
import { validateIP } from './validate-ip.js';
|
||||
|
||||
vi.mock('./validate-ip');
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { AxiosResponse } from 'axios';
|
||||
import { validateIP } from './validate-ip';
|
||||
import { validateIP } from './validate-ip.js';
|
||||
|
||||
export const responseInterceptor = async (config: AxiosResponse<any, any>) => {
|
||||
await validateIP(config.request.socket.remoteAddress, config.request.url);
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { randIp, randUrl } from '@ngneat/falso';
|
||||
import os from 'node:os';
|
||||
import { afterEach, beforeEach, expect, test, vi } from 'vitest';
|
||||
import { getEnv } from '../env';
|
||||
import { validateIP } from './validate-ip';
|
||||
import { getEnv } from '../env.js';
|
||||
import { validateIP } from './validate-ip.js';
|
||||
|
||||
vi.mock('../env');
|
||||
vi.mock('node:os');
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import os from 'node:os';
|
||||
import { getEnv } from '../env';
|
||||
import { getEnv } from '../env.js';
|
||||
|
||||
export const validateIP = async (ip: string, url: string) => {
|
||||
const env = getEnv();
|
||||
|
||||
Reference in New Issue
Block a user