Skip to content

Commit

Permalink
Merge pull request #10 from zahmo/v18.x.x
Browse files Browse the repository at this point in the history
V18.x.x
  • Loading branch information
zahmo authored Oct 14, 2024
2 parents 7cfa43b + 2836dfc commit 1d76a2b
Show file tree
Hide file tree
Showing 16 changed files with 362 additions and 173 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,22 @@ A [JSON Schema](http://json-schema.org) Form builder for Angular, similar to, an

## Packages

* [`@ng-formworks/core`][gh_core_project] [![npm version][npm_core_badge]][npm_core_ver][![npm RC version][npm_core_badge_alpha]][npm_core_ver_alpha]
* [`@ng-formworks/core`][gh_core_project] [![npm version][npm_core_badge]][npm_core_ver]

* [`@ng-formworks/cssframework`][gh_cssframework_project] [![npm version][npm_cssframework_badge]][npm_cssframework_ver][![npm RC version][npm_cssframework_badge_alpha]][npm_cssframework_ver_alpha]
* [`@ng-formworks/cssframework`][gh_cssframework_project] [![npm version][npm_cssframework_badge]][npm_cssframework_ver]

* [`@ng-formworks/bootstrap3`][gh_bootstrap3_project] [![npm version][npm_bootstrap3_badge]][npm_bootstrap3_ver][![npm RC version][npm_bootstrap3_badge_alpha]][npm_bootstrap3_ver_alpha]
* [`@ng-formworks/bootstrap3`][gh_bootstrap3_project] [![npm version][npm_bootstrap3_badge]][npm_bootstrap3_ver]

* [`@ng-formworks/bootstrap4`][gh_bootstrap4_project] [![npm version][npm_bootstrap4_badge]][npm_bootstrap4_ver][![npm RC version][npm_bootstrap4_badge_alpha]][npm_bootstrap4_ver_alpha]
* [`@ng-formworks/bootstrap4`][gh_bootstrap4_project] [![npm version][npm_bootstrap4_badge]][npm_bootstrap4_ver]


* [`@ng-formworks/bootstrap5`][gh_bootstrap5_project] [![npm version][npm_bootstrap5_badge]][npm_bootstrap5_ver][![npm RC version][npm_bootstrap5_badge_alpha]][npm_bootstrap5_ver_alpha]
* [`@ng-formworks/bootstrap5`][gh_bootstrap5_project] [![npm version][npm_bootstrap5_badge]][npm_bootstrap5_ver]


* [`@ng-formworks/daisyui`][gh_daisyui_project] [![npm version][npm_daisyui_badge]][npm_daisyui_ver][![npm RC version][npm_daisyui_badge_alpha]][npm_daisyui_ver_alpha]
* [`@ng-formworks/daisyui`][gh_daisyui_project] [![npm version][npm_daisyui_badge]][npm_daisyui_ver]


* [`@ng-formworks/material`][gh_material_project] [![npm version][npm_material_badge]][npm_material_ver][![npm RC version][npm_material_badge_alpha]][npm_material_ver_alpha]
* [`@ng-formworks/material`][gh_material_project] [![npm version][npm_material_badge]][npm_material_ver]

## Check out the live demo and play with the examples

Expand Down
6 changes: 6 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,9 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ng-formworks-daisyui/src/test.ts",
"tsConfig": "projects/ng-formworks-daisyui/tsconfig.spec.json",
"karmaConfig": "projects/ng-formworks-daisyui/karma.conf.js",
"polyfills": [
"zone.js",
"zone.js/testing"
Expand Down Expand Up @@ -278,7 +280,9 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ng-formworks-cssframework/src/test.ts",
"tsConfig": "projects/ng-formworks-cssframework/tsconfig.spec.json",
"karmaConfig": "projects/ng-formworks-cssframework/karma.conf.js",
"polyfills": [
"zone.js",
"zone.js/testing"
Expand Down Expand Up @@ -311,7 +315,9 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/ng-formworks-bootstrap5/src/test.ts",
"tsConfig": "projects/ng-formworks-bootstrap5/tsconfig.spec.json",
"karmaConfig": "projects/ng-formworks-bootstrap5/karma.conf.js",
"polyfills": [
"zone.js",
"zone.js/testing"
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
"Angular 16",
"Angular17",
"Angular 17",
"Angular 18",
"ng15",
"ng16",
"ng17",
"ng18",
"JSON Schema",
"form",
"forms",
Expand Down
81 changes: 40 additions & 41 deletions projects/ng-formworks-bootstrap3/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,47 +1,46 @@
// 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/ajsf-bootstrap3'),
reporters: [
{
type: '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
},
{
type: 'lcov',
coverageReporter: {
dir: require('path').join(__dirname, '../../coverage/ngformworks-bootstrap3'),
reporters: [{
type: 'html',
},
{
type: 'lcov',
},
{
type: 'text-summary',
},
],
},
{
type: 'text-summary',
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false,
browsers: ['Chrome', 'ChromeHeadlessCI'],
customLaunchers: {
ChromeHeadlessCI: {
base: 'ChromeHeadless',
flags: ['--no-sandbox'],
},
},
],
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false,
browsers: ['Chrome', 'ChromeHeadlessCI'],
customLaunchers: {
ChromeHeadlessCI: {
base: 'ChromeHeadless',
flags: ['--no-sandbox'],
},
},
});
};
});
};
79 changes: 39 additions & 40 deletions projects/ng-formworks-bootstrap4/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,46 +1,45 @@
// 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/ajsf-bootstrap4'),
reporters: [
{
type: '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
},
{
type: 'lcov',
coverageReporter: {
dir: require('path').join(__dirname, '../../coverage/ngformworks-bootstrap4'),
reporters: [{
type: 'html',
},
{
type: 'lcov',
},
{
type: 'text-summary',
},
],
},
{
type: 'text-summary',
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
singleRun: false,
browsers: ['Chrome', 'ChromeHeadlessCI'],
customLaunchers: {
ChromeHeadlessCI: {
base: 'ChromeHeadless',
flags: ['--no-sandbox'],
},
},
],
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
singleRun: false,
browsers: ['Chrome', 'ChromeHeadlessCI'],
customLaunchers: {
ChromeHeadlessCI: {
base: 'ChromeHeadless',
flags: ['--no-sandbox'],
},
},
});
};
});
};
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { CommonModule } from '@angular/common';
import { HttpClient, HttpHandler } from '@angular/common/http';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {
JsonSchemaFormModule,
JsonSchemaFormService,
WidgetLibraryModule
} from '@ng-formworks/core';
import { CssFrameworkComponent } from '@ng-formworks/cssframework';
import { Bootstrap4FrameworkComponent } from './bootstrap4-framework.component';

