fix after rebase

angular.json

@@ -11,7 +11,6 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "extractCss": true,
             "aot": true,
             "allowedCommonJsDependencies": [
               "minimatch",

lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.spec.ts

@@ -181,7 +181,7 @@ describe('NewVersionUploaderService', () => {
                 spyOn(contentService, 'hasAllowableOperations').and.returnValue(true);
                 spyOn(service.versionsApi, 'listVersionHistory').and.returnValue(Promise.resolve({
                     list: { entries: [{ entry: '2' }] }
-                } as any);
+                }) as any);
                 mockNewVersionUploaderDialogData = {
                     node: mockNode,
                     file: mockFile

lib/core/api/ng-package.json

@@ -1,9 +1,6 @@
 {
   "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
   "lib": {
-    "entryFile": "public-api.ts",
+    "entryFile": "public-api.ts"
-    "umdModuleIds": {
-      "@alfresco/js-api": "@alfresco/js-api"
-    }
   }
 }

lib/core/ng-package.json

@@ -6,45 +6,8 @@
     "./theming/**/*.scss",
     "./**/*.theme.scss"
   ],
-  "whitelistedNonPeerDependencies": [
-    "cropperjs",
-    "@editorjs/editorjs",
-    "@editorjs/code",
-    "@editorjs/header",
-    "@editorjs/inline-code",
-    "@editorjs/list",
-    "@editorjs/marker",
-    "@editorjs/underline",
-    "@quanzo/change-font-size",
-    "editorjs-text-color-plugin",
-    "editorjs-html",
-    "editorjs-paragraph-with-alignment"
-  ],
   "lib": {
     "entryFile": "./public-api.ts",
-    "flatModuleFile": "adf-core",
+    "flatModuleFile": "adf-core"
-    "umdModuleIds": {
-      "@alfresco/js-api": "@alfresco/js-api",
-      "@alfresco/adf-extensions": "@alfresco/adf-extensions",
-      "minimatch": "minimatch-browser",
-      "@mat-datetimepicker/core": "@mat-datetimepicker/core",
-      "@mat-datetimepicker/moment": "@mat-datetimepicker/moment",
-      "moment": "moment",
-      "moment-es6": "moment-es6",
-      "moment/src/moment": "moment/src/moment",
-      "@ngx-translate/core": "@ngx-translate/core",
-      "cropperjs": "cropperjs",
-      "@editorjs/editorjs": "@editorjs/editorjs",
-      "@editorjs/code": "@editorjs/code",
-      "@editorjs/header": "@editorjs/header",
-      "@editorjs/inline-code": "@editorjs/inline-code",
-      "@editorjs/list": "@editorjs/list",
-      "@editorjs/marker": "@editorjs/marker",
-      "@editorjs/underline": "@editorjs/underline",
-      "@quanzo/change-font-size": "@quanzo/change-font-size",
-      "editorjs-text-color-plugin": "editorjs-text-color-plugin",
-      "editorjs-html": "editorjs-html",
-      "editorjs-paragraph-with-alignment": "editorjs-paragraph-with-alignment"
-    }
   }
 }

lib/core/package.json

@@ -10,7 +10,7 @@
   "bugs": {
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
-  "dependencies": {
+  "peerDependencies": {
     "cropperjs": "1.5.11",
     "@editorjs/editorjs": "2.25.0",
     "@editorjs/code": "2.7.0",
@@ -22,9 +22,7 @@
     "@quanzo/change-font-size": "1.0.0",
     "editorjs-text-color-plugin": "1.13.1",
     "editorjs-html": "3.4.2",
-    "editorjs-paragraph-with-alignment": "3.0.0"
+    "editorjs-paragraph-with-alignment": "3.0.0",
-  },
-  "peerDependencies": {
     "@angular/animations": ">=10.0.2",
     "@angular/cdk": ">=10.0.1",
     "@angular/common": ">=10.0.2",

package.json

@@ -120,6 +120,9 @@
     "@angular-eslint/template-parser": "^13.1.0",
     "@angular/cli": "^13.2.5",
     "@angular/compiler-cli": "^13.2.4",
+    "@editorjs/code": "2.7.0",
+    "@editorjs/inline-code": "1.3.1",
+    "@editorjs/marker": "1.2.2",
     "@nrwl/angular": "^13.8.8",
     "@nrwl/node": "13.8.7",
     "@nrwl/schematics": "8.12.11",
@@ -127,6 +130,7 @@
     "@nrwl/workspace": "13.8.7",
     "@paperist/types-remark": "0.1.3",
     "@playwright/test": "^1.20.0",
+    "@quanzo/change-font-size": "1.0.0",
     "@storybook/addon-essentials": "6.4.19",
     "@storybook/angular": "6.4.19",
     "@storybook/builder-webpack5": "6.4.19",
@@ -149,13 +153,14 @@
     "css-loader": "^5.2.6",
     "css-minimizer-webpack-plugin": "^3.4.1",
     "dotenv": "10.0.0",
+    "editorjs-text-color-plugin": "1.13.1",
     "eslint": "^7.6.0",
     "eslint-plugin-ban": "^1.6.0",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-jsdoc": "30.7.6",
     "eslint-plugin-prefer-arrow": "1.2.2",
     "eslint-plugin-rxjs": "^5.0.2",
-    "eslint-plugin-unicorn": "^41.0.0",
+    "eslint-plugin-unicorn": "41.0.0",
     "github-api": "^3.4.0",
     "graphql": "^15.8.0",
     "graphql-request": "^3.7.0",

scripts/travis/release/release-npm.sh

@@ -14,7 +14,7 @@ then
     fi
 
     echo "Publishing on npm with tag $TAG_NPM"
-    ./node_modules/@alfresco/adf-cli/bin/adf-cli npm-publish --npmRegistry $NPM_REGISTRY_ADDRESS --tokenRegistry $NPM_REGISTRY_TOKEN --tag $TAG_NPM --pathProject "$(pwd)"
+    npx @alfresco/adf-cli@alpha npm-publish --npmRegistry $NPM_REGISTRY_ADDRESS --tokenRegistry $NPM_REGISTRY_TOKEN --tag $TAG_NPM --pathProject "$(pwd)"
 else
     echo "PR No need to release in NPM"
 fi;