Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add lib folder for extensions
Browse files Browse the repository at this point in the history
alexey-yarmosh committed Apr 15, 2024
1 parent ca868fa commit 7a3009e
Showing 9 changed files with 58 additions and 24 deletions.
14 changes: 12 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -64,6 +64,11 @@ RUN npm run build

# Build hooks/adopted-probe
FROM node:18-alpine AS builder-09
WORKDIR /builder/src/extensions/lib
COPY ./src/extensions/lib /builder/src/extensions/lib
ADD ./src/extensions/lib/package.json ./src/extensions/lib/package-lock.json ./
RUN npm ci
COPY ./src/extensions/lib .
WORKDIR /builder/src/extensions/hooks/adopted-probe
ADD ./src/extensions/hooks/adopted-probe/package.json ./src/extensions/hooks/adopted-probe/package-lock.json ./
RUN npm ci
@@ -134,16 +139,21 @@ RUN npm ci
COPY ./src/extensions/hooks/gp-tokens .
RUN npm run build

# Build hooks/gp-tokens
# Build hooks/directus-users
FROM node:18-alpine AS builder-18
WORKDIR /builder/src/extensions/hooks/directus-users
ADD ./src/extensions/hooks/directus-users/package.json ./src/extensions/hooks/directus-users/package-lock.json ./
RUN npm ci
COPY ./src/extensions/hooks/directus-users .
RUN npm run build

# Build hooks/gp-tokens
# Build hooks/location-verrides
FROM node:18-alpine AS builder-19
WORKDIR /builder/src/extensions/lib
COPY ./src/extensions/lib /builder/src/extensions/lib
ADD ./src/extensions/lib/package.json ./src/extensions/lib/package-lock.json ./
RUN npm ci
COPY ./src/extensions/lib .
WORKDIR /builder/src/extensions/hooks/location-overrides
ADD ./src/extensions/hooks/location-overrides/package.json ./src/extensions/hooks/location-overrides/package-lock.json ./
RUN npm ci
2 changes: 1 addition & 1 deletion src/extensions/hooks/adopted-probe/src/validate-fields.ts
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import axios from 'axios';
import { createError } from '@directus/errors';
import { Fields } from './index.js';
import { City, geonamesCache, getKey } from './geonames-cache.js';
import { normalizeCityName } from './normalize-city.js';
import { normalizeCityName } from '../../../lib/normalize-city.js';
import { EventContext } from '@directus/types';
import { getProbes, getUser } from './repositories/directus.js';

6 changes: 3 additions & 3 deletions src/extensions/hooks/adopted-probe/tsconfig.json
Original file line number Diff line number Diff line change
@@ -26,10 +26,10 @@
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"allowSyntheticDefaultImports": true,
"isolatedModules": true,
"rootDir": "./src"
"isolatedModules": true
},
"include": [
"./src/**/*.ts"
"./src/**/*.ts",
"../../lib/*.ts"
]
}
15 changes: 0 additions & 15 deletions src/extensions/hooks/location-overrides/src/normalize-city.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import { createError } from '@directus/errors';
import axios from 'axios';
import ipaddr from 'ipaddr.js';
import type { Fields } from './index.js';
import { normalizeCityName } from './normalize-city.js';
import { normalizeCityName } from '../../../lib/normalize-city.js';

type City = {
lng: string;
4 changes: 2 additions & 2 deletions src/extensions/hooks/location-overrides/tsconfig.json
Original file line number Diff line number Diff line change
@@ -25,10 +25,10 @@
"forceConsistentCasingInFileNames": true,
"allowSyntheticDefaultImports": true,
"isolatedModules": true,
"rootDir": "./src",
"module": "ESNext"
},
"include": [
"./src/**/*.ts"
"./src/**/*.ts",
"../../lib/*.ts"
]
}
File renamed without changes.
24 changes: 24 additions & 0 deletions src/extensions/lib/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions src/extensions/lib/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "lib",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"any-ascii": "^0.3.2"
}
}

0 comments on commit 7a3009e

Please sign in to comment.