Browse Source

Move types package in packages/

tags/v4.1.0-rc.1
Chocobozzz 6 months ago
parent
commit
6627dbc957
No known key found for this signature in database GPG Key ID: 583A612D890159BE
15 changed files with 22 additions and 20 deletions
  1. +1
    -1
      .github/workflows/test.yml
  2. +3
    -1
      .gitignore
  3. +2
    -2
      client/tsconfig.types.json
  4. +1
    -1
      package.json
  5. +0
    -0
      packages/types/README.md
  6. +3
    -3
      packages/types/generate-package.ts
  7. +0
    -0
      packages/types/src/client/index.ts
  8. +2
    -2
      packages/types/src/client/tsconfig.json
  9. +0
    -0
      packages/types/src/index.ts
  10. +0
    -0
      packages/types/tests/test.ts
  11. +0
    -0
      packages/types/tsconfig.dist.json
  12. +6
    -6
      packages/types/tsconfig.json
  13. +2
    -2
      scripts/ci.sh
  14. +1
    -1
      server/tsconfig.types.json
  15. +1
    -1
      shared/tsconfig.types.json

+ 1
- 1
.github/workflows/test.yml View File

@@ -39,7 +39,7 @@ jobs:
strategy:
fail-fast: false
matrix:
test_suite: [ types, client, api-1, api-2, api-3, api-4, cli-plugin, lint, external-plugins ]
test_suite: [ types-package, client, api-1, api-2, api-3, api-4, cli-plugin, lint, external-plugins ]

env:
PGUSER: peertube


+ 3
- 1
.gitignore View File

@@ -53,4 +53,6 @@ yarn-error.log

# TypeScript
*.tsbuildinfo
/types/dist/

# Packages
/packages/types/dist/

+ 2
- 2
client/tsconfig.types.json View File

@@ -4,11 +4,11 @@
"stripInternal": true,
"removeComments": false,
"declaration": true,
"outDir": "../types/dist/client/",
"outDir": "../packages/types/dist/client/",
"emitDeclarationOnly": true,
"composite": true,
"rootDir": "src/",
"tsBuildInfoFile": "../types/dist/tsconfig.client.tsbuildinfo"
"tsBuildInfoFile": "../packages/types/dist/tsconfig.client.tsbuildinfo"
},
"references": [
{ "path": "../shared/tsconfig.types.json" }


+ 1
- 1
package.json View File

@@ -52,7 +52,7 @@
"test": "bash ./scripts/test.sh",
"help": "bash ./scripts/help.sh",
"generate-cli-doc": "bash ./scripts/generate-cli-doc.sh",
"generate-types-package": "ts-node ./types/generate-package.ts",
"generate-types-package": "ts-node ./packages/types/generate-package.ts",
"parse-log": "node ./dist/scripts/parse-log.js",
"prune-storage": "node ./dist/scripts/prune-storage.js",
"postinstall": "test -n \"$NOCLIENT\" || (cd client && yarn install --pure-lockfile)",


types/README.md → packages/types/README.md View File


types/generate-package.ts → packages/types/generate-package.ts View File

@@ -12,7 +12,7 @@ run()
})

async function run () {
const typesPath = resolve(cwd(), './types/')
const typesPath = resolve(cwd(), './packages/types/')
const typesDistPath = resolve(cwd(), typesPath, './dist/')
const typesDistPackageJsonPath = resolve(typesDistPath, './package.json')
const typesDistGitIgnorePath = resolve(typesDistPath, './.gitignore')
@@ -22,7 +22,7 @@ async function run () {
const clientPackageJson = await readJson(resolve(cwd(), './client/package.json'))

await remove(typesDistPath)
execSync('npm run tsc -- -b --verbose types', { stdio: 'inherit' })
execSync('npm run tsc -- -b --verbose packages/types', { stdio: 'inherit' })
execSync(`npm run resolve-tspaths -- --project ${distTsConfigPath} --src ${typesDistPath} --out ${typesDistPath}`, { stdio: 'inherit' })

const allDependencies = Object.assign(
@@ -42,7 +42,7 @@ async function run () {
package: { dependencies: allDependencies }
}

const { dependencies: unusedDependencies } = await depcheck(resolve(cwd(), './types/'), depcheckOptions)
const { dependencies: unusedDependencies } = await depcheck(resolve(typesPath), depcheckOptions)
console.log(`Removing ${Object.keys(unusedDependencies).length} unused dependencies.`)
const dependencies = Object
.keys(allDependencies)

types/src/client/index.ts → packages/types/src/client/index.ts View File


types/src/client/tsconfig.json → packages/types/src/client/tsconfig.json View File

@@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig.base.json",
"extends": "../../../../tsconfig.base.json",
"compilerOptions": {
"stripInternal": true,
"removeComments": false,
@@ -9,7 +9,7 @@
"tsBuildInfoFile": "../../dist/tsconfig.client.types.tsbuildinfo"
},
"references": [
{ "path": "../../../client/tsconfig.types.json" }
{ "path": "../../../../client/tsconfig.types.json" }
],
"files": ["index.ts"]
}

types/src/index.ts → packages/types/src/index.ts View File


types/tests/test.ts → packages/types/tests/test.ts View File


types/tsconfig.dist.json → packages/types/tsconfig.dist.json View File


types/tsconfig.json → packages/types/tsconfig.json View File

@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.base.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"stripInternal": true,
"removeComments": false,
@@ -9,14 +9,14 @@
"rootDir": "./src/",
"tsBuildInfoFile": "./dist/tsconfig.server.types.tsbuildinfo",
"paths": {
"@server/*": [ "../../server/*" ],
"@shared/*": [ "../../shared/*" ],
"@client/*": [ "../../client/src/*" ]
"@server/*": [ "../../../server/*" ],
"@shared/*": [ "../../../shared/*" ],
"@client/*": [ "../../../client/src/*" ]
}
},
"references": [
{ "path": "../shared/tsconfig.types.json" },
{ "path": "../server/tsconfig.types.json" },
{ "path": "../../shared/tsconfig.types.json" },
{ "path": "../../server/tsconfig.types.json" },
{ "path": "./src/client/tsconfig.json" }
],
"files": ["./src/index.ts"]

+ 2
- 2
scripts/ci.sh View File

@@ -40,9 +40,9 @@ findTestFiles () {
find $1 -type f -name "*.js" $exception | xargs echo
}

if [ "$1" = "types" ]; then
if [ "$1" = "types-package" ]; then
npm run generate-types-package
npm run tsc -- --noEmit --esModuleInterop types/tests/test.ts
npm run tsc -- --noEmit --esModuleInterop packages/types/tests/test.ts
elif [ "$1" = "client" ]; then
npm run build



+ 1
- 1
server/tsconfig.types.json View File

@@ -1,7 +1,7 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../types/dist/server",
"outDir": "../packages/types/dist/server",
"stripInternal": true,
"removeComments": false,
"emitDeclarationOnly": true


+ 1
- 1
shared/tsconfig.types.json View File

@@ -1,7 +1,7 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../types/dist/shared",
"outDir": "../packages/types/dist/shared",
"stripInternal": true,
"removeComments": false,
"emitDeclarationOnly": true


Loading…
Cancel
Save