Merge pull request #1021 from SQ-UI/develop

Develop

Author: ardentia

.github/workflows/main.yml

@@ -47,3 +47,5 @@ jobs:
             ${{github.workspace}}/coverage/ng-datetime-picker/lcov.info:lcov
             ${{github.workspace}}/coverage/ng-sq-ui/lcov.info:lcov
             ${{github.workspace}}/coverage/ng-modal/lcov.info:lcov
+            ${{github.workspace}}/coverage/ng-form-elements/lcov.info:lcov
+            ${{github.workspace}}/coverage/ng-progress-bar/lcov.info:lcov

angular.json

@@ -337,6 +337,68 @@
           }
         }
       }
+    },
+    "ng-form-elements": {
+      "projectType": "library",
+      "root": "projects/ng-form-elements",
+      "sourceRoot": "projects/ng-form-elements/src",
+      "prefix": "lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "options": {
+            "project": "projects/ng-form-elements/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "projects/ng-form-elements/tsconfig.lib.prod.json"
+            },
+            "development": {
+              "tsConfig": "projects/ng-form-elements/tsconfig.lib.json"
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "projects/ng-form-elements/src/test.ts",
+            "tsConfig": "projects/ng-form-elements/tsconfig.spec.json",
+            "karmaConfig": "projects/ng-form-elements/karma.conf.js"
+          }
+        }
+      }
+    },
+    "ng-progress-bar": {
+      "projectType": "library",
+      "root": "projects/ng-progress-bar",
+      "sourceRoot": "projects/ng-progress-bar/src",
+      "prefix": "lib",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "options": {
+            "project": "projects/ng-progress-bar/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "projects/ng-progress-bar/tsconfig.lib.prod.json"
+            },
+            "development": {
+              "tsConfig": "projects/ng-progress-bar/tsconfig.lib.json"
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "projects/ng-progress-bar/src/test.ts",
+            "tsConfig": "projects/ng-progress-bar/tsconfig.spec.json",
+            "karmaConfig": "projects/ng-progress-bar/karma.conf.js"
+          }
+        }
+      }
     }
   },
   "defaultProject": "sq-ui",

package.json

@@ -4,14 +4,14 @@
   "scripts": {
     "ng": "ng",
     "start": "rimraf dist && ng serve --open",
-    "coverage": "npm run build:libs && ng test ng-sq-common && ng test ng-datatable && ng test ng-datetime-picker && ng test ng-sq-ui && ng test ng-modal",
+    "coverage": "npm run build:libs && ng test ng-sq-common && ng test ng-datatable && ng test ng-datetime-picker && ng test ng-modal && ng test ng-form-elements && ng test ng-progress-bar",
     "build": "ng build",
     "test": "ng test --watch=false --browsers=ChromeHeadless",
     "lint": "ng lint",
     "e2e": "ng e2e",
     "docs": "docsify serve docs",
-    "copy:styles": "copyfiles -f \"./projects/ng-sq-common/src/lib/styles/**/*.scss\" \"./dist/ng-sq-common/styles\" && copyfiles -f \"./projects/ng-sq-common/src/lib/sq-ui-theme.scss\" \"./dist/ng-sq-common/\" && copyfiles -f \"./projects/ng-sq-ui/src/lib/styles/**/*.scss\" \"./dist/ng-sq-ui/styles\"",
-    "build:libs": "ng build --configuration production ng-sq-common && ng build --configuration production ng-modal && ng build --configuration production ng-datetime-picker && ng build --configuration production ng-datatable && ng build --configuration production ng-sq-ui && npm run copy:styles",
+    "copy:styles": "copyfiles -f \"./projects/ng-sq-common/src/lib/styles/**/*.scss\" \"./dist/ng-sq-common/styles\" && copyfiles -f \"./projects/ng-sq-common/src/lib/sq-ui-theme.scss\" \"./dist/ng-sq-common/\"",
+    "build:libs": "ng build --configuration production ng-sq-common && ng build --configuration production ng-form-elements && ng build --configuration production ng-progress-bar && ng build --configuration production ng-modal && ng build --configuration production ng-datetime-picker && ng build --configuration production ng-datatable && ng build --configuration production ng-sq-ui && npm run copy:styles",
     "build:app:prod": "npm run build:libs && ng build",
     "contributors:add": "all-contributors add",
     "contributors:generate": "all-contributors generate"

projects/ng-form-elements/README.md

@@ -0,0 +1,42 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage'),
+      require('@angular-devkit/build-angular/plugins/karma')
+    ],
+    client: {
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    coverageReporter: {
+      dir: require('path').join(__dirname, '../../coverage/ng-form-elements'),
+      subdir: '.',
+      reporters: [
+        { type: 'html' },
+        { type: 'text-summary' },
+        { type: 'lcovonly' }
+      ]
+    },
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: false,
+    browsers: ['ChromeHeadless'],
+    // you can define custom flags
+    customLaunchers: {
+      ChromeHeadlessNoSandbox: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox'],
+      },
+    },
+    singleRun: true
+  });
+};

projects/ng-form-elements/karma.conf.js

@@ -0,0 +1,10 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../dist/ng-form-elements",
+  "lib": {
+    "entryFile": "src/index.ts"
+  },
+  "allowedNonPeerDependencies": [
+    "."
+  ]
+}

projects/ng-form-elements/ng-package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@sq-ui/ng-form-elements",
+  "version": "1.0.0",
+  "dependencies": {
+    "@sq-ui/ng-sq-common": "^1.0.0"
+  }
+}

projects/ng-form-elements/package.json

@@ -0,0 +1,20 @@
+/*
+ * Public API Surface of form-elements
+ */
+
+export * from './lib/ng-form-elements.module';
+export { NgFormElementsModule } from './lib/ng-form-elements.module';
+export { InputComponent } from './lib/input/input.component';
+export { DropdownComponent } from './lib/dropdown/dropdown.component';
+export { TagsInputComponent } from './lib/tags-input/tags-input.component';
+export { RadiobuttonComponent } from './lib/radiobutton/radiobutton.component';
+export { FormGroupComponent } from './lib/form-group/form-group.component';
+export { TypeaheadComponent } from './lib/typeahead/typeahead.component';
+export { CheckboxComponent } from './lib/checkbox/checkbox.component';
+export { ButtonComponent } from './lib/button/button.component';
+export { TextareaComponent } from './lib/textarea/textarea.component';
+export { SqCheckboxLabelTemplateDirective } from './lib/checkbox/checkbox.template.directive';
+export { SqDropdownOptionTemplateDirective, SqDropdownChevronTemplateDirective, SqDropdownSelectedOptionTemplateDirective } from './lib/dropdown/dropdown.template.directive';
+export { SqRadiobuttonLabelTemplateDirective } from './lib/radiobutton/radiobutton.template.directive';
+export { SqTagTemplateDirective } from './lib/tags-input/tags-input.template.directive';
+export { SqTypeaheadOptionTemplateDirective, SqTypeaheadSelectedOptionTemplateDirective } from './lib/typeahead/typeahead.template.directive';

projects/ng-form-elements/src/index.ts

@@ -1,4 +1,4 @@
-@import "../../styles/colors";
+@import "../../../../ng-sq-common/src/lib/styles/colors.scss";
 
 .sq {
   .action-button {