Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ng16 migration exp fix types roots #9883

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,229 changes: 0 additions & 1,229 deletions angular.json

This file was deleted.

8 changes: 4 additions & 4 deletions lib/cli/package-lock.json

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

2 changes: 1 addition & 1 deletion lib/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"dist": "rm -rf ../../dist/libs/cli && npm run build && cp -R ./bin ../../dist/libs/cli && cp -R ./resources ../../dist/libs/cli && cp -R ./templates ../../dist/libs/cli && cp ./package.json ../../dist/libs/cli"
},
"dependencies": {
"@alfresco/js-api": ">=7.9.0",
"@alfresco/js-api": ">=7.9.0-0",
"commander": "^6.2.1",
"ejs": "^3.1.9",
"license-checker": "^25.0.1",
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"target": "es2018",
"lib": ["es2018", "dom"],
"baseUrl": ".",
"typeRoots": ["node_modules/@types"],
"typeRoots": [ "./node_modules/@types", "../node_modules/@types", "../../node_modules/@types" ],
"types": ["node"],
"paths": {
"@alfresco/js-api": ["../../dist/libs/js-api"],
Expand Down
1 change: 1 addition & 0 deletions lib/eslint-angular/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"outputPath": "dist/libs/eslint-plugin-eslint-angular",
"main": "lib/eslint-angular/index.ts",
"generatePackageJson": true,
"isolatedConfig": false,
"tsConfig": "lib/eslint-angular/tsconfig.lib.prod.json",
"stylePreprocessorOptions": {
"includePaths": ["lib", "lib/core/src/lib"]
Expand Down
3 changes: 2 additions & 1 deletion lib/js-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"description": "JavaScript client library for the Alfresco REST API",
"author": "Hyland Software, Inc. and its affiliates",
"keywords": [
"alfresco"
"alfresco",
"js-api"
],
"repository": {
"type": "git",
Expand Down
77 changes: 77 additions & 0 deletions lib/js-api/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"name": "js-api",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"sourceRoot": "lib/js-api/src",
"prefix": "adf",
"targets": {
"build": {
"executor": "nx:run-commands",
"options": {
"command": "npm run js_api_build"
},
"configurations": {
"production": {}
},
"defaultConfiguration": "production"
},
"bundle": {
"executor": "nx:run-commands",
"options": {
"commands": [
{
"command": "echo cli bundle created"
}
]
},
"dependsOn": [
"copyToNodeModules"
]
},
"copyToNodeModules": {
"executor": "nx:run-commands",
"options": {
"commands": [
{
"command": "rm -rf ./node_modules/@alfresco/js-api/ && mkdir -p ./node_modules/@alfresco/js-api/ && cp -R ./dist/libs/js-api/* ./node_modules/@alfresco/js-api/"
}
]
},
"dependsOn": [
{
"projects": "self",
"target": "build"
}
]
},
"test": {
"executor": "nx:run-commands",
"options": {
"commands": ["TS_NODE_PROJECT=lib/js-api/test/tsconfig.json mocha --full-trace --config lib/js-api/.mocharc.json"]
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": [
"lib/js-api/**/*.ts"
]
}
},
"npm-publish": {
"executor": "nx:run-commands",
"dependsOn": [
"build"
],
"options": {
"cwd": "dist/libs/js-api",
"commands": [
{
"command": "npm publish --tag {args.tag}",
"forwardAllArgs": true
}
]
}
}
}
}
2 changes: 1 addition & 1 deletion lib/js-api/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"target": "es2015",
"outDir": "./.out",
"lib": ["es2018", "dom"],
"typeRoots": ["node_modules/@types"],
"typeRoots": [ "./node_modules/@types", "../node_modules/@types", "../../node_modules/@types" ],
"types": []
},
"exclude": [".history", "*/node_modules", "config", "performance", "coverage", "node_modules", "package", "dist", "test"]
Expand Down
1 change: 1 addition & 0 deletions lib/testing/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"main": "lib/testing/index.ts",
"generatePackageJson": true,
"tsConfig": "lib/testing/tsconfig.lib.prod.json",
"isolatedConfig": false,
"stylePreprocessorOptions": {
"includePaths": ["lib", "lib/core/src/lib"]
},
Expand Down
5 changes: 3 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion tools/doc/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"noUnusedLocals": true,
"target": "es5",
"types": ["node", "@paperist/types-remark"],
"typeRoots": ["./node_modules/@types"],
"typeRoots": [ "./node_modules/@types", "../node_modules/@types", "../../node_modules/@types" ],
"lib": ["es2018", "dom"]
},
"files": [
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"target": "es2015",
"allowSyntheticDefaultImports": true,
"resolveJsonModule": true,
"typeRoots": ["node_modules/@types"],
"typeRoots": [ "./node_modules/@types", "../node_modules/@types", "../../node_modules/@types" ],
"types": ["jasmine", "node", "jasminewd2"],
"lib": ["es2018", "esnext.array", "esnext.asynciterable", "dom"],
"paths": {
Expand All @@ -35,7 +35,7 @@
"@alfresco/adf-process-services": ["lib/process-services/src/public-api.ts"],
"@alfresco/adf-process-services-cloud": ["lib/process-services-cloud/src/public-api.ts"],
"@alfresco/adf-testing": ["lib/testing/src/public-api.ts"],
"@alfresco/js-api": ["lib/js-api/src/index.ts"]
"@alfresco/js-api": ["lib/js-api/index.ts"]
}
},
"exclude": ["lib/config", "integration", "scripts", "assets", "tools", "node_modules"],
Expand Down
Loading