Skip to content
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

Jump to bottom

Keep AMP_CONFIG writing in sync with production release script. #24471

Merged
merged 4 commits into from
Sep 12, 2019
Merged

Keep AMP_CONFIG writing in sync with production release script. #24471

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bf9de3
Keep AMP_CONFIG writing in sync with production release script.
lannka Sep 11, 2019
da0cc3a
Address comments
lannka Sep 11, 2019
7444cb3
lint
lannka Sep 11, 2019
d4be97c
remove amp-esm.js
lannka Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions build-system/tasks/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,20 @@ const EXTENSION_BUNDLE_MAP = {
*/
const UNMINIFIED_TARGETS = [
'amp.js',
'amp-esm.js',
'amp-shadow.js',
'amp-inabox.js',
'alp.max.js',
'integration.js',
'amp-shadow.js',
'amp-esm.js',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Alphabetize?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorted MINIFIED list in alphabetic order. and kept same ordering in this UNMINIFIED list

];

/**
* List of minified targets to which AMP_CONFIG should be written
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might make sense to add a comment here to keep both lists in sync with the release scripts.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

*/
const MINIFIED_TARGETS = [
'v0.js',
'shadow-v0.js',
'amp4ads-v0.js',
'alp.js',
'f.js',
'shadow-v0.js',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there no minified esm target?

/cc @erwinmombay @jridgewell

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see amp-esm.js referenced anywhere else. is it still a thing?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it is.

amphtml/build-system/tasks/dist.js

Lines 159 to 165 in 8fe8186

if (argv.esm) {
await Promise.all([
createModuleCompatibleES5Bundle('v0.js'),
createModuleCompatibleES5Bundle('amp4ads-v0.js'),
createModuleCompatibleES5Bundle('shadow-v0.js'),
]);
}

amphtml/babel.config.js

Lines 47 to 51 in b6d45be

// `dist` builds do not use any of the default settings below until its
// an esm build. (Both Multipass and Singlepass)
if (isDist && !esm) {
return {};
}

amphtml/build-system/compile/compile.js

Lines 150 to 154 in 36b7f5c

// Add babel plugin to remove unwanted polyfills in esm build
if (options.esmPassCompilation) {
compilationOptions['dest'] = './dist/esm/';
define.push('ESM_BUILD=true');
}

amphtml/build-system/tasks/helpers.js

Lines 192 to 199 in b11fe0e

doBuildJs(jsBundles, 'amp.js', {
watch,
minify,
wrapper: wrappers.mainBinary,
singlePassCompilation: argv.single_pass,
esmPassCompilation: argv.esm,
includeOnlyESMLevelPolyfills: argv.esm,
}),

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so is there still an output file named amp-esm.js ? seems it will just be amp.js?

Copy link
Contributor

@rsimha rsimha Sep 11, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checked, you are right. Sorry. Carry on :)

PS: We should probably remove amp-esm.js from UNMINIFIED_TARGETS.

];

/**
Expand Down