Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

build: make the build output deterministic and reproducible #11570

Merged
merged 1 commit into from
Mar 13, 2019
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
4 changes: 0 additions & 4 deletions docs/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ const argv = require('minimist')(process.argv.slice(2));
const gutil = require('gulp-util');
const series = require('stream-series');

const config = {
demoFolder: 'demo-partials'
};

gulp.task('demos', function() {
const demos = [];
return generateDemos()
Expand Down
128 changes: 115 additions & 13 deletions gulp/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,89 @@ module.exports = {
' * @license MIT\n' +
' * v' + VERSION + '\n' +
' */\n',
jsBaseFiles: [
'src/core/**/*.js'
jsCoreFiles: [
'src/core/*.js',
'src/core/util/autofocus.js',
'src/core/util/color.js',
'src/core/util/constant.js',
'src/core/util/iterator.js',
'src/core/util/media.js',
'src/core/util/prefixer.js',
'src/core/util/util.js',
'src/core/util/animation/animate.js',
'src/core/util/animation/animateCss.js',
'src/core/services/aria/*.js',
'src/core/services/compiler/*.js',
'src/core/services/gesture/*.js',
'src/core/services/interaction/*.js',
'src/core/services/interimElement/*.js',
'src/core/services/layout/*.js',
'src/core/services/liveAnnouncer/*.js',
'src/core/services/meta/*.js',
'src/core/services/registry/*.js',
'src/core/services/ripple/button_ripple.js',
'src/core/services/ripple/checkbox_ripple.js',
'src/core/services/ripple/list_ripple.js',
'src/core/services/ripple/ripple.js',
'src/core/services/ripple/tab_ripple.js',
'src/core/services/theming/theme.palette.js',
'src/core/services/theming/theming.js'
],
jsFiles: [
jsHintFiles: [
'src/**/*.js',
'!src/**/*.spec.js'
],
mockFiles : [
componentPaths: [
'src/components/autocomplete',
'src/components/backdrop',
'src/components/bottomSheet',
'src/components/button',
'src/components/card',
'src/components/checkbox',
'src/components/chips',
'src/components/colors',
'src/components/content',
'src/components/datepicker',
'src/components/dialog',
'src/components/divider',
'src/components/fabActions',
'src/components/fabSpeedDial',
'src/components/fabToolbar',
'src/components/gridList',
'src/components/icon',
'src/components/input',
'src/components/list',
'src/components/menu',
'src/components/menuBar',
'src/components/navBar',
'src/components/panel',
'src/components/progressCircular',
'src/components/progressLinear',
'src/components/radioButton',
'src/components/select',
'src/components/showHide',
'src/components/sidenav',
'src/components/slider',
'src/components/sticky',
'src/components/subheader',
'src/components/swipe',
'src/components/switch',
'src/components/tabs',
'src/components/toast',
'src/components/toolbar',
'src/components/tooltip',
'src/components/truncate',
'src/components/virtualRepeat',
'src/components/whiteframe'
],
mockFiles: [
'test/angular-material-mocks.js'
],
themeBaseFiles: [
'src/core/style/variables.scss',
'src/core/style/mixins.scss'
],
themeCore: 'src/core/style/core-theme.scss',
scssBaseFiles: [
'src/core/style/color-palette.scss',
'src/core/style/variables.scss',
Expand All @@ -33,6 +102,7 @@ module.exports = {
'src/core/style/layout.scss',
'src/components/panel/*.scss'
],
scssServicesLayout: 'src/core/services/layout/layout.scss',
scssLayoutFiles: [
'src/core/style/variables.scss',
'src/core/style/mixins.scss',
Expand All @@ -44,14 +114,46 @@ module.exports = {
'src/core/style/mixins.scss',
'src/core/services/layout/layout-attributes.scss'
],
scssPaths : [
'src/components/**/*.scss',
'src/core/services/**/*.scss'
scssComponentPaths: [
'src/components/autocomplete',
'src/components/backdrop',
'src/components/bottomSheet',
'src/components/button',
'src/components/card',
'src/components/checkbox',
'src/components/chips',
'src/components/content',
'src/components/datepicker',
'src/components/dialog',
'src/components/divider',
'src/components/fabSpeedDial',
'src/components/fabToolbar',
'src/components/gridList',
'src/components/icon',
'src/components/input',
'src/components/list',
'src/components/menu',
'src/components/menuBar',
'src/components/navBar',
// panel is included in scssBaseFiles above
'src/components/progressCircular',
'src/components/progressLinear',
'src/components/radioButton',
'src/components/select',
'src/components/sidenav',
'src/components/slider',
'src/components/sticky',
'src/components/subheader',
'src/components/swipe',
'src/components/switch',
'src/components/tabs',
'src/components/toast',
'src/components/toolbar',
'src/components/tooltip',
'src/components/truncate',
'src/components/virtualRepeat',
'src/components/whiteframe'
],
cssIEPaths : ['src/**/ie_fixes.css'],
paths: 'src/+(components|core)/**',
outputDir: 'dist/',
demoFolder: 'demo-partials'
cssIEPaths: ['src/**/ie_fixes.css'],
outputDir: 'dist/'
};


2 changes: 1 addition & 1 deletion gulp/tasks/build-demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ const util = require('../util');
exports.dependencies = ['build', 'build-module-demo'];

exports.task = function() {
return util.buildModule(util.readModuleArg(), false);
return util.buildModule(util.readModuleArg());
};
2 changes: 1 addition & 1 deletion gulp/tasks/build-js.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const util = require('../util');

exports.task = function() {
return util.buildJs(true);
return util.buildJs();
};
23 changes: 11 additions & 12 deletions gulp/tasks/build-module-demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,23 @@ exports.task = function() {
const mod = util.readModuleArg();
const name = mod.split('.').pop();
const demoIndexTemplate = fs.readFileSync(
ROOT + '/docs/config/template/demo-index.template.html', 'utf8'
ROOT + '/docs/config/template/demo-index.template.html', 'utf8'
).toString();

gutil.log('Building demos for', mod, '...');

return utils.readModuleDemos(mod, function() {
return lazypipe()
.pipe(gulpif, /.css$/, sass())
.pipe(gulpif, /.css$/, util.autoprefix())
.pipe(gulp.dest, BUILD_MODE.outputDir + name)
.pipe(gulpif, /.css$/, sass())
.pipe(gulpif, /.css$/, util.autoprefix())
.pipe(gulp.dest, BUILD_MODE.outputDir + name)
();
})
.pipe(through2.obj(function(demo, enc, next) {
fs.writeFileSync(
path.resolve(BUILD_MODE.outputDir, name, demo.name, 'index.html'),
_.template(demoIndexTemplate)(demo)
);
next();
}));

.pipe(through2.obj(function(demo, enc, next) {
fs.writeFileSync(
path.resolve(BUILD_MODE.outputDir, name, demo.name, 'index.html'),
_.template(demoIndexTemplate)(demo)
);
next();
}));
};
117 changes: 60 additions & 57 deletions gulp/tasks/build-scss.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,101 +13,104 @@ const gulpif = require('gulp-if');
const minifyCss = util.minifyCss;
const args = util.args;
const IS_DEV = require('../const').IS_DEV;
const path = require('path');

exports.task = function() {
const streams = [];
const modules = args.modules,
overrides = args.override,
dest = args['output-dir'] || config.outputDir,
layoutDest= dest + 'layouts/';
const modules = args.modules,
overrides = args.override,
dest = args['output-dir'] || config.outputDir,
layoutDest = dest + 'layouts/';

gutil.log("Building css files...");

// create SCSS file for distribution
streams.push(
gulp.src(getPaths())
.pipe(util.filterNonCodeFiles())
.pipe(filter(['**', '!**/*.css']))
.pipe(filter(['**', '!**/*-theme.scss']))
.pipe(filter(['**', '!**/*-attributes.scss']))
.pipe(concat('angular-material.scss'))
.pipe(gulp.dest(dest)) // raw uncompiled SCSS
.pipe(sass())
.pipe(util.dedupeCss())
.pipe(util.autoprefix())
.pipe(insert.prepend(config.banner))
.pipe(gulp.dest(dest)) // unminified
.pipe(gulpif(!IS_DEV, minifyCss()))
.pipe(gulpif(!IS_DEV, util.dedupeCss()))
.pipe(rename({extname: '.min.css'}))
.pipe(gulp.dest(dest)) // minified
.pipe(util.filterNonCodeFiles())
.pipe(filter(['**', '!**/*.css']))
.pipe(filter(['**', '!**/*-theme.scss']))
.pipe(filter(['**', '!**/*-attributes.scss']))
.pipe(concat('angular-material.scss'))
.pipe(insert.prepend(config.banner))
.pipe(gulp.dest(dest)) // raw uncompiled SCSS
.pipe(sass())
.pipe(util.dedupeCss())
.pipe(util.autoprefix())
.pipe(gulp.dest(dest)) // unminified
.pipe(gulpif(!IS_DEV, minifyCss()))
.pipe(gulpif(!IS_DEV, util.dedupeCss()))
.pipe(rename({extname: '.min.css'}))
.pipe(gulp.dest(dest)) // minified
);

streams.push(
gulp.src(config.cssIEPaths.slice()) // append raw CSS for IE Fixes
.pipe(concat('angular-material.layouts.ie_fixes.css'))
.pipe(gulp.dest(layoutDest))
gulp.src(config.cssIEPaths.slice()) // append raw CSS for IE Fixes
.pipe(concat('angular-material.layouts.ie_fixes.css'))
.pipe(gulp.dest(layoutDest))
);

// Generate standalone SCSS (and CSS) file for Layouts API
// The use of these classnames is automated but requires
// the Javascript module module `material.core.layout`
// the Javascript module `material.core.layout`
// > (see src/core/services/layout.js)
// NOTE: this generated css is ALSO appended to the published
// angular-material.css file

streams.push(
gulp.src(config.scssLayoutFiles)
.pipe(concat('angular-material.layouts.scss'))
.pipe(sassUtils.hoistScssVariables())
.pipe(insert.prepend(config.banner))
.pipe(gulp.dest(layoutDest)) // raw uncompiled SCSS
.pipe(sass())
.pipe(util.dedupeCss())
.pipe(util.autoprefix())
.pipe(rename({ extname : '.css'}))
.pipe(gulp.dest(layoutDest))
.pipe(gulpif(!IS_DEV, minifyCss()))
.pipe(gulpif(!IS_DEV, util.dedupeCss()))
.pipe(rename({extname: '.min.css'}))
.pipe(gulp.dest(layoutDest))
.pipe(concat('angular-material.layouts.scss'))
.pipe(sassUtils.hoistScssVariables())
.pipe(insert.prepend(config.banner))
.pipe(gulp.dest(layoutDest)) // raw uncompiled SCSS
.pipe(sass())
.pipe(util.dedupeCss())
.pipe(util.autoprefix())
.pipe(rename({extname: '.css'}))
.pipe(gulp.dest(layoutDest))
.pipe(gulpif(!IS_DEV, minifyCss()))
.pipe(gulpif(!IS_DEV, util.dedupeCss()))
.pipe(rename({extname: '.min.css'}))
.pipe(gulp.dest(layoutDest))
);

// Generate the Layout-Attributes SCSS and CSS files
// These are intended to allow usages of the Layout styles
// without:
// * use of the Layout directives and classnames, and
// * Layout module `material.core.layout
// * Layout module `material.core.layout`

streams.push(
gulp.src(config.scssLayoutAttributeFiles)
.pipe(concat('angular-material.layout-attributes.scss'))
.pipe(sassUtils.hoistScssVariables())
.pipe(gulp.dest(layoutDest)) // raw uncompiled SCSS
.pipe(sass())
.pipe(util.dedupeCss())
.pipe(util.autoprefix())
.pipe(rename({ extname : '.css'}))
.pipe(insert.prepend(config.banner))
.pipe(gulp.dest(layoutDest))
.pipe(gulpif(!IS_DEV, minifyCss()))
.pipe(gulpif(!IS_DEV, util.dedupeCss()))
.pipe(rename({extname: '.min.css'}))
.pipe(gulp.dest(layoutDest))
gulp.src(config.scssLayoutAttributeFiles)
.pipe(concat('angular-material.layout-attributes.scss'))
.pipe(sassUtils.hoistScssVariables())
.pipe(gulp.dest(layoutDest)) // raw uncompiled SCSS
.pipe(sass())
.pipe(util.dedupeCss())
.pipe(util.autoprefix())
.pipe(rename({extname: '.css'}))
.pipe(insert.prepend(config.banner))
.pipe(gulp.dest(layoutDest))
.pipe(gulpif(!IS_DEV, minifyCss()))
.pipe(gulpif(!IS_DEV, util.dedupeCss()))
.pipe(rename({extname: '.min.css'}))
.pipe(gulp.dest(layoutDest))
);

return series(streams);


function getPaths () {
const paths = config.scssBaseFiles.slice();
/**
* @returns {string[]} array of SCSS file paths used in the build
*/
function getPaths() {
const paths = config.scssBaseFiles.slice(0);
if (modules) {
paths.push.apply(paths, modules.split(',').map(function (module) {
paths.push.apply(paths, modules.split(',').map(function(module) {
return 'src/components/' + module + '/*.scss';
}));
} else {
paths.push('src/components/**/*.scss');
paths.push('src/core/services/layout/**/*.scss');
config.scssComponentPaths.forEach(component => paths.push(path.join(component, '*.scss')));
paths.push(config.scssServicesLayout);
}
overrides && paths.unshift(overrides);
return paths;
Expand Down
2 changes: 1 addition & 1 deletion gulp/tasks/jshint.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const gulp = require('gulp');
const jshint = require('gulp-jshint');

exports.task = function() {
return gulp.src(config.jsFiles)
return gulp.src(config.jsHintFiles)
.pipe(jshint('.jshintrc'))
.pipe(jshint.reporter('jshint-summary', {
fileColCol: ',bold',
Expand Down
Loading