Skip to content

build: switch dev app system config to es5 #16853

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.

Sign up for GitHub

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
Aug 23, 2019
Merged

build: switch dev app system config to es5 #16853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
175 changes: 93 additions & 82 deletions src/dev-app/system-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
* found in the LICENSE file at https://angular.io/license
*/

const CDK_PACKAGES = [
// Note that this file isn't being transpiled so we need to keep it in ES5.

var CDK_PACKAGES = [
'a11y',
'accordion',
'bidi',
Expand All @@ -26,13 +28,13 @@ const CDK_PACKAGES = [
'tree',
];

const CDK_EXPERIMENTAL_PACKAGES = [
var CDK_EXPERIMENTAL_PACKAGES = [
'dialog',
'popover-edit',
'scrolling',
];

const MATERIAL_PACKAGES = [
var MATERIAL_PACKAGES = [
'autocomplete', 'badge',
'bottom-sheet', 'button',
'button-toggle', 'card',
Expand All @@ -53,11 +55,11 @@ const MATERIAL_PACKAGES = [
'tree',
];

const GOOGLE_MAPS_PACKAGES = [
var GOOGLE_MAPS_PACKAGES = [
'google-map',
];

const MATERIAL_EXPERIMENTAL_PACKAGES = [
var MATERIAL_EXPERIMENTAL_PACKAGES = [
'mdc-button',
'mdc-card',
'mdc-checkbox',
Expand All @@ -71,13 +73,13 @@ const MATERIAL_EXPERIMENTAL_PACKAGES = [
];

/** Bazel runfile path referring to the "src/" folder of the project. */
const srcRunfilePath = 'angular_material/src';
var srcRunfilePath = 'angular_material/src';

/** Path mappings that will be registered in SystemJS. */
const pathMapping = {};
var pathMapping = {};

/** Package configurations that will be used in SystemJS. */
const packagesConfig = {};
var packagesConfig = {};

// Configure all primary entry-points.
configureEntryPoint('cdk');
Expand All @@ -88,88 +90,97 @@ configureEntryPoint('material-examples');
configureEntryPoint('material-moment-adapter');

// Configure all secondary entry-points.
CDK_PACKAGES.forEach(pkgName => configureEntryPoint('cdk', pkgName));
CDK_EXPERIMENTAL_PACKAGES.forEach(pkgName => configureEntryPoint('cdk-experimental', pkgName));
MATERIAL_EXPERIMENTAL_PACKAGES.forEach(
pkgName => configureEntryPoint('material-experimental', pkgName));
MATERIAL_PACKAGES.forEach(pkgName => configureEntryPoint('material', pkgName));
GOOGLE_MAPS_PACKAGES.forEach(pkgName => configureEntryPoint('google-maps', pkgName));
CDK_PACKAGES.forEach(function(pkgName) {
configureEntryPoint('cdk', pkgName);
});
CDK_EXPERIMENTAL_PACKAGES.forEach(function(pkgName) {
configureEntryPoint('cdk-experimental', pkgName);
});
MATERIAL_EXPERIMENTAL_PACKAGES.forEach(function(pkgName) {
configureEntryPoint('material-experimental', pkgName);
});
MATERIAL_PACKAGES.forEach(function(pkgName) {
configureEntryPoint('material', pkgName);
});
GOOGLE_MAPS_PACKAGES.forEach(function(pkgName) {
configureEntryPoint('google-maps', pkgName);
});

/** Configures the specified package and its entry-point. */
function configureEntryPoint(pkgName, entryPoint) {
if (entryPoint === undefined) {
pathMapping[`@angular/${pkgName}`] = `${srcRunfilePath}/${pkgName}`;
packagesConfig[`${srcRunfilePath}/${pkgName}`] = {main: 'index.js'};
pathMapping['@angular/' + pkgName] = srcRunfilePath + '/' + pkgName;
packagesConfig[srcRunfilePath + '/' + pkgName] = {main: 'index.js'};
} else {
pathMapping[`@angular/${pkgName}/${entryPoint}`] = `${srcRunfilePath}/${pkgName}/${entryPoint}`;
packagesConfig[`${srcRunfilePath}/${pkgName}/${entryPoint}`] = {main: 'index.js'};
pathMapping['@angular/' + pkgName + '/' + entryPoint] =
srcRunfilePath + '/' + pkgName + '/' + entryPoint;
packagesConfig[srcRunfilePath + '/' + pkgName + '/' + entryPoint] = {main: 'index.js'};
}
}

var map = Object.assign({
'main': 'main.js',
'tslib': 'tslib/tslib.js',
'moment': 'moment/min/moment-with-locales.min.js',

'rxjs': 'rxjs/bundles/rxjs.umd.min.js',
'rxjs/operators': 'system-rxjs-operators.js',

// MDC Web
'@material/animation': '@material/animation/dist/mdc.animation.js',
'@material/auto-init': '@material/auto-init/dist/mdc.autoInit.js',
'@material/base': '@material/base/dist/mdc.base.js',
'@material/checkbox': '@material/checkbox/dist/mdc.checkbox.js',
'@material/chips': '@material/chips/dist/mdc.chips.js',
'@material/dialog': '@material/dialog/dist/mdc.dialog.js',
'@material/dom': '@material/dom/dist/mdc.dom.js',
'@material/drawer': '@material/drawer/dist/mdc.drawer.js',
'@material/floating-label': '@material/floating-label/dist/mdc.floatingLabel.js',
'@material/form-field': '@material/form-field/dist/mdc.formField.js',
'@material/grid-list': '@material/grid-list/dist/mdc.gridList.js',
'@material/icon-button': '@material/icon-button/dist/mdc.iconButton.js',
'@material/line-ripple': '@material/line-ripple/dist/mdc.lineRipple.js',
'@material/linear-progress': '@material/linear-progress/dist/mdc.linearProgress.js',
'@material/list': '@material/list/dist/mdc.list.js',
'@material/menu': '@material/menu/dist/mdc.menu.js',
'@material/menu-surface': '@material/menu-surface/dist/mdc.menuSurface.js',
'@material/notched-outline': '@material/notched-outline/dist/mdc.notchedOutline.js',
'@material/radio': '@material/radio/dist/mdc.radio.js',
'@material/ripple': '@material/ripple/dist/mdc.ripple.js',
'@material/select': '@material/select/dist/mdc.select.js',
'@material/slider': '@material/slider/dist/mdc.slider.js',
'@material/snackbar': '@material/snackbar/dist/mdc.snackbar.js',
'@material/switch': '@material/switch/dist/mdc.switch.js',
'@material/tab': '@material/tab/dist/mdc.tab.js',
'@material/tab-bar': '@material/tab-bar/dist/mdc.tabBar.js',
'@material/tab-indicator': '@material/tab-indicator/dist/mdc.tabIndicator.js',
'@material/tab-scroller': '@material/tab-scroller/dist/mdc.tabScroller.js',
'@material/text-field': '@material/textfield/dist/mdc.textfield.js',
'@material/top-app-bar': '@material/top-app-bar/dist/mdc.topAppBar.js'
}, pathMapping);

var packages = Object.assign({
// Set the default extension for the root package, because otherwise the dev-app can't
// be built within the production mode. Due to missing file extensions.
'.': {defaultExtension: 'js'},

// Angular specific mappings.
'@angular/core': {main: 'bundles/core.umd.js'},
'@angular/common': {main: 'bundles/common.umd.js'},
'@angular/common/http': {main: '../bundles/common-http.umd.js'},
'@angular/compiler': {main: 'bundles/compiler.umd.js'},
'@angular/forms': {main: 'bundles/forms.umd.js'},
'@angular/animations': {main: 'bundles/animations.umd.js'},
'@angular/elements': {main: 'bundles/elements.umd.js'},
'@angular/router': {main: 'bundles/router.umd.js'},
'@angular/animations/browser': {main: '../bundles/animations-browser.umd.js'},
'@angular/platform-browser/animations': {main: '../bundles/platform-browser-animations.umd'},
'@angular/platform-browser': {main: 'bundles/platform-browser.umd.js'},
'@angular/platform-browser-dynamic': {main: 'bundles/platform-browser-dynamic.umd.js'},
}, packagesConfig);

// Configure the base path and map the different node packages.
System.config({
map: {
'main': 'main.js',
'tslib': 'tslib/tslib.js',
'moment': 'moment/min/moment-with-locales.min.js',

'rxjs': 'rxjs/bundles/rxjs.umd.min.js',
'rxjs/operators': 'system-rxjs-operators.js',

// MDC Web
'@material/animation': '@material/animation/dist/mdc.animation.js',
'@material/auto-init': '@material/auto-init/dist/mdc.autoInit.js',
'@material/base': '@material/base/dist/mdc.base.js',
'@material/checkbox': '@material/checkbox/dist/mdc.checkbox.js',
'@material/chips': '@material/chips/dist/mdc.chips.js',
'@material/dialog': '@material/dialog/dist/mdc.dialog.js',
'@material/dom': '@material/dom/dist/mdc.dom.js',
'@material/drawer': '@material/drawer/dist/mdc.drawer.js',
'@material/floating-label': '@material/floating-label/dist/mdc.floatingLabel.js',
'@material/form-field': '@material/form-field/dist/mdc.formField.js',
'@material/grid-list': '@material/grid-list/dist/mdc.gridList.js',
'@material/icon-button': '@material/icon-button/dist/mdc.iconButton.js',
'@material/line-ripple': '@material/line-ripple/dist/mdc.lineRipple.js',
'@material/linear-progress': '@material/linear-progress/dist/mdc.linearProgress.js',
'@material/list': '@material/list/dist/mdc.list.js',
'@material/menu': '@material/menu/dist/mdc.menu.js',
'@material/menu-surface': '@material/menu-surface/dist/mdc.menuSurface.js',
'@material/notched-outline': '@material/notched-outline/dist/mdc.notchedOutline.js',
'@material/radio': '@material/radio/dist/mdc.radio.js',
'@material/ripple': '@material/ripple/dist/mdc.ripple.js',
'@material/select': '@material/select/dist/mdc.select.js',
'@material/slider': '@material/slider/dist/mdc.slider.js',
'@material/snackbar': '@material/snackbar/dist/mdc.snackbar.js',
'@material/switch': '@material/switch/dist/mdc.switch.js',
'@material/tab': '@material/tab/dist/mdc.tab.js',
'@material/tab-bar': '@material/tab-bar/dist/mdc.tabBar.js',
'@material/tab-indicator': '@material/tab-indicator/dist/mdc.tabIndicator.js',
'@material/tab-scroller': '@material/tab-scroller/dist/mdc.tabScroller.js',
'@material/text-field': '@material/textfield/dist/mdc.textfield.js',
'@material/top-app-bar': '@material/top-app-bar/dist/mdc.topAppBar.js',

...pathMapping,
},
packages: {
// Set the default extension for the root package, because otherwise the dev-app can't
// be built within the production mode. Due to missing file extensions.
'.': {defaultExtension: 'js'},

// Angular specific mappings.
'@angular/core': {main: 'bundles/core.umd.js'},
'@angular/common': {main: 'bundles/common.umd.js'},
'@angular/common/http': {main: '../bundles/common-http.umd.js'},
'@angular/compiler': {main: 'bundles/compiler.umd.js'},
'@angular/forms': {main: 'bundles/forms.umd.js'},
'@angular/animations': {main: 'bundles/animations.umd.js'},
'@angular/elements': {main: 'bundles/elements.umd.js'},
'@angular/router': {main: 'bundles/router.umd.js'},
'@angular/animations/browser': {main: '../bundles/animations-browser.umd.js'},
'@angular/platform-browser/animations': {main: '../bundles/platform-browser-animations.umd'},
'@angular/platform-browser': {main: 'bundles/platform-browser.umd.js'},
'@angular/platform-browser-dynamic': {main: 'bundles/platform-browser-dynamic.umd.js'},

// Project specific configurations.
...packagesConfig,
}
map: map,
packages: packages
});