@progress/kendo-typescript-tasks 10.0.16 → 10.0.17-cdn-bundle.15

package/api.js

@@ -3,16 +3,15 @@
 const execSync = require('child_process').execSync;
 const path = require('path');
 const typedoc = require('gulp-typedoc');
-const deepAssign = require('lodash.merge');
+const { merge } = require('lodash');
 
 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 = deepAssign({}, apiConfig, userConfig);
+    const config = merge({}, 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.16",
+  "version": "10.0.17-cdn-bundle.15+f4928b1",
   "author": "Telerik",
   "license": "Apache-2.0",
   "scripts": {
@@ -18,7 +18,7 @@
     "typescript": "^3.4.5"
   },
   "dependencies": {
-    "@progress/kendo-common-tasks": "^7.9.0",
+    "@progress/kendo-common-tasks": "7.9.1-cdn-bundle.15+f4928b1",
     "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.merge": "^4.6.0",
+    "lodash": "^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": "4b5e740a17a5345f38c2b01393c577d3440e1954"
+  "gitHead": "f4928b18c0124eef30de4949ca74841e7ae01a39"
 }

package/webpack.config.js

@@ -1,5 +1,6 @@
-const commonTasks = require('@progress/kendo-common-tasks');
 const path = require('path');
+const commonTasks = require('@progress/kendo-common-tasks');
+const { umdExternals } = require('@progress/kendo-common-tasks/umd-externals');
 
 const sourceExtensions = [ '.ts' ];
 const nodeModulesPath = path.join(__dirname, 'node_modules');
@@ -8,36 +9,9 @@ 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?$/,
@@ -48,8 +22,21 @@ 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,
 
@@ -58,7 +45,7 @@ module.exports = {
         externals: [
             /^\.\//,
             /^\.\.\//
-        ].concat(packageDependencies),
+        ].concat(allDependencies.map(matchStartsWith)),
 
         module: {
             rules: [ tsLoader({ sourceMap: true }) ]
@@ -67,33 +54,25 @@ module.exports = {
         devtool: 'source-map'
     }),
 
-    CDN: commonTasks.webpackCommonConfig({
-        resolve,
+    // dist/cdn/js/<package-name>.js
+    CDN: {
+        ...cdn,
+        externals: umdExternals(peerDependencies)
+    },
 
-        stats: { assets: false },
-
-        output: { libraryTarget: 'umd' },
-
-        plugins: [
-        ],
-        optimization: {
-            minimize: true
-        },
-        externals: cdnExternals,
-
-        module: {
-            rules: [ tsLoader({ declaration: false }) ],
-            noParse: prebuilt
-        }
-    }),
+    // dist/cdn/main.js
+    umdPackage: {
+        ...cdn,
+        externals: umdExternals(allDependencies)
+    },
 
     dev: commonTasks.webpackDevConfig({
         resolve,
         rules: [ tsLoader({ sourceMap: true }) ],
-        noParse: prebuilt,
         entries: 'examples/**/*.ts'
     }),
 
+    // dist/systemjs/<package-name>.js
     systemjs: commonTasks.webpackCommonConfig({
         resolve,
 
@@ -102,25 +81,5 @@ 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
-        }
     })
 };