Ng16 migration exp fix types roots (#9883)

Alfresco · Jun 28, 2024 · 7320c6b · 7320c6b
1 parent fd3388d
commit 7320c6b
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 1,242 deletions.
diff --git a/angular.json b/angular.json
diff --git a/lib/cli/package-lock.json b/lib/cli/package-lock.json
diff --git a/lib/cli/package.json b/lib/cli/package.json
@@ -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",

diff --git a/lib/cli/tsconfig.json b/lib/cli/tsconfig.json
@@ -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"],

diff --git a/lib/eslint-angular/project.json b/lib/eslint-angular/project.json
@@ -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"]

diff --git a/lib/js-api/package.json b/lib/js-api/package.json
@@ -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",

diff --git a/lib/js-api/project.json b/lib/js-api/project.json
@@ -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
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/lib/js-api/tsconfig.json b/lib/js-api/tsconfig.json
@@ -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"]

diff --git a/lib/testing/project.json b/lib/testing/project.json
@@ -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"]
         },

diff --git a/package-lock.json b/package-lock.json
diff --git a/tools/doc/tsconfig.json b/tools/doc/tsconfig.json
@@ -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": [

diff --git a/tsconfig.json b/tsconfig.json
@@ -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": {
@@ -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"],