Skip to content

Commit

Permalink
Merge pull request #500 from udos86/development
Browse files Browse the repository at this point in the history
1.4.30
  • Loading branch information
udos86 committed Sep 13, 2017
2 parents 06a832c + 6c0fa31 commit c4a14f8
Show file tree
Hide file tree
Showing 176 changed files with 358 additions and 342 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Expand Up @@ -2,11 +2,13 @@
.DS_STORE
npm-debug.log

@ng2-dynamic-forms/

coverage/
dist/
docs/
node_modules/
test/
@ng2-dynamic-forms/

sample/aot/
sample/app/**/*.js
Expand All @@ -16,4 +18,3 @@ sample/dist
sample/fonts
sample/images

node_modules/
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -5,7 +5,7 @@ node_js:
before_install:
- echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc
script:
- npm run build:modules
- npm run build:packages
- npm run tests:unit
after_success:
- if [ -n "$TRAVIS_TAG" ]; then
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,19 @@
# 1.4.30

### **Announcements**

* **This will be probably the last patch version before Angular 5**
* **Starting with Angular 5 ng2 Dynamic Forms will be released under new name ngx-dynamic-forms**

### **Features**

* Minor template improvements:
* full support for grid classes in Basic, Material and Kendo
* class `k-required` is now automatically added to error messages in Kendo for color styling
* `<ng-content>` has been removed as it has little benefit and never been officially documented
* Library code now passes `noUnusedParameters` and `strictNullChecks` TypeScript transpiler checks (closes [#497](https://github.com/udos86/ng2-dynamic-forms/issues/497))


# 1.4.29

### **Bugfixes**
Expand Down
2 changes: 1 addition & 1 deletion build/tasks/bundle-webpack.js
Expand Up @@ -11,7 +11,7 @@ module.exports = function (config) {
throw new util.PluginError("webpack", error);
}

util.log("bundle:modules", stats.toString({
util.log("bundle:packages", stats.toString({
chunks: false,
colors: true,
hash: false,
Expand Down
68 changes: 34 additions & 34 deletions gulpfile.js
Expand Up @@ -14,14 +14,14 @@ const TASK_BUNDLE_ROLLUP = require("./build/tasks/bundle-rollup-stream"),
TASK_DOC_TYPESCRIPT = require("./build/tasks/doc-typescript");

const NPM_SCOPE = "@ng2-dynamic-forms",
SRC_PATH = "./modules",
SRC_PATH = "./packages",
DIST_BASE_PATH = "./dist",
DIST_PATH = `${DIST_BASE_PATH}/${NPM_SCOPE}`,
NPM_BASE_PATH = "./node_modules",
NPM_PATH = `${NPM_BASE_PATH}/${NPM_SCOPE}`,
TEST_PATH = "./test",
MODULE_TASKS = [],
MODULES = [
PACKAGE_TASKS = [],
PACKAGES = [
"core",
"ui-basic",
"ui-bootstrap",
Expand All @@ -33,13 +33,13 @@ const NPM_SCOPE = "@ng2-dynamic-forms",
"ui-primeng"
];

MODULES.forEach(moduleName => {
PACKAGES.forEach(packageName => {

let taskName = `bundle:${moduleName}`;
let taskName = `bundle:${packageName}`;

gulp.task(taskName, TASK_BUNDLE_ROLLUP(DIST_PATH, moduleName, "ng2DF", pkg, DIST_PATH));
gulp.task(taskName, TASK_BUNDLE_ROLLUP(DIST_PATH, packageName, "ng2DF", pkg, DIST_PATH));

MODULE_TASKS.push(taskName);
PACKAGE_TASKS.push(taskName);
});


Expand All @@ -53,7 +53,7 @@ gulp.task("increment:version:patch",
TASK_INCREMENT_VERSION(pkg, ["./package.json", `${SRC_PATH}/**/package.json`], "PATCH", SRC_PATH));


gulp.task("lint:modules",
gulp.task("lint:packages",
TASK_LINT_TYPESCRIPT([`${SRC_PATH}/**/*.ts`], "./tslint.json"));


Expand All @@ -67,17 +67,17 @@ gulp.task("clean:dist:npm",
TASK_CLEAN([`${NPM_PATH}**/*`]));


gulp.task("copy:modules:dist",
gulp.task("copy:packages:dist",
TASK_COPY([`${SRC_PATH}/**/*.*`], DIST_PATH));

gulp.task("copy:modules:test",
gulp.task("copy:packages:test",
TASK_COPY([`${SRC_PATH}/**/*.{html,ts}`], TEST_PATH));

gulp.task("copy:dist:npm",
TASK_COPY([`${DIST_BASE_PATH}/**/*.*`], NPM_BASE_PATH));


gulp.task("preprocess:modules:dist",
gulp.task("preprocess:packages:dist",
TASK_PREPROCESS(`${DIST_PATH}/**/*.js`, DIST_PATH));

gulp.task("inline:ng2-templates:dist",
Expand All @@ -87,63 +87,63 @@ gulp.task("remove:moduleId:dist",
TASK_REMOVE_MODULE_ID([`${DIST_PATH}/**/*`], DIST_PATH));


gulp.task("transpile:modules:dist",
TASK_TRANSPILE_TYPESCRIPT([`${DIST_PATH}/**/*.ts`], DIST_PATH, "./tsconfig.modules.json", "es2015"));
gulp.task("transpile:packages:dist",
TASK_TRANSPILE_TYPESCRIPT([`${DIST_PATH}/**/*.ts`], DIST_PATH, "./tsconfig.packages.json", "es2015"));

gulp.task("transpile:modules:debug",
TASK_TRANSPILE_TYPESCRIPT([`${DIST_PATH}/**/*.ts`], DIST_PATH, "./tsconfig.modules.json", "commonjs"));
gulp.task("transpile:packages:debug",
TASK_TRANSPILE_TYPESCRIPT([`${DIST_PATH}/**/*.ts`], DIST_PATH, "./tsconfig.packages.json", "commonjs"));

gulp.task("transpile:modules:test",
TASK_TRANSPILE_TYPESCRIPT([`${TEST_PATH}/**/*.ts`], TEST_PATH, "./tsconfig.modules.json", "commonjs"));
gulp.task("transpile:packages:test",
TASK_TRANSPILE_TYPESCRIPT([`${TEST_PATH}/**/*.ts`], TEST_PATH, "./tsconfig.packages.json", "commonjs"));


gulp.task("build:modules:debug", function (done) {
gulp.task("build:packages:debug", function (done) {

runSequence(
"transpile:modules:debug",
"transpile:packages:debug",
done
);
});

gulp.task("build:modules:dist", function (done) {
gulp.task("build:packages:dist", function (done) {

runSequence(
"lint:modules",
"lint:packages",
"clean:dist",
"copy:modules:dist",
"transpile:modules:dist",
"preprocess:modules:dist",
"copy:packages:dist",
"transpile:packages:dist",
"preprocess:packages:dist",
"inline:ng2-templates:dist",
...MODULE_TASKS,
...PACKAGE_TASKS,
"remove:moduleId:dist",
"copy:dist:npm",
done
);
});

gulp.task("build:modules:test", function (done) {
gulp.task("build:packages:test", function (done) {

runSequence(
"clean:test",
"copy:modules:test",
"transpile:modules:test",
"copy:packages:test",
"transpile:packages:test",
done
);
});


gulp.task("build:modules", function (done) {
gulp.task("build:packages", function (done) {

runSequence(
"build:modules:dist",
"build:packages:dist",
"copy:dist:npm",
"build:modules:test",
"build:packages:test",
done
);
});


gulp.task("doc:modules",
gulp.task("doc:packages",
TASK_DOC_TYPESCRIPT([`${SRC_PATH}/*/src/**/!(*.spec).ts`], {
externalPattern: `${DIST_PATH}/**/*.*`,
excludeExternals: true,
Expand All @@ -160,6 +160,6 @@ gulp.task("doc:modules",
));


gulp.task("watch:modules", function () {
gulp.watch([`${SRC_PATH}/**/*.*`], ["build:modules"]);
gulp.task("watch:packages", function () {
gulp.watch([`${SRC_PATH}/**/*.*`], ["build:packages"]);
});
10 changes: 4 additions & 6 deletions karma-test-shim.js
Expand Up @@ -4,8 +4,8 @@ function isSpecFile(filePath) {
return filePath.startsWith("/base/test/") && filePath.slice(-8) === ".spec.js";
}

function toImportPromise(module) {
return System.import(module);
function importModule(modulePath) {
return System.import(modulePath);
}

window.Error.stackTraceLimit = Infinity;
Expand Down Expand Up @@ -131,14 +131,12 @@ Promise.all([

return ngCoreTesting.TestBed.initTestEnvironment(
ngPlatformBrowserDynamicTesting.BrowserDynamicTestingModule,
ngPlatformBrowserDynamicTesting.platformBrowserDynamicTesting()
);
ngPlatformBrowserDynamicTesting.platformBrowserDynamicTesting());

}).then(function () {

return Promise.all(Object.keys(karma.files)
.filter(isSpecFile)
.map(toImportPromise)
);
.map(importModule));

}).then(karma.start, karma.error);
36 changes: 18 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c4a14f8

Please sign in to comment.