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

* upgrade to solution style tsconfig

* remove missing path

* add e2e config to the solution

* fix config path

e2e/tsconfig.e2e.json

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

projects/aca-shared/tsconfig.lib.json

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

projects/aca-shared/tsconfig.spec.json

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

projects/aca-testing-shared/tsconfig.lib.json

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

projects/adf-office-services-ext/tsconfig.lib.json

@@ -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": [
+    "lib": ["dom", "es2018"]
-      "dom",
-      "es2018"
-    ]
   },
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,
@@ -24,8 +21,5 @@
     "strictInjectionParameters": true,
     "enableResourceInlining": true
   },
-  "exclude": [
+  "exclude": ["src/test.ts", "**/*.spec.ts"]
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
 }

projects/adf-office-services-ext/tsconfig.spec.json

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

scripts/run

@@ -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,
+  project: tsConfigPath,
-    baseUrl: path.resolve(__dirname),
+  baseUrl: path.resolve(__dirname),
-    paths: tsConfig.compilerOptions.paths
+  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();

src/tsconfig.app.json

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

src/tsconfig.spec.json

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

tsconfig.base.json

@@ -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
+  }
+}

tsconfig.json

@@ -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,
+  "files": [],
-  "compilerOptions": {
+  "references": [
-    "baseUrl": "./",
+    {
-    "downlevelIteration": true,
+      "path": "./src/tsconfig.app.json"
-    "importHelpers": true,
+    },
-    "outDir": "./dist/out-tsc",
+    {
-    "sourceMap": true,
+      "path": "./src/tsconfig.spec.json"
-    "declaration": false,
+    },
-    "module": "esnext",
+    {
-    "moduleResolution": "node",
+      "path": "./e2e/tsconfig.e2e.json"
-    "emitDecoratorMetadata": true,
+    },
-    "experimentalDecorators": true,
+    {
-    "noUnusedLocals": true,
+      "path": "./projects/aca-shared/tsconfig.lib.json"
-    "noUnusedParameters": true,
+    },
-    "noImplicitReturns": true,
+    {
-    "target": "es2015",
+      "path": "./projects/aca-shared/tsconfig.spec.json"
-    "resolveJsonModule": true,
+    },
-    "allowSyntheticDefaultImports": true,
+    {
-    "typeRoots": ["node_modules/@types"],
+      "path": "./projects/aca-testing-shared/tsconfig.lib.json"
-    "lib": ["es2018", "dom"],
+    },
-    "paths": {
+    {
-      "@alfresco/aca-shared": ["projects/aca-shared/src/public-api.ts"],
+      "path": "./projects/adf-office-services-ext/tsconfig.lib.json"
-      "@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"],
+      "path": "./projects/adf-office-services-ext/tsconfig.spec.json"
-      "@alfresco/aca-testing-shared": ["projects/aca-testing-shared"]
     }
-  },
+  ]
-  "exclude": ["node_modules"],
-  "angularCompilerOptions": {
-    "preserveWhitespaces": false,
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
-  }
 }