refactor: move from '/lib' to '/src'

marshallswain · Mar 16, 2023 · 243f3f4 · 243f3f4
1 parent ca5e96e
commit 243f3f4
Show file tree

Hide file tree

Showing 25 changed files with 24 additions and 13 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -22,3 +22,15 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: npm ci
       - run: npm test
+
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 18.x
+      - run: npm ci
+      - run: npm run compile
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Feathers
+Copyright (c) 2023 Feathers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/package.json b/package.json
@@ -31,11 +31,10 @@
     "LICENSE",
     "README.md",
     "src/**",
-    "lib/**",
     "dist/**"
   ],
   "scripts": {
-    "compile": "shx rm -rf dist/ && tsup lib/index.ts --format cjs,esm --dts",
+    "compile": "shx rm -rf dist/ && tsup src/index.ts --format cjs,esm --dts",
     "version": "npm run compile",
     "release": "np",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",

diff --git a/lib/app/graph-populate.app.ts → src/app/graph-populate.app.ts b/lib/app/graph-populate.app.ts → src/app/graph-populate.app.ts
diff --git a/lib/app/graph-populate.class.ts → src/app/graph-populate.class.ts b/lib/app/graph-populate.class.ts → src/app/graph-populate.class.ts
diff --git a/lib/app/graph-populate.service-mixin.ts → src/app/graph-populate.service-mixin.ts b/lib/app/graph-populate.service-mixin.ts → src/app/graph-populate.service-mixin.ts
diff --git a/lib/app/hooks.commons.ts → src/app/hooks.commons.ts b/lib/app/hooks.commons.ts → src/app/hooks.commons.ts
diff --git a/lib/hooks/graph-populate.hook.ts → src/hooks/graph-populate.hook.ts b/lib/hooks/graph-populate.hook.ts → src/hooks/graph-populate.hook.ts
diff --git a/lib/hooks/params-for-server.hook.ts → src/hooks/params-for-server.hook.ts b/lib/hooks/params-for-server.hook.ts → src/hooks/params-for-server.hook.ts
diff --git a/lib/hooks/params-from-client.hook.ts → src/hooks/params-from-client.hook.ts b/lib/hooks/params-from-client.hook.ts → src/hooks/params-from-client.hook.ts
diff --git a/lib/hooks/populate.hook.ts → src/hooks/populate.hook.ts b/lib/hooks/populate.hook.ts → src/hooks/populate.hook.ts
diff --git a/lib/hooks/shallow-populate.hook.ts → src/hooks/shallow-populate.hook.ts b/lib/hooks/shallow-populate.hook.ts → src/hooks/shallow-populate.hook.ts
diff --git a/lib/index.ts → src/index.ts b/lib/index.ts → src/index.ts
diff --git a/lib/types.ts → src/types.ts b/lib/types.ts → src/types.ts
diff --git a/lib/utils/define-populates.ts → src/utils/define-populates.ts b/lib/utils/define-populates.ts → src/utils/define-populates.ts
diff --git a/lib/utils/get-query.ts → src/utils/get-query.ts b/lib/utils/get-query.ts → src/utils/get-query.ts
diff --git a/lib/utils/shallow-populate.utils.ts → src/utils/shallow-populate.utils.ts b/lib/utils/shallow-populate.utils.ts → src/utils/shallow-populate.utils.ts
diff --git a/lib/utils/util.populate.ts → src/utils/util.populate.ts b/lib/utils/util.populate.ts → src/utils/util.populate.ts
diff --git a/test/graph-populate-hooks/graph-populate.app.test.ts b/test/graph-populate-hooks/graph-populate.app.test.ts
@@ -3,7 +3,7 @@ import type { ServiceAddons, Params } from '@feathersjs/feathers'
 import { feathers } from '@feathersjs/feathers'
 import { MemoryService } from '@feathersjs/memory'
 
-import configureGraphPopulate, { populate } from '../../lib'
+import configureGraphPopulate, { populate } from '../../src'
 
 type GraphPopulateParams = Params & { $populateParams: any; test: any }
 

diff --git a/test/graph-populate-hooks/graph-populate.general.test.ts b/test/graph-populate-hooks/graph-populate.general.test.ts
@@ -3,7 +3,7 @@ import type { Params } from '@feathersjs/feathers'
 import { feathers } from '@feathersjs/feathers'
 import { MemoryService } from '@feathersjs/memory'
 
-import configureGraphPopulate, { populate } from '../../lib'
+import configureGraphPopulate, { populate } from '../../src'
 
 type GraphPopulateParams = Params & { $populateParams: any; test: any }
 

diff --git a/test/shallow-populate.general.test.ts b/test/shallow-populate.general.test.ts
@@ -2,8 +2,8 @@ import assert from 'assert'
 import { memory } from '@feathersjs/memory'
 import sift from 'sift'
 import { NotAuthenticated } from '@feathersjs/errors'
-import { shallowPopulate as makePopulate } from '../lib'
-import type { ShallowPopulateOptions } from '../lib'
+import { shallowPopulate as makePopulate } from '../src'
+import type { ShallowPopulateOptions } from '../src'
 import type { HookContext, Params } from '@feathersjs/feathers'
 import { feathers } from '@feathersjs/feathers'
 

diff --git a/test/shallow-populate.test.ts b/test/shallow-populate.test.ts
@@ -1,9 +1,9 @@
 import assert from 'assert'
-import { shallowPopulate as makePopulate } from '../lib'
+import { shallowPopulate as makePopulate } from '../src'
 import { memory } from '@feathersjs/memory'
 import { feathers } from '@feathersjs/feathers'
 import type { HookContext, Params } from '@feathersjs/feathers'
-import type { ShallowPopulateOptions } from '../lib'
+import type { ShallowPopulateOptions } from '../src'
 
 async function mockApp() {
   const app = feathers()

diff --git a/test/testapp/app.ts b/test/testapp/app.ts
@@ -9,7 +9,7 @@ import * as groupsGraphPopulate from './populates.groups'
 import * as orgUsersGraphPopulate from './populates.org-users'
 import * as orgsGraphPopulate from './populates.orgs'
 import * as tasksGraphPopulate from './populates.tasks'
-import { populate } from '../../lib'
+import { populate } from '../../src'
 
 export default function makeApp(): Application {
   const app = feathers()

diff --git a/test/users.service.server.test.ts b/test/users.service.server.test.ts
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import { populateUtil } from '../lib'
+import { populateUtil } from '../src'
 import _omit from 'lodash/omit.js'
 import _orderBy from 'lodash/orderBy.js'
 import { populates as userPopulates } from './testapp/populates.users'

diff --git a/tsconfig.json b/tsconfig.json
@@ -10,6 +10,6 @@
     "declaration": true,
     "types": ["vitest/globals"]
   },
-  "include": ["lib/**/*"],
+  "include": ["src/**/*"],
   "exclude": ["node_modules"]
 }