Skip to content

chore: create cdk-experimental package #9059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@
/src/material-experimental/** @jelbourn
/src/material-experimental/dialog/** @jelbourn @josephperrott @crisbeto

# CDK experimental package
/src/cdk-experimental/** @jelbourn

# Docs examples & guides
/guides/** @amcdnl @jelbourn
/src/material-examples/** @amcdnl @jelbourn
Expand Down
9 changes: 9 additions & 0 deletions src/cdk-experimental/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/**
* @license
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

export * from './public-api';
25 changes: 25 additions & 0 deletions src/cdk-experimental/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"name": "@angular/cdk-experimental",
"version": "0.0.0-PLACEHOLDER",
"description": "Experimental components for Angular CDK",
"main": "./bundles/cdk-experimental.umd.js",
"module": "./esm5/cdk-experimental.es5.js",
"es2015": "./esm2015/cdk-experimental.js",
"typings": "./cdk-experimental.d.ts",
"repository": {
"type": "git",
"url": "https://github.com/angular/material2.git"
},
"license": "MIT",
"bugs": {
"url": "https://github.com/angular/material2/issues"
},
"homepage": "https://github.com/angular/material2#readme",
"peerDependencies": {
"@angular/material": "0.0.0-PLACEHOLDER",
"@angular/core": "0.0.0-NG"
},
"dependencies": {
"tslib": "^1.7.1"
}
}
9 changes: 9 additions & 0 deletions src/cdk-experimental/public-api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/**
* @license
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

export * from './version';
40 changes: 40 additions & 0 deletions src/cdk-experimental/tsconfig-build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// TypeScript config file that is used to compile the experimental package into ES2015.
{
"compilerOptions": {
"baseUrl": ".",
"declaration": true,
"stripInternal": false,
"experimentalDecorators": true,
"noUnusedParameters": true,
"strictNullChecks": true,
"importHelpers": true,
"newLine": "lf",
"module": "es2015",
"moduleResolution": "node",
"outDir": "../../dist/packages/cdk-experimental",
"rootDir": ".",
"sourceMap": true,
"inlineSources": true,
"target": "es2015",
"lib": ["es2015", "dom"],
"skipLibCheck": true,
"types": [],
"paths": {
"@angular/material/*": ["../../dist/packages/material/*"],
"@angular/material": ["../../dist/packages/material/public-api"],
"@angular/cdk/*": ["../../dist/packages/cdk/*"],
"@angular/cdk": ["../../dist/packages/cdk"]
}
},
"files": [
"public-api.ts",
"typings.d.ts"
],
"angularCompilerOptions": {
"annotateForClosureCompiler": true,
"strictMetadataEmit": true,
"flatModuleOutFile": "index.js",
"flatModuleId": "@angular/cdk-experimental",
"skipTemplateCodegen": true
}
}
21 changes: 21 additions & 0 deletions src/cdk-experimental/tsconfig-tests.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// TypeScript config file that extends the default build tsconfig file. This config is used to
// also compile the unit-test files. Since the code will run inside of the browser, the target is
// set to ES5. Also the format needs to be CommonJS for Karma.
{
"extends": "./tsconfig-build",
"compilerOptions": {
"importHelpers": false,
"module": "commonjs",
"target": "es5",
"types": ["jasmine"]
},
"angularCompilerOptions": {
"strictMetadataEmit": true,
"skipTemplateCodegen": true,
"emitDecoratorMetadata": true
},
"include": [
"**/*.spec.ts",
"index.ts"
]
}
15 changes: 15 additions & 0 deletions src/cdk-experimental/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Configuration for IDEs only.
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"rootDir": "..",
"baseUrl": ".",
"paths": {
"@angular/cdk/*": ["../cdk/*"],
"@angular/cdk": ["../cdk"],
"@angular/material/*": ["../lib/*"],
"@angular/material": ["../lib/public-api.ts"]
}
},
"include": ["./**/*.ts"]
}
1 change: 1 addition & 0 deletions src/cdk-experimental/typings.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare var module: {id: string};
12 changes: 12 additions & 0 deletions src/cdk-experimental/version.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* @license
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import {Version} from '@angular/core';

