diff --git a/libs/fedaco/package.json b/libs/fedaco/package.json index d9cc1e9ab..129f14ab1 100644 --- a/libs/fedaco/package.json +++ b/libs/fedaco/package.json @@ -6,8 +6,7 @@ "url": "https://github.com/gradii/fedaco.git" }, "license": "MIT", - "peerDependencies": { - }, + "peerDependencies": {}, "dependencies": { "tslib": "^2.3.0" } diff --git a/libs/triangle-icons/display/package.json b/libs/triangle-icons/display/ng-package.json similarity index 100% rename from libs/triangle-icons/display/package.json rename to libs/triangle-icons/display/ng-package.json diff --git a/libs/triangle-icons/eva/package.json b/libs/triangle-icons/eva/ng-package.json similarity index 100% rename from libs/triangle-icons/eva/package.json rename to libs/triangle-icons/eva/ng-package.json diff --git a/libs/triangle-icons/ng-package.json b/libs/triangle-icons/ng-package.json index 34ad93f9a..dc2878749 100644 --- a/libs/triangle-icons/ng-package.json +++ b/libs/triangle-icons/ng-package.json @@ -1,7 +1,15 @@ { - "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/libs/triangle-icons", - "lib": { - "entryFile": "index.ts" + "name": "@gradii/triangle-icons", + "version": "0.0.1", + "description": "gradii triangle icons", + "repository": { + "type": "git", + "url": "https://github.com/gradii/triangle.git" + }, + "keywords": [ + ], + "license": "MIT", + "dependencies": { + "tslib": "^2.3.0" } } diff --git a/libs/triangle-icons/package.json b/libs/triangle-icons/package.json deleted file mode 100644 index dc2878749..000000000 --- a/libs/triangle-icons/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "@gradii/triangle-icons", - "version": "0.0.1", - "description": "gradii triangle icons", - "repository": { - "type": "git", - "url": "https://github.com/gradii/triangle.git" - }, - "keywords": [ - ], - "license": "MIT", - "dependencies": { - "tslib": "^2.3.0" - } -} diff --git a/libs/triangle-icons/workbench/package.json b/libs/triangle-icons/workbench/ng-package.json similarity index 100% rename from libs/triangle-icons/workbench/package.json rename to libs/triangle-icons/workbench/ng-package.json diff --git a/libs/triangle/accordion/package.json b/libs/triangle/accordion/ng-package.json similarity index 100% rename from libs/triangle/accordion/package.json rename to libs/triangle/accordion/ng-package.json diff --git a/libs/triangle/alert/package.json b/libs/triangle/alert/ng-package.json similarity index 100% rename from libs/triangle/alert/package.json rename to libs/triangle/alert/ng-package.json diff --git a/libs/triangle/anchor/package.json b/libs/triangle/anchor/ng-package.json similarity index 100% rename from libs/triangle/anchor/package.json rename to libs/triangle/anchor/ng-package.json diff --git a/libs/triangle/auth/package.json b/libs/triangle/auth/ng-package.json similarity index 100% rename from libs/triangle/auth/package.json rename to libs/triangle/auth/ng-package.json diff --git a/libs/triangle/autocomplete/package.json b/libs/triangle/autocomplete/ng-package.json similarity index 100% rename from libs/triangle/autocomplete/package.json rename to libs/triangle/autocomplete/ng-package.json diff --git a/libs/triangle/avatar/package.json b/libs/triangle/avatar/ng-package.json similarity index 100% rename from libs/triangle/avatar/package.json rename to libs/triangle/avatar/ng-package.json diff --git a/libs/triangle/back-top/package.json b/libs/triangle/back-top/ng-package.json similarity index 100% rename from libs/triangle/back-top/package.json rename to libs/triangle/back-top/ng-package.json diff --git a/libs/triangle/badge/package.json b/libs/triangle/badge/ng-package.json similarity index 100% rename from libs/triangle/badge/package.json rename to libs/triangle/badge/ng-package.json diff --git a/libs/triangle/breadcrumb/package.json b/libs/triangle/breadcrumb/ng-package.json similarity index 100% rename from libs/triangle/breadcrumb/package.json rename to libs/triangle/breadcrumb/ng-package.json diff --git a/libs/triangle/button-toggle/package.json b/libs/triangle/button-toggle/ng-package.json similarity index 100% rename from libs/triangle/button-toggle/package.json rename to libs/triangle/button-toggle/ng-package.json diff --git a/libs/triangle/button/package.json b/libs/triangle/button/ng-package.json similarity index 100% rename from libs/triangle/button/package.json rename to libs/triangle/button/ng-package.json diff --git a/libs/triangle/calendar/package.json b/libs/triangle/calendar/ng-package.json similarity index 100% rename from libs/triangle/calendar/package.json rename to libs/triangle/calendar/ng-package.json diff --git a/libs/triangle/card/package.json b/libs/triangle/card/ng-package.json similarity index 100% rename from libs/triangle/card/package.json rename to libs/triangle/card/ng-package.json diff --git a/libs/triangle/cascader/package.json b/libs/triangle/cascader/ng-package.json similarity index 100% rename from libs/triangle/cascader/package.json rename to libs/triangle/cascader/ng-package.json diff --git a/libs/triangle/checkbox/package.json b/libs/triangle/checkbox/ng-package.json similarity index 100% rename from libs/triangle/checkbox/package.json rename to libs/triangle/checkbox/ng-package.json diff --git a/libs/triangle/combobox/package.json b/libs/triangle/combobox/ng-package.json similarity index 100% rename from libs/triangle/combobox/package.json rename to libs/triangle/combobox/ng-package.json diff --git a/libs/triangle/confirm-popup/package.json b/libs/triangle/confirm-popup/ng-package.json similarity index 100% rename from libs/triangle/confirm-popup/package.json rename to libs/triangle/confirm-popup/ng-package.json diff --git a/libs/triangle/core/package.json b/libs/triangle/core/ng-package.json similarity index 100% rename from libs/triangle/core/package.json rename to libs/triangle/core/ng-package.json diff --git a/libs/triangle/data-query/package.json b/libs/triangle/data-query/ng-package.json similarity index 100% rename from libs/triangle/data-query/package.json rename to libs/triangle/data-query/ng-package.json diff --git a/libs/triangle/data-table/package.json b/libs/triangle/data-table/ng-package.json similarity index 100% rename from libs/triangle/data-table/package.json rename to libs/triangle/data-table/ng-package.json diff --git a/libs/triangle/date-picker/package.json b/libs/triangle/date-picker/ng-package.json similarity index 100% rename from libs/triangle/date-picker/package.json rename to libs/triangle/date-picker/ng-package.json diff --git a/libs/triangle/desc-list/package.json b/libs/triangle/desc-list/ng-package.json similarity index 100% rename from libs/triangle/desc-list/package.json rename to libs/triangle/desc-list/ng-package.json diff --git a/libs/triangle/diagram/package.json b/libs/triangle/diagram/ng-package.json similarity index 100% rename from libs/triangle/diagram/package.json rename to libs/triangle/diagram/ng-package.json diff --git a/libs/triangle/dialog/package.json b/libs/triangle/dialog/ng-package.json similarity index 100% rename from libs/triangle/dialog/package.json rename to libs/triangle/dialog/ng-package.json diff --git a/libs/triangle/divider/package.json b/libs/triangle/divider/ng-package.json similarity index 100% rename from libs/triangle/divider/package.json rename to libs/triangle/divider/ng-package.json diff --git a/libs/triangle/dnd/package.json b/libs/triangle/dnd/ng-package.json similarity index 100% rename from libs/triangle/dnd/package.json rename to libs/triangle/dnd/ng-package.json diff --git a/libs/triangle/drag-drop/package.json b/libs/triangle/drag-drop/ng-package.json similarity index 100% rename from libs/triangle/drag-drop/package.json rename to libs/triangle/drag-drop/ng-package.json diff --git a/libs/triangle/draggable/package.json b/libs/triangle/draggable/ng-package.json similarity index 100% rename from libs/triangle/draggable/package.json rename to libs/triangle/draggable/ng-package.json diff --git a/libs/triangle/drawer/package.json b/libs/triangle/drawer/ng-package.json similarity index 100% rename from libs/triangle/drawer/package.json rename to libs/triangle/drawer/ng-package.json diff --git a/libs/triangle/dropdown/package.json b/libs/triangle/dropdown/ng-package.json similarity index 100% rename from libs/triangle/dropdown/package.json rename to libs/triangle/dropdown/ng-package.json diff --git a/libs/triangle/empty/package.json b/libs/triangle/empty/ng-package.json similarity index 100% rename from libs/triangle/empty/package.json rename to libs/triangle/empty/ng-package.json diff --git a/libs/triangle/form-field/package.json b/libs/triangle/form-field/ng-package.json similarity index 100% rename from libs/triangle/form-field/package.json rename to libs/triangle/form-field/ng-package.json diff --git a/libs/triangle/form/package.json b/libs/triangle/form/ng-package.json similarity index 100% rename from libs/triangle/form/package.json rename to libs/triangle/form/ng-package.json diff --git a/libs/triangle/grid-list/package.json b/libs/triangle/grid-list/ng-package.json similarity index 100% rename from libs/triangle/grid-list/package.json rename to libs/triangle/grid-list/ng-package.json diff --git a/libs/triangle/grid/package.json b/libs/triangle/grid/ng-package.json similarity index 100% rename from libs/triangle/grid/package.json rename to libs/triangle/grid/ng-package.json diff --git a/libs/triangle/gridster/package.json b/libs/triangle/gridster/ng-package.json similarity index 100% rename from libs/triangle/gridster/package.json rename to libs/triangle/gridster/ng-package.json diff --git a/libs/triangle/i18n/package.json b/libs/triangle/i18n/ng-package.json similarity index 100% rename from libs/triangle/i18n/package.json rename to libs/triangle/i18n/ng-package.json diff --git a/libs/triangle/icon/package.json b/libs/triangle/icon/ng-package.json similarity index 100% rename from libs/triangle/icon/package.json rename to libs/triangle/icon/ng-package.json diff --git a/libs/triangle/input-number/package.json b/libs/triangle/input-number/ng-package.json similarity index 100% rename from libs/triangle/input-number/package.json rename to libs/triangle/input-number/ng-package.json diff --git a/libs/triangle/input/package.json b/libs/triangle/input/ng-package.json similarity index 100% rename from libs/triangle/input/package.json rename to libs/triangle/input/ng-package.json diff --git a/libs/triangle/layout/package.json b/libs/triangle/layout/ng-package.json similarity index 100% rename from libs/triangle/layout/package.json rename to libs/triangle/layout/ng-package.json diff --git a/libs/triangle/list/package.json b/libs/triangle/list/ng-package.json similarity index 100% rename from libs/triangle/list/package.json rename to libs/triangle/list/ng-package.json diff --git a/libs/triangle/menu/package.json b/libs/triangle/menu/ng-package.json similarity index 100% rename from libs/triangle/menu/package.json rename to libs/triangle/menu/ng-package.json diff --git a/libs/triangle/message/package.json b/libs/triangle/message/ng-package.json similarity index 100% rename from libs/triangle/message/package.json rename to libs/triangle/message/ng-package.json diff --git a/libs/triangle/modal/package.json b/libs/triangle/modal/ng-package.json similarity index 100% rename from libs/triangle/modal/package.json rename to libs/triangle/modal/ng-package.json diff --git a/libs/triangle/navbar/package.json b/libs/triangle/navbar/ng-package.json similarity index 100% rename from libs/triangle/navbar/package.json rename to libs/triangle/navbar/ng-package.json diff --git a/libs/triangle/ng-package.json b/libs/triangle/ng-package.json index d4353a0b6..2d4c77dff 100644 --- a/libs/triangle/ng-package.json +++ b/libs/triangle/ng-package.json @@ -1,12 +1,22 @@ { - "$schema": "../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../dist/libs/triangle", - "assets": [ - "CHANGELOG.md", - "./core/themes/prebuilt/*.scss", - "./**/_*.scss" + "name": "@gradii/triangle", + "version": "2.3.2", + "description": "Triangle Packages", + "repository": { + "type": "git", + "url": "https://github.com/gradii/triangle.git" + }, + "keywords": [ + "angular", + "triangle", + "components" ], - "lib": { - "entryFile": "index.ts" + "license": "MIT", + "peerDependencies": { + "@angular/common": "^12.2.0", + "@angular/core": "^12.2.0" + }, + "dependencies": { + "tslib": "^2.3.0" } } diff --git a/libs/triangle/package.json b/libs/triangle/package.json deleted file mode 100644 index 2d4c77dff..000000000 --- a/libs/triangle/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "@gradii/triangle", - "version": "2.3.2", - "description": "Triangle Packages", - "repository": { - "type": "git", - "url": "https://github.com/gradii/triangle.git" - }, - "keywords": [ - "angular", - "triangle", - "components" - ], - "license": "MIT", - "peerDependencies": { - "@angular/common": "^12.2.0", - "@angular/core": "^12.2.0" - }, - "dependencies": { - "tslib": "^2.3.0" - } -} diff --git a/libs/triangle/pagination/package.json b/libs/triangle/pagination/ng-package.json similarity index 100% rename from libs/triangle/pagination/package.json rename to libs/triangle/pagination/ng-package.json diff --git a/libs/triangle/popover/package.json b/libs/triangle/popover/ng-package.json similarity index 100% rename from libs/triangle/popover/package.json rename to libs/triangle/popover/ng-package.json diff --git a/libs/triangle/tree/package.json b/libs/triangle/progress/ng-package.json similarity index 64% rename from libs/triangle/tree/package.json rename to libs/triangle/progress/ng-package.json index 3b9bd979d..0a5bd5c3a 100644 --- a/libs/triangle/tree/package.json +++ b/libs/triangle/progress/ng-package.json @@ -1,8 +1,5 @@ -{ - "ngPackage": { + { "lib": { "entryFile": "public-api.ts" } - } - } - \ No newline at end of file + } \ No newline at end of file diff --git a/libs/triangle/project.json b/libs/triangle/project.json new file mode 100644 index 000000000..a4ca3c7ec --- /dev/null +++ b/libs/triangle/project.json @@ -0,0 +1,50 @@ +{ + "name": "triangle", + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "projectType": "library", + "sourceRoot": "libs/triangle/src", + "prefix": "tri", + "targets": { + "version": { + "executor": "@jscutlery/semver:version", + "options": { + "baseBranch": "master", + "releaseAs": "patch", + "postTargets": ["triangle:build"] + } + }, + "build": { + "executor": "@nrwl/angular:package", + "outputs": ["{workspaceRoot}/dist/libs/triangle"], + "options": { + "project": "libs/triangle/ng-package.json" + }, + "configurations": { + "production": { + "tsConfig": "libs/triangle/tsconfig.lib.prod.json" + }, + "development": { + "tsConfig": "libs/triangle/tsconfig.lib.json" + } + }, + "defaultConfiguration": "production" + }, + "test": { + "executor": "@nrwl/jest:jest", + "outputs": ["{workspaceRoot}/coverage/libs/triangle"], + "options": { + "jestConfig": "libs/triangle/jest.config.js", + "passWithNoTests": true + } + }, + "lint": { + "executor": "@nrwl/linter:eslint", + "options": { + "lintFilePatterns": [ + "libs/triangle/src/**/*.ts", + "libs/triangle/src/**/*.html" + ] + } + } + } +} diff --git a/libs/triangle/util/package.json b/libs/triangle/radio/ng-package.json similarity index 64% rename from libs/triangle/util/package.json rename to libs/triangle/radio/ng-package.json index 3b9bd979d..0a5bd5c3a 100644 --- a/libs/triangle/util/package.json +++ b/libs/triangle/radio/ng-package.json @@ -1,8 +1,5 @@ -{ - "ngPackage": { + { "lib": { "entryFile": "public-api.ts" } - } - } - \ No newline at end of file + } \ No newline at end of file diff --git a/libs/triangle/progress/package.json b/libs/triangle/rate/ng-package.json similarity index 100% rename from libs/triangle/progress/package.json rename to libs/triangle/rate/ng-package.json diff --git a/libs/triangle/radio/package.json b/libs/triangle/select/ng-package.json similarity index 100% rename from libs/triangle/radio/package.json rename to libs/triangle/select/ng-package.json diff --git a/libs/triangle/rate/package.json b/libs/triangle/sidebar/ng-package.json similarity index 100% rename from libs/triangle/rate/package.json rename to libs/triangle/sidebar/ng-package.json diff --git a/libs/triangle/select/package.json b/libs/triangle/sidenav/ng-package.json similarity index 100% rename from libs/triangle/select/package.json rename to libs/triangle/sidenav/ng-package.json diff --git a/libs/triangle/transfer/package.json b/libs/triangle/slider/ng-package.json similarity index 64% rename from libs/triangle/transfer/package.json rename to libs/triangle/slider/ng-package.json index 3b9bd979d..0a5bd5c3a 100644 --- a/libs/triangle/transfer/package.json +++ b/libs/triangle/slider/ng-package.json @@ -1,8 +1,5 @@ -{ - "ngPackage": { + { "lib": { "entryFile": "public-api.ts" } - } - } - \ No newline at end of file + } \ No newline at end of file diff --git a/libs/triangle/tree-view/package.json b/libs/triangle/spin/ng-package.json similarity index 64% rename from libs/triangle/tree-view/package.json rename to libs/triangle/spin/ng-package.json index 3b9bd979d..0a5bd5c3a 100644 --- a/libs/triangle/tree-view/package.json +++ b/libs/triangle/spin/ng-package.json @@ -1,8 +1,5 @@ -{ - "ngPackage": { + { "lib": { "entryFile": "public-api.ts" } - } - } - \ No newline at end of file + } \ No newline at end of file diff --git a/libs/triangle/sidebar/package.json b/libs/triangle/splitter/ng-package.json similarity index 100% rename from libs/triangle/sidebar/package.json rename to libs/triangle/splitter/ng-package.json diff --git a/libs/triangle/sidenav/package.json b/libs/triangle/steps/ng-package.json similarity index 100% rename from libs/triangle/sidenav/package.json rename to libs/triangle/steps/ng-package.json diff --git a/libs/triangle/slider/package.json b/libs/triangle/switch/ng-package.json similarity index 100% rename from libs/triangle/slider/package.json rename to libs/triangle/switch/ng-package.json diff --git a/libs/triangle/spin/package.json b/libs/triangle/tab-nav-bar/ng-package.json similarity index 100% rename from libs/triangle/spin/package.json rename to libs/triangle/tab-nav-bar/ng-package.json diff --git a/libs/triangle/splitter/package.json b/libs/triangle/tabs/ng-package.json similarity index 100% rename from libs/triangle/splitter/package.json rename to libs/triangle/tabs/ng-package.json diff --git a/libs/triangle/steps/package.json b/libs/triangle/tag/ng-package.json similarity index 100% rename from libs/triangle/steps/package.json rename to libs/triangle/tag/ng-package.json diff --git a/libs/triangle/switch/package.json b/libs/triangle/time-picker/ng-package.json similarity index 100% rename from libs/triangle/switch/package.json rename to libs/triangle/time-picker/ng-package.json diff --git a/libs/triangle/tab-nav-bar/package.json b/libs/triangle/timeline/ng-package.json similarity index 100% rename from libs/triangle/tab-nav-bar/package.json rename to libs/triangle/timeline/ng-package.json diff --git a/libs/triangle/tabs/package.json b/libs/triangle/tooltip/ng-package.json similarity index 100% rename from libs/triangle/tabs/package.json rename to libs/triangle/tooltip/ng-package.json diff --git a/libs/triangle/tag/package.json b/libs/triangle/transfer/ng-package.json similarity index 100% rename from libs/triangle/tag/package.json rename to libs/triangle/transfer/ng-package.json diff --git a/libs/triangle/time-picker/package.json b/libs/triangle/tree-view/ng-package.json similarity index 100% rename from libs/triangle/time-picker/package.json rename to libs/triangle/tree-view/ng-package.json diff --git a/libs/triangle/timeline/package.json b/libs/triangle/tree/ng-package.json similarity index 100% rename from libs/triangle/timeline/package.json rename to libs/triangle/tree/ng-package.json diff --git a/libs/triangle/tooltip/package.json b/libs/triangle/util/ng-package.json similarity index 100% rename from libs/triangle/tooltip/package.json rename to libs/triangle/util/ng-package.json diff --git a/nx.json b/nx.json index 57d5e9344..0a7a4fecf 100644 --- a/nx.json +++ b/nx.json @@ -1,7 +1,10 @@ { "$schema": "./node_modules/nx/schemas/nx-schema.json", "namedInputs": { - "default": ["{projectRoot}/**/*", "sharedGlobals"], + "default": [ + "{projectRoot}/**/*", + "sharedGlobals" + ], "production": [ "default", "!{projectRoot}/.eslintrc.json", @@ -20,8 +23,13 @@ "targetDefaults": { "@angular-devkit/build-angular:application": { "cache": true, - "dependsOn": ["^build"], - "inputs": ["production", "^production"] + "dependsOn": [ + "^build" + ], + "inputs": [ + "production", + "^production" + ] }, "@nx/eslint:lint": { "cache": true, @@ -34,7 +42,11 @@ }, "@nx/jest:jest": { "cache": true, - "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"], + "inputs": [ + "default", + "^production", + "{workspaceRoot}/jest.preset.js" + ], "options": { "passWithNoTests": true }, @@ -47,8 +59,19 @@ }, "@nx/angular:package": { "cache": true, - "dependsOn": ["^build"], - "inputs": ["production", "^production"] + "dependsOn": [ + "^build" + ], + "inputs": [ + "production", + "^production" + ] + }, + "build": { + "inputs": [ + "production", + "^production" + ] } }, "plugins": [