Skip to content

Commit

Permalink
Rename vendor-configs target to analytics-vendor-configs (#32269)
Browse files Browse the repository at this point in the history
  • Loading branch information
powerivq committed Jan 28, 2021
1 parent 3d9199c commit 3eb811f
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const {watch} = require('gulp');
* @param {Object=} opt_options
* @return {!Promise}
*/
async function vendorConfigs(opt_options) {
async function analyticsVendorConfigs(opt_options) {
const options = opt_options || {};

const srcPath = ['extensions/amp-analytics/0.1/vendors/*.json'];
Expand All @@ -48,7 +48,7 @@ async function vendorConfigs(opt_options) {
// Do not set watchers again when we get called by the watcher.
const copyOptions = {...options, watch: false, calledByWatcher: true};
const watchFunc = () => {
vendorConfigs(copyOptions);
analyticsVendorConfigs(copyOptions);
};
watch(srcPath).on('change', debounce(watchFunc, watchDebounceDelay));
}
Expand Down Expand Up @@ -86,7 +86,7 @@ async function vendorConfigs(opt_options) {
}

module.exports = {
vendorConfigs,
analyticsVendorConfigs,
};

vendorConfigs.description = 'Compile analytics vendor configs to dist';
analyticsVendorConfigs.description = 'Compile analytics vendor configs to dist';
4 changes: 2 additions & 2 deletions build-system/tasks/extension-helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ const {
extensionBundles,
verifyExtensionBundles,
} = require('../compile/bundles.config');
const {analyticsVendorConfigs} = require('./analytics-vendor-configs');
const {endBuildStep, watchDebounceDelay} = require('./helpers');
const {isCiBuild} = require('../common/ci');
const {jsifyCssAsync} = require('./jsify-css');
const {log} = require('../common/logging');
const {maybeToEsmName, compileJs, mkdirSync} = require('./helpers');
const {vendorConfigs} = require('./vendor-configs');
const {watch} = require('gulp');

const {green, red, cyan} = colors;
Expand Down Expand Up @@ -453,7 +453,7 @@ async function buildExtension(
}
}
if (name === 'amp-analytics') {
await vendorConfigs(options);
await analyticsVendorConfigs(options);
}
await buildExtensionJs(path, name, version, latestVersion, options);
}
Expand Down
4 changes: 2 additions & 2 deletions build-system/tasks/unit.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ const {
RuntimeTestRunner,
RuntimeTestConfig,
} = require('./runtime-test/runtime-test-base');
const {analyticsVendorConfigs} = require('./analytics-vendor-configs');
const {compileJison} = require('./compile-jison');
const {css} = require('./css');
const {getUnitTestsToRun} = require('./runtime-test/helpers-unit');
const {maybePrintArgvMessages} = require('./runtime-test/helpers');
const {vendorConfigs} = require('./vendor-configs');

class Runner extends RuntimeTestRunner {
constructor(config) {
Expand All @@ -33,7 +33,7 @@ class Runner extends RuntimeTestRunner {

/** @override */
async maybeBuild() {
await vendorConfigs();
await analyticsVendorConfigs();
await css();
await compileJison();
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-analytics/0.1/test/test-vendors.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ describes.realWin(
'Request for ' +
vendor +
' not found. Please make sure you run ' +
'"gulp vendor-configs" or build amp-analytics ' +
'"gulp analytics-vendor-configs" or build amp-analytics ' +
'before running the test'
);
}
Expand Down
6 changes: 4 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ const {cyan, red} = require('ansi-colors');
const {isCiBuild} = require('./build-system/common/ci');
const {log} = require('./build-system/common/logging');

const {
analyticsVendorConfigs,
} = require('./build-system/tasks/analytics-vendor-configs');
const {
checkExactVersions,
} = require('./build-system/tasks/check-exact-versions');
Expand Down Expand Up @@ -76,7 +79,6 @@ const {todosFindClosed} = require('./build-system/tasks/todos');
const {unit} = require('./build-system/tasks/unit');
const {updatePackages} = require('./build-system/tasks/update-packages');
const {validator, validatorWebui} = require('./build-system/tasks/validator');
const {vendorConfigs} = require('./build-system/tasks/vendor-configs');
const {visualDiff} = require('./build-system/tasks/visual-diff');

/**
Expand Down Expand Up @@ -181,6 +183,6 @@ createTask('unit', unit);
createTask('update-packages', updatePackages);
createTask('validator', validator);
createTask('validator-webui', validatorWebui);
createTask('vendor-configs', vendorConfigs);
createTask('analytics-vendor-configs', analyticsVendorConfigs);
createTask('visual-diff', visualDiff);
createTask('watch', watch);

0 comments on commit 3eb811f

Please sign in to comment.