describe('Bootstrap4FrameworkComponent', () => {
Expand All @@ -18,8 +20,8 @@ describe('Bootstrap4FrameworkComponent', () => {
CommonModule,
WidgetLibraryModule,
],
declarations: [Bootstrap4FrameworkComponent],
providers: [JsonSchemaFormService]
declarations: [Bootstrap4FrameworkComponent,CssFrameworkComponent],
providers: [JsonSchemaFormService, HttpClient,HttpHandler]
})
.compileComponents();
}));
Expand Down
45 changes: 45 additions & 0 deletions projects/ng-formworks-bootstrap5/karma.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// 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/ngformworks-bootstrap5'),
reporters: [{
type: 'html',
},
{
type: 'lcov',
},
{
type: 'text-summary',
},
],
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
singleRun: false,
browsers: ['Chrome', 'ChromeHeadlessCI'],
customLaunchers: {
ChromeHeadlessCI: {
base: 'ChromeHeadless',
flags: ['--no-sandbox'],
},
},
});
};
6 changes: 5 additions & 1 deletion projects/ng-formworks-bootstrap5/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": [
"jasmine"
"jasmine",
"node"
]
},
"files": [
"src/test.ts"
],
"include": [
"**/*.spec.ts",
"**/*.d.ts"
Expand Down
Loading

0 comments on commit 1d76a2b

Please sign in to comment.