/** Current version of the CDK Experimental package. */
export const VERSION = new Version('0.0.0-PLACEHOLDER');
2 changes: 2 additions & 0 deletions src/demo-app/system-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ System.config({
'@angular/material-experimental': 'dist/packages/material-experimental/index.js',
'@angular/material-moment-adapter': 'dist/packages/material-moment-adapter/index.js',
'@angular/cdk': 'dist/packages/cdk/index.js',
'@angular/cdk-experimental': 'dist/packages/cdk-experimental/index.js',

'@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
'@angular/cdk/accordion': 'dist/packages/cdk/accordion/index.js',
'@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
Expand Down
2 changes: 2 additions & 0 deletions src/demo-app/tsconfig-aot.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"@angular/cdk": ["../../dist/releases/cdk"],
"@angular/material-experimental/*": ["../../dist/releases/material-experimental/*"],
"@angular/material-experimental": ["../../dist/releases/material-experimental"],
"@angular/cdk-experimental/*": ["../../dist/releases/cdk-experimental/*"],
"@angular/cdk-experimental": ["../../dist/releases/cdk-experimental"],
"@angular/material-moment-adapter": ["../../dist/releases/material-moment-adapter"]
}
},
Expand Down
2 changes: 2 additions & 0 deletions src/demo-app/tsconfig-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
"@angular/cdk": ["../../dist/packages/cdk"],
"@angular/material-experimental/*": ["../../dist/packages/material-experimental/*"],
"@angular/material-experimental": ["../../dist/packages/material-experimental"],
"@angular/cdk-experimental/*": ["../../dist/packages/cdk-experimental/*"],
"@angular/cdk-experimental": ["../../dist/packages/cdk-experimental"],
"@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter"]
}
},
Expand Down
2 changes: 2 additions & 0 deletions src/demo-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"@angular/material": ["../lib/public-api.ts"],
"@angular/material-experimental/*": ["../material-experimental/*"],
"@angular/material-experimental": ["../material-experimental"],
"@angular/cdk-experimental/*": ["../cdk-experimental/*"],
"@angular/cdk-experimental": ["../cdk-experimental"],
"@angular/material-moment-adapter": ["../material-moment-adapter/public-api.ts"]
}
},
Expand Down
2 changes: 2 additions & 0 deletions src/e2e-app/system-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ System.config({
'@angular/material-experimental': 'dist/bundles/material-experimental.umd.js',
'@angular/material-moment-adapter': 'dist/bundles/material-moment-adapter.umd.js',
'@angular/cdk': 'dist/bundles/cdk.umd.js',
'@angular/cdk-experimental': 'dist/bundles/cdk-experimental.umd.js',

'@angular/cdk/a11y': 'dist/bundles/cdk-a11y.umd.js',
'@angular/cdk/accordion': 'dist/bundles/cdk-accordion.umd.js',
'@angular/cdk/bidi': 'dist/bundles/cdk-bidi.umd.js',
Expand Down
2 changes: 2 additions & 0 deletions src/e2e-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"@angular/material": ["../lib/public-api.ts"],
"@angular/material-experimental/*": ["../material-experimental/*"],
"@angular/material-experimental": ["../material-experimental/"],
"@angular/cdk-experimental/*": ["../cdk-experimental/*"],
"@angular/cdk-experimental": ["../cdk-experimental/"],
"@angular/material-moment-adapter": ["../material-moment-adapter/"],
"@angular/material-examples": ["../material-examples/"]
}
Expand Down
4 changes: 3 additions & 1 deletion src/material-experimental/tsconfig-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
"@angular/material/*": ["../../dist/packages/material/*"],
"@angular/material": ["../../dist/packages/material/public-api"],
"@angular/cdk/*": ["../../dist/packages/cdk/*"],
"@angular/cdk": ["../../dist/packages/cdk"]
"@angular/cdk": ["../../dist/packages/cdk"],
"@angular/cdk-experimental/*": ["../../dist/packages/cdk-experimental/*"],
"@angular/cdk-experimental": ["../../dist/packages/cdk-experimental"]
}
},
"files": [
Expand Down
4 changes: 3 additions & 1 deletion src/material-experimental/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
"@angular/cdk/*": ["../cdk/*"],
"@angular/cdk": ["../cdk"],
"@angular/material/*": ["../lib/*"],
"@angular/material": ["../lib/public-api.ts"]
"@angular/material": ["../lib/public-api.ts"],
"@angular/cdk-experimental/*": ["../cdk-experimental/*"],
"@angular/cdk-experimental": ["../cdk-experimental/public-api.ts"]
}
},
"include": ["./**/*.ts"]
Expand Down
2 changes: 2 additions & 0 deletions test/karma-test-shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ System.config({
// TODO(devversion): replace once the index.ts file for the Material package has been added.
'@angular/material': 'dist/packages/material/public-api.js',
'@angular/material-experimental': 'dist/packages/material-experimental/index.js',
'@angular/cdk-experimental': 'dist/packages/cdk-experimental/index.js',

'@angular/cdk': 'dist/packages/cdk/index.js',
'@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
'@angular/cdk/accordion': 'dist/packages/cdk/accordion/index.js',
Expand Down
6 changes: 4 additions & 2 deletions tools/gulp/gulpfile.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import {createPackageBuildTasks} from 'material2-build-tools';
import {
cdkPackage,
cdkExperimentalPackage,
examplesPackage,
experimentalPackage,
materialExperimentalPackage,
materialPackage,
momentAdapterPackage
} from './packages';

createPackageBuildTasks(cdkPackage);
createPackageBuildTasks(cdkExperimentalPackage);
createPackageBuildTasks(materialPackage);
createPackageBuildTasks(experimentalPackage);
createPackageBuildTasks(materialExperimentalPackage);
createPackageBuildTasks(examplesPackage);
createPackageBuildTasks(momentAdapterPackage);

Expand Down
3 changes: 2 additions & 1 deletion tools/gulp/packages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import {join} from 'path';

export const cdkPackage = new BuildPackage('cdk');
export const materialPackage = new BuildPackage('material', [cdkPackage]);
export const experimentalPackage = new BuildPackage('material-experimental', [materialPackage]);
export const cdkExperimentalPackage = new BuildPackage('cdk-experimental', [materialPackage]);
export const materialExperimentalPackage = new BuildPackage('material-experimental', [cdkPackage]);
export const momentAdapterPackage = new BuildPackage('material-moment-adapter', [materialPackage]);
export const examplesPackage = new BuildPackage('material-examples', [momentAdapterPackage]);

Expand Down
1 change: 1 addition & 0 deletions tools/gulp/tasks/aot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ task('aot:deps', sequenceTask(
[
'cdk:build-release',
'material:build-release',
'cdk-experimental:build-release',
'material-experimental:build-release',
'material-moment-adapter:build-release'
],
Expand Down
16 changes: 13 additions & 3 deletions tools/gulp/tasks/development.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ import {join} from 'path';
import {
buildConfig, copyFiles, buildScssTask, sequenceTask, watchFiles
} from 'material2-build-tools';
import {cdkPackage, experimentalPackage, materialPackage, momentAdapterPackage} from '../packages';
import {
cdkPackage,
materialExperimentalPackage,
cdkExperimentalPackage,
materialPackage,
momentAdapterPackage
} from '../packages';

// These imports don't have any typings provided.
const firebaseTools = require('firebase-tools');
Expand Down Expand Up @@ -48,8 +54,10 @@ task(':watch:devapp', () => {
watchFiles(join(materialPackage.sourceDir, '**/*.scss'), [':build:devapp:material-with-styles']);
watchFiles(join(momentAdapterPackage.sourceDir, '**/*'),
['material-moment-adapter:build-no-bundles']);
watchFiles(join(experimentalPackage.sourceDir, '**/*'),
watchFiles(join(materialExperimentalPackage.sourceDir, '**/*'),
['material-experimental:build-no-bundles']);
watchFiles(join(cdkExperimentalPackage.sourceDir, '**/*'),
['cdk-experimental:build-no-bundles']);
});

/** Path to the demo-app tsconfig file. */
Expand Down Expand Up @@ -83,8 +91,10 @@ task('stage-deploy:devapp', ['build:devapp'], () => {
copyFiles(bundlesDir, '*.+(js|map)', join(outDir, 'dist/bundles'));
copyFiles(cdkPackage.outputDir, '**/*.+(js|map)', join(outDir, 'dist/packages/cdk'));
copyFiles(materialPackage.outputDir, '**/*.+(js|map)', join(outDir, 'dist/packages/material'));
copyFiles(experimentalPackage.outputDir, '**/*.+(js|map)',
copyFiles(materialExperimentalPackage.outputDir, '**/*.+(js|map)',
join(outDir, 'dist/packages/material-experimental'));
copyFiles(cdkExperimentalPackage.outputDir, '**/*.+(js|map)',
join(outDir, 'dist/packages/cdk-experimental'));
copyFiles(materialPackage.outputDir, '**/prebuilt/*.+(css|map)',
join(outDir, 'dist/packages/material'));
});
Expand Down
2 changes: 2 additions & 0 deletions tools/gulp/tasks/e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ task('e2e-app:build', sequenceTask(
[
'cdk:build-release',
'material:build-release',
'cdk-experimental:build-release',
'material-experimental:build-release',
'material-moment-adapter:build-release',
'material-examples:build-release'
Expand Down Expand Up @@ -82,6 +83,7 @@ task('serve:e2eapp:watch', ['serve:e2eapp', 'material:watch', ':watch:e2eapp']);
task('e2e-app:copy-release', () => {
copySync(join(releasesDir, 'cdk'), join(outDir, 'cdk'));
copySync(join(releasesDir, 'material'), join(outDir, 'material'));
copySync(join(releasesDir, 'cdk-experimental'), join(outDir, 'cdk-experimental'));
copySync(join(releasesDir, 'material-experimental'), join(outDir, 'material-experimental'));
copySync(join(releasesDir, 'material-examples'), join(outDir, 'material-examples'));
copySync(join(releasesDir, 'material-moment-adapter'), join(outDir, 'material-moment-adapter'));
Expand Down
1 change: 1 addition & 0 deletions tools/gulp/tasks/publish.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import * as minimist from 'minimist';
/** Packages that will be published to NPM by the release task. */
export const releasePackages = [
'cdk',
'cdk-experimental',
'material',
'material-experimental',
'material-moment-adapter'
Expand Down
1 change: 1 addition & 0 deletions tools/gulp/tasks/unit-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const defaultOptions = {
task(':test:build', sequenceTask(
'clean',
'cdk:build-no-bundles',
'cdk-experimental:build-no-bundles',
'material:build-no-bundles',
'material-experimental:build-no-bundles',
'material-moment-adapter:build-no-bundles'
Expand Down
8 changes: 4 additions & 4 deletions tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,19 @@
"changeDetection": "\\.OnPush$",
"!styles": ".*"
}
}, "src/+(lib|cdk|material-experimental)/**/!(*.spec).ts"],
}, "src/+(lib|cdk|material-experimental|cdk-experimental)/**/!(*.spec).ts"],
"require-license-banner": [
true,
"src/+(lib|cdk|material-experimental|demo-app)/**/!(*.spec).ts"
"src/+(lib|cdk|material-experimental|cdk-experimental|demo-app)/**/!(*.spec).ts"
],
"no-rxjs-patch-imports": [
true,
"src/+(lib|cdk|material-experimental)/**/*.ts"
"src/+(lib|cdk|material-experimental|cdk-experimental)/**/*.ts"
],
"missing-rollup-globals": [
true,
"./tools/package-tools/rollup-globals.ts",
"src/+(lib|cdk|material-examples|material-experimental)/**/*.ts"
"src/+(lib|cdk|material-examples|material-experimental|cdk-experimental)/**/*.ts"
]
}
}