inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-19 17:14:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-3593] fix library builds (#1593)

Browse Source 
* upgrade to solution style tsconfig

* remove missing path

* add e2e config to the solution

* fix config path
This commit is contained in:
Denys Vuika 2020-08-11 17:13:22 +01:00 committed by GitHub
parent cf4af3bab5
commit b86db21e93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 94 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
e2e/tsconfig.e2e.json
View File

@ -1,21 +1,15 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"baseUrl": "./",
"module": "commonjs",
"target": "es2017",
"types": [
"jasmine",
"jasminewd2",
"node"
],
"types": ["jasmine", "jasminewd2", "node"],
"skipLibCheck": true,
"paths": {
"@alfresco/aca-testing-shared": ["../projects/aca-testing-shared"]
}
},
"exclude": [
"node_modules"
]
"exclude": ["node_modules"]
}

2
projects/aca-shared/tsconfig.lib.json
View File

@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",

2
projects/aca-shared/tsconfig.spec.json
View File

@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": ["jasmine", "node"]

2
projects/aca-testing-shared/tsconfig.lib.json
View File

@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/aca-testing",
"target": "es2015",

12
projects/adf-office-services-ext/tsconfig.lib.json
View File

@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
@ -12,10 +12,7 @@
"experimentalDecorators": true,
"importHelpers": true,
"types": [],
"lib": [
"dom",
"es2018"
]
"lib": ["dom", "es2018"]
},
"angularCompilerOptions": {
"skipTemplateCodegen": true,
@ -24,8 +21,5 @@
"strictInjectionParameters": true,
"enableResourceInlining": true
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
"exclude": ["src/test.ts", "**/*.spec.ts"]
}

16
projects/adf-office-services-ext/tsconfig.spec.json
View File

@ -1,17 +1,9 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": [
"jasmine",
"node"
]
"types": ["jasmine", "node"]
},
"files": [
"src/test.ts"
],
"include": [
"**/*.spec.ts",
"**/*.d.ts"
]
"files": ["src/test.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
}

10
scripts/run
View File

@ -1,20 +1,20 @@
#!/usr/bin/env node
const path = require('path');
const tsConfigPath = path.resolve(__dirname, 'tsconfig.json');
const tsConfigPath = path.resolve(__dirname, 'tsconfig.base.json');
const tsConfig = require(tsConfigPath);
require('ts-node').register({ project: tsConfigPath });
require('tsconfig-paths').register({
project: tsConfigPath,
baseUrl: path.resolve(__dirname),
paths: tsConfig.compilerOptions.paths
project: tsConfigPath,
baseUrl: path.resolve(__dirname),
paths: tsConfig.compilerOptions.paths
});
const handlerParam = process.argv[2];
const RunnerClass = require(`./npm/${handlerParam}.ts`).default;
const runnerArgs = [ ...process.argv ];
const runnerArgs = [...process.argv];
runnerArgs.splice(2, 1);
const runner = new RunnerClass(runnerArgs);
runner.run();

19
src/tsconfig.app.json
View File

@ -1,14 +1,9 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"types": []
},
"files": [
"main.ts",
"polyfills.ts"
],
"include": [
"src/**/*.d.ts"
]
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"types": []
},
"files": ["main.ts", "polyfills.ts"],
"include": ["src/**/*.d.ts"]
}

2
src/tsconfig.spec.json
View File

@ -1,5 +1,5 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/spec",
"types": ["jasmine", "node"]

36
tsconfig.base.json Normal file
View File

@ -0,0 +1,36 @@
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"downlevelIteration": true,
"importHelpers": true,
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "esnext",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noImplicitReturns": true,
"target": "es2015",
"resolveJsonModule": true,
"allowSyntheticDefaultImports": true,
"typeRoots": ["node_modules/@types"],
"lib": ["es2018", "dom"],
"paths": {
"@alfresco/aca-shared": ["projects/aca-shared/src/public-api.ts"],
"@alfresco/aca-shared/store": ["projects/aca-shared/store/src/public-api.ts"],
"@alfresco/aca-shared/rules": ["projects/aca-shared/rules/src/public-api.ts"],
"@alfresco/adf-office-services-ext": ["projects/adf-office-services-ext/src/public-api.ts"],
"@alfresco/aca-testing-shared": ["projects/aca-testing-shared"]
}
},
"exclude": ["node_modules"],
"angularCompilerOptions": {
"preserveWhitespaces": false,
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
}
}

65
tsconfig.json
View File

@ -1,36 +1,35 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"downlevelIteration": true,
"importHelpers": true,
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "esnext",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noImplicitReturns": true,
"target": "es2015",
"resolveJsonModule": true,
"allowSyntheticDefaultImports": true,
"typeRoots": ["node_modules/@types"],
"lib": ["es2018", "dom"],
"paths": {
"@alfresco/aca-shared": ["projects/aca-shared/src/public-api.ts"],
"@alfresco/aca-shared/store": ["projects/aca-shared/store/src/public-api.ts"],
"@alfresco/aca-shared/rules": ["projects/aca-shared/rules/src/public-api.ts"],
"@alfresco/adf-office-services-ext": ["projects/adf-office-services-ext/src/public-api.ts"],
"@alfresco/aca-testing-shared": ["projects/aca-testing-shared"]
"files": [],
"references": [
{
"path": "./src/tsconfig.app.json"
},
{
"path": "./src/tsconfig.spec.json"
},
{
"path": "./e2e/tsconfig.e2e.json"
},
{
"path": "./projects/aca-shared/tsconfig.lib.json"
},
{
"path": "./projects/aca-shared/tsconfig.spec.json"
},
{
"path": "./projects/aca-testing-shared/tsconfig.lib.json"
},
{
"path": "./projects/adf-office-services-ext/tsconfig.lib.json"
},
{
"path": "./projects/adf-office-services-ext/tsconfig.spec.json"
}
},
"exclude": ["node_modules"],
"angularCompilerOptions": {
"preserveWhitespaces": false,
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
}
]
}