Compare commits
9 Commits
1374f90397
...
ec0812ad9d
| Author | SHA1 | Date | |
|---|---|---|---|
| ec0812ad9d | |||
| d8d6a102e7 | |||
| 71b58d5099 | |||
| 3d6c5e2a52 | |||
| 5a195b8f5a | |||
| e4d6ff6ad1 | |||
| 4c5ab2411e | |||
| 11c31c4c56 | |||
| 40c2bdb563 |
24
.eslintrc
24
.eslintrc
@@ -1,7 +1,9 @@
|
|||||||
{
|
{
|
||||||
"root": true,
|
"root": true,
|
||||||
"extends": [
|
"extends": [
|
||||||
"airbnb-base"
|
"airbnb-base",
|
||||||
|
"plugin:import/errors",
|
||||||
|
"plugin:vue/recommended"
|
||||||
],
|
],
|
||||||
"parserOptions": {
|
"parserOptions": {
|
||||||
"parser": "@babel/eslint-parser",
|
"parser": "@babel/eslint-parser",
|
||||||
@@ -19,12 +21,30 @@
|
|||||||
"no-console": 0,
|
"no-console": 0,
|
||||||
"no-param-reassign": ["error", {
|
"no-param-reassign": ["error", {
|
||||||
"props": true,
|
"props": true,
|
||||||
"ignorePropertyModificationsFor": ["state", "acc"]
|
"ignorePropertyModificationsFor": ["state", "acc", "req"]
|
||||||
}],
|
}],
|
||||||
|
"vue/multi-word-component-names": 0,
|
||||||
|
"vue/no-reserved-component-names": 0,
|
||||||
"no-tabs": "off",
|
"no-tabs": "off",
|
||||||
"no-unused-vars": ["error", {"argsIgnorePattern": "^_"}],
|
"no-unused-vars": ["error", {"argsIgnorePattern": "^_"}],
|
||||||
"prefer-destructuring": 0,
|
"prefer-destructuring": 0,
|
||||||
"template-curly-spacing": "off",
|
"template-curly-spacing": "off",
|
||||||
|
"vue/html-indent": ["error", "tab"],
|
||||||
|
"vue/multiline-html-element-content-newline": 0,
|
||||||
|
"vue/no-v-html": 0,
|
||||||
|
"vue/singleline-html-element-content-newline": 0,
|
||||||
|
"vue/comment-directive": 0,
|
||||||
|
},
|
||||||
|
"settings": {
|
||||||
|
"import/resolver": {
|
||||||
|
"alias": {
|
||||||
|
"extensions": [".js"],
|
||||||
|
"map": [
|
||||||
|
["#", "."],
|
||||||
|
["#root", "."]
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"globals": {
|
"globals": {
|
||||||
"CONFIG": true
|
"CONFIG": true
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ function mergeMainProfile(profile, mainProfile) {
|
|||||||
export async function interpolateProfiles(actorIdsOrNames, context, options = {}) {
|
export async function interpolateProfiles(actorIdsOrNames, context, options = {}) {
|
||||||
const profiles = await fetchProfiles(actorIdsOrNames, context);
|
const profiles = await fetchProfiles(actorIdsOrNames, context);
|
||||||
const columns = await context.knex.table('actors').columnInfo().then((table) => Object.keys(table));
|
const columns = await context.knex.table('actors').columnInfo().then((table) => Object.keys(table));
|
||||||
const preservedKeys = ['id', 'name', 'slug', 'entity_id', 'entry_id'];
|
const preservedKeys = ['id', 'name', 'slug', 'entity_id', 'entry_id', 'alias_for', 'created_at', 'batch_id', 'updated_at', 'allow_global_match', 'comment'];
|
||||||
|
|
||||||
const profilesByActorId = profiles.reduce((acc, profile) => ({
|
const profilesByActorId = profiles.reduce((acc, profile) => ({
|
||||||
...acc,
|
...acc,
|
||||||
|
|||||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "traxxx-utils",
|
"name": "traxxx-utils",
|
||||||
"version": "1.3.3",
|
"version": "1.3.6",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "traxxx-utils",
|
"name": "traxxx-utils",
|
||||||
"version": "1.3.3",
|
"version": "1.3.6",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/cli": "^7.25.7",
|
"@babel/cli": "^7.25.7",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "traxxx-common",
|
"name": "traxxx-common",
|
||||||
"version": "1.3.3",
|
"version": "1.3.6",
|
||||||
"description": "Common utilities for traxxx core and web.",
|
"description": "Common utilities for traxxx core and web.",
|
||||||
"main": "src/app.js",
|
"main": "src/app.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Reference in New Issue
Block a user