@progress/kendo-typescript-tasks 10.0.17-cdn-bundle.14 → 10.0.17-dev.12

package/api.js

@@ -3,15 +3,16 @@
 const execSync = require('child_process').execSync;
 const path = require('path');
 const typedoc = require('gulp-typedoc');
-const { merge } = require('lodash');
+const deepAssign = require('lodash.merge');
 
 const api = require('./src/api/generator.js');
 const apiConfig = require('./api.config.js');
 
 module.exports = (gulp, userConfig) => {
     const series = gulp.series;
+    const parallel = gulp.parallel;
 
-    const config = merge({}, apiConfig, userConfig);
+    const config = deepAssign({}, apiConfig, userConfig);
     const DECLARATIONS = ["typings/index.d.ts", "node_modules/@types/core-js/index.d.ts"];
 
     gulp.task('api-json', () => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@progress/kendo-typescript-tasks",
   "description": "Kendo UI TypeScript package gulp tasks",
   "main": "gulp-tasks.js",
-  "version": "10.0.17-cdn-bundle.14+6880232",
+  "version": "10.0.17-dev.12+3c5a474",
   "author": "Telerik",
   "license": "Apache-2.0",
   "scripts": {
@@ -18,7 +18,7 @@
     "typescript": "^3.4.5"
   },
   "dependencies": {
-    "@progress/kendo-common-tasks": "7.9.1-cdn-bundle.14+6880232",
+    "@progress/kendo-common-tasks": "^7.9.0",
     "core-js": "^2.2.2",
     "del": "2.2.2",
     "gulp": "^4.0.0",
@@ -27,7 +27,7 @@
     "gulp-typedoc": "~2.2.2",
     "handlebars": "^4.0.5",
     "highlight.js": "9.14.2",
-    "lodash": "^4.6.0",
+    "lodash.merge": "^4.6.0",
     "mkdirp": "^0.5.0",
     "source-map-loader": "^0.1.5",
     "ts-loader": "4.1.0",
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6880232399c8f232a422f634d0cd64abba5086e3"
+  "gitHead": "3c5a47420cf2d2fb60c8aacb5463eb8e67ecc8d8"
 }

package/src/api/generator.js

@@ -83,13 +83,11 @@ const normalizeUnionReferences = (element, members) => {
                     return child.name === type.name;
                 });
 
-                let toReplace = [];
                 if (unionReference && unionReference.kind === 'union') {
                     normalizeUnionReferences(unionReference, members);
-                    toReplace = unionReference.type.types;
+                    const toReplace = unionReference.type.types;
+                    types.splice.apply(types, [idx, 1].concat(toReplace));
                 }
-
-                types.splice.apply(types, [idx, 1].concat(toReplace));
             }
         }
     }

package/src/api/type-utils.js

@@ -135,6 +135,10 @@ const typeString = (prop) => {
         return unionTypes(prop).join(' | ');
     }
 
+    if (type.type === 'stringLiteral') {
+        return `'${type.value}'`;
+    }
+
     return singleTypeString(prop.type);
 };
 

package/src/api/union-page.hbs

@@ -3,7 +3,7 @@
 # {{name}}
 {{comment}}
 
-## Values
+## Members
 
 {{#each types}}
 * {{this}}

package/webpack.config.js

@@ -1,6 +1,5 @@
-const path = require('path');
 const commonTasks = require('@progress/kendo-common-tasks');
-const { umdExternals } = require('@progress/kendo-common-tasks/umd-externals');
+const path = require('path');
 
 const sourceExtensions = [ '.ts' ];
 const nodeModulesPath = path.join(__dirname, 'node_modules');
@@ -9,9 +8,36 @@ const resolve = commonTasks.resolveConfig(sourceExtensions, nodeModulesPath);
 
 const packageInfo = require(path.join(process.cwd(), 'package.json'));
 const packageKeys = (key) => Object.keys(packageInfo[key] || {});
-const peerDependencies = packageKeys('peerDependencies');
-const allDependencies = packageKeys('dependencies').concat(peerDependencies);
+
 const matchStartsWith = (key) => new RegExp(`^${key}`);
+const deps = packageKeys('dependencies').concat(packageKeys('peerDependencies'));
+const packageDependencies = deps.map(matchStartsWith);
+
+//list all Angular packages that should not appear in CDN bundles
+const angularPeers = [
+    '@angular/animations'
+];
+
+//list all packages that should not appear in CDN bundles
+const peers = [
+    '@progress/kendo-angular-intl',
+    '@progress/kendo-angular-l10n',
+    '@progress/kendo-drawing'
+];
+const internal = dep => dep.match(/@progress|@telerik/);
+const isPeer = dep => peers.find(pkg => pkg === dep);
+const isException = dep => dep.match(/tslib/);
+
+const prebuilt = [
+    /jszip[\/\\]dist[\/\\]jszip.js/,
+    /pako[\/\\]dist[\/\\]pako_deflate.js/
+];
+
+const cdnExternals = deps
+    .filter((dep) => ((!internal(dep) || isPeer(dep)) && !isException(dep)))
+    .concat(angularPeers)
+    .map(matchStartsWith);
+
 
 const tsLoader = (compilerOptions) => ({
     test: /\.ts?$/,
@@ -22,21 +48,8 @@ const tsLoader = (compilerOptions) => ({
     }
 });
 
-const cdn = commonTasks.webpackCommonConfig({
-    resolve,
-    stats: { assets: false },
-    output: { libraryTarget: 'umd' },
-    plugins: [],
-    optimization: {
-        minimize: true
-    },
-    module: {
-        rules: [ tsLoader({ declaration: false }) ]
-    }
-});
 
 module.exports = {
-    // dist/npm
     npmPackage: commonTasks.webpackCommonConfig({
         resolve,
 
@@ -45,7 +58,7 @@ module.exports = {
         externals: [
             /^\.\//,
             /^\.\.\//
-        ].concat(allDependencies.map(matchStartsWith)),
+        ].concat(packageDependencies),
 
         module: {
             rules: [ tsLoader({ sourceMap: true }) ]
@@ -54,25 +67,33 @@ module.exports = {
         devtool: 'source-map'
     }),
 
-    // dist/cdn/js/<package-name>.js
-    CDN: {
-        ...cdn,
-        externals: umdExternals(peerDependencies)
-    },
+    CDN: commonTasks.webpackCommonConfig({
+        resolve,
 
-    // dist/cdn/main.js
-    umdPackage: {
-        ...cdn,
-        externals: umdExternals(allDependencies)
-    },
+        stats: { assets: false },
+
+        output: { libraryTarget: 'umd' },
+
+        plugins: [
+        ],
+        optimization: {
+            minimize: true
+        },
+        externals: cdnExternals,
+
+        module: {
+            rules: [ tsLoader({ declaration: false }) ],
+            noParse: prebuilt
+        }
+    }),
 
     dev: commonTasks.webpackDevConfig({
         resolve,
         rules: [ tsLoader({ sourceMap: true }) ],
+        noParse: prebuilt,
         entries: 'examples/**/*.ts'
     }),
 
-    // dist/systemjs/<package-name>.js
     systemjs: commonTasks.webpackCommonConfig({
         resolve,
 
@@ -81,5 +102,25 @@ module.exports = {
         module: {
             rules: [ tsLoader({ declaration: false }) ]
         }
+    }),
+
+    umdPackage: commonTasks.webpackCommonConfig({
+        resolve,
+
+        stats: { assets: false },
+
+        output: { libraryTarget: 'umd' },
+
+        externals: packageDependencies,
+
+        plugins: [
+        ],
+        optimization: {
+            minimize: true
+        },
+        module: {
+            rules: [ tsLoader({ declaration: false }) ],
+            noParse: prebuilt
+        }
     })
 };