Cleanup config key invalidation feature for release (#9864)

parcel-bundler · Jul 23, 2024 · ae96448 · ae96448
1 parent f58a5e8
commit ae96448
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/packages/core/core/src/public/Config.js b/packages/core/core/src/public/Config.js
@@ -141,14 +141,12 @@ export default class PublicConfig implements IConfig {
  let packageKey = options?.packageKey;
  if (packageKey != null) {
  let pkg = await this.getConfigFrom(searchPath, ['package.json'], {
- exclude: this.#options.featureFlags.configKeyInvalidation,
+ exclude: true,
  });
 
  if (pkg && pkg.contents[packageKey]) {
- if (this.#options.featureFlags.configKeyInvalidation) {
- // Invalidate only when the package key changes
- this.invalidateOnConfigKeyChange(pkg.filePath, packageKey);
- }
+ // Invalidate only when the package key changes
+ this.invalidateOnConfigKeyChange(pkg.filePath, packageKey);
 
  return {
  contents: pkg.contents[packageKey],

diff --git a/packages/core/core/test/test-utils.js b/packages/core/core/test/test-utils.js
@@ -54,7 +54,6 @@ export const DEFAULT_OPTIONS: ParcelOptions = {
  },
  featureFlags: {
  exampleFeature: false,
- configKeyInvalidation: false,
  parcelV3: false,
  },
 };

diff --git a/packages/core/feature-flags/src/index.js b/packages/core/feature-flags/src/index.js
@@ -7,7 +7,6 @@ export type FeatureFlags = _FeatureFlags;
 
 export const DEFAULT_FEATURE_FLAGS: FeatureFlags = {
  exampleFeature: false,
- configKeyInvalidation: false,
  parcelV3: false,
 };
 

diff --git a/packages/core/feature-flags/src/types.js b/packages/core/feature-flags/src/types.js
@@ -3,12 +3,6 @@
 export type FeatureFlags = {|
  // This feature flag mostly exists to test the feature flag system, and doesn't have any build/runtime effect
  +exampleFeature: boolean,
- /**
- * Enables content hash based invalidation for config keys used in plugins.
- * This allows Assets not to be invalidated when using
- * `config.getConfigFrom(..., {packageKey: '...'})` and the value itself hasn't changed.
- */
- +configKeyInvalidation: boolean,
  /**
  * Rust backed requests
  */

diff --git a/packages/core/integration-tests/test/cache.js b/packages/core/integration-tests/test/cache.js
@@ -1318,7 +1318,6 @@ describe('cache', function () {
  let b = await testCache({
  featureFlags: {
  exampleFeature: false,
- configKeyInvalidation: true,
  parcelV3: false,
  },
  async setup() {
@@ -1379,7 +1378,6 @@ describe('cache', function () {
  let b = await testCache({
  featureFlags: {
  exampleFeature: false,
- configKeyInvalidation: true,
  parcelV3: false,
  },
  async setup() {
@@ -1440,7 +1438,6 @@ describe('cache', function () {
  let b = await testCache({
  featureFlags: {
  exampleFeature: false,
- configKeyInvalidation: true,
  parcelV3: false,
  },
  async setup() {

diff --git a/packages/core/integration-tests/test/incremental-bundling.js b/packages/core/integration-tests/test/incremental-bundling.js
@@ -5,6 +5,7 @@ import {
  inputFS,
  overlayFS,
  run,
+ fsFixture,
 } from '@parcel/test-utils';
 import assert from 'assert';
 import path from 'path';
@@ -712,21 +713,33 @@ console.log('index.js');`,
 
  it('changing bundler options', async () => {
  let subscription;
- let fixture = path.join(__dirname, '/integration/incremental-bundling');
  try {
- let b = bundler(path.join(fixture, 'index.js'), {
+ await fsFixture(overlayFS, __dirname)`
+ index.js:
+ export default 1;
+
+ package.json:
+ {
+ "@parcel/bundler-default": {
+ "http": 2
+ }
+ }
+
+ yarn.lock:`;
+
+ let b = bundler(path.join(__dirname, 'index.js'), {
  inputFS: overlayFS,
  shouldDisableCache: false,
  shouldBundleIncrementally: true,
  });
 
- await overlayFS.mkdirp(fixture);
+ await overlayFS.mkdirp(__dirname);
  subscription = await b.watch();
 
  let event = await getNextBuildSuccess(b);
  assertTimesBundled(defaultBundlerSpy.callCount, 1);
 
- let pkgFile = path.join(fixture, 'package.json');
+ let pkgFile = path.join(__dirname, 'package.json');
  let pkg = JSON.parse(await overlayFS.readFile(pkgFile));
  await overlayFS.writeFile(
  pkgFile,
@@ -741,7 +754,7 @@ console.log('index.js');`,
  event = await getNextBuildSuccess(b);
 
  // should contain all the assets
- assertChangedAssets(event.changedAssets.size, 3);
+ assertChangedAssets(event.changedAssets.size, 2);
  assertTimesBundled(defaultBundlerSpy.callCount, 2);
  } finally {
  if (subscription) {