Merge branch 'main' into 1.31-releases

Author: mcasimir

configs/webpack-config-compass/package.json

@@ -33,7 +33,7 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "bootstrap": "npm run compile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "tsc -p tsconfig.json",
     "postcompile": "gen-esm-wrapper . ./dist/.esm-wrapper.mjs",
     "eslint": "eslint",

configs/webpack-config-compass/src/index.ts

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import type { WebpackPluginInstance } from 'webpack';
+import type { ResolveOptions, WebpackPluginInstance } from 'webpack';
 import { merge } from 'webpack-merge';
 import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -31,10 +31,31 @@ import { sharedExternals } from './externals';
 import { WebpackPluginMulticompilerProgress } from './webpack-plugin-multicompiler-progress';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 
-const sharedResolveOptions = {
-  mainFields: ['compass:module', 'compass:main', 'module', 'main'],
-  exportsFields: ['compass:exports', 'exports'],
-  extensions: ['.jsx', '.tsx', '.ts', '...'],
+const sharedResolveOptions = (
+  target: ConfigArgs['target']
+): Pick<ResolveOptions, 'mainFields' | 'exportsFields' | 'extensions'> => {
+  if (typeof target === 'string') {
+    target = [target];
+  }
+  return {
+    // This replicates webpack behavior with additional special `compass:` keys
+    // taking priority over the default ones that webpack uses
+    //
+    // See https://webpack.js.org/configuration/resolve/#resolvemainfields
+    mainFields:
+      target?.includes('web') || target?.includes('webworker')
+        ? [
+            'compass:browser',
+            'compass:module',
+            'compass:main',
+            'browser',
+            'module',
+            'main',
+          ]
+        : ['compass:module', 'compass:main', 'module', 'main'],
+    exportsFields: ['compass:exports', 'exports'],
+    extensions: ['.jsx', '.tsx', '.ts', '...'],
+  };
 };
 
 export function createElectronMainConfig(
@@ -69,7 +90,7 @@ export function createElectronMainConfig(
     resolve: {
       // To avoid resolving the `browser` field
       aliasFields: [],
-      ...sharedResolveOptions,
+      ...sharedResolveOptions(opts.target),
     },
     plugins: [new WebpackPluginMulticompilerProgress()],
   };
@@ -141,7 +162,7 @@ export function createElectronRendererConfig(
     resolve: {
       // To avoid resolving the `browser` field
       aliasFields: [],
-      ...sharedResolveOptions,
+      ...sharedResolveOptions(opts.target),
     },
   };
 
@@ -254,7 +275,7 @@ export function createWebConfig(args: Partial<ConfigArgs>): WebpackConfig {
       ...toCommonJsExternal(builtinModules),
     },
     resolve: {
-      ...sharedResolveOptions,
+      ...sharedResolveOptions(opts.target),
     },
   };
 }

package-lock.json

@@ -14,7 +14,7 @@
     ".": "./src/index.js"
   },
   "scripts": {
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "npm run webpack -- --mode production",
     "prewebpack": "rimraf ./dist",
     "webpack": "webpack-compass",

packages/compass-aggregations/package.json

@@ -68,7 +68,7 @@ class PipelineWorkspace extends PureComponent {
   onStageMoved = ({ oldIndex, newIndex }) => {
     if (oldIndex !== newIndex) {
       this.props.stageMoved(oldIndex, newIndex);
-      this.props.runStage(0);
+      this.props.runStage(0, true /* force execute */);
     }
   }
 

packages/compass-aggregations/src/components/pipeline-builder-workspace/pipeline-builder-workspace.jsx

@@ -31,7 +31,7 @@ class ConfirmImportPipeline extends PureComponent {
   onConfirm = () => {
     this.props.confirmNew();
     if (this.props.isAutoPreviewing) {
-      this.props.runStage(0);
+      this.props.runStage(0, true /* force execute */);
     }
   }
 

packages/compass-aggregations/src/components/pipeline/modals/confirm-import-pipeline.jsx

@@ -61,7 +61,7 @@ class Settings extends PureComponent {
     this.props.applySettings();
 
     // Updated settings used to run all stages in the current pipeline.
-    this.props.runStage(0);
+    this.props.runStage(0, true /* force execute */);
 
     // Hide the settings panel.
     this.props.toggleSettingsIsExpanded();

packages/compass-aggregations/src/components/settings/settings.jsx

@@ -23,7 +23,7 @@ class DeleteStage extends PureComponent {
   onStageDeleted = () => {
     this.props.stageDeleted(this.props.index);
     this.props.setIsModified(true);
-    this.props.runStage(this.props.index);
+    this.props.runStage(this.props.index, true /* force execute */);
   };
 
   /**

packages/compass-aggregations/src/components/stage-editor-toolbar/delete-stage.jsx

@@ -25,7 +25,7 @@ class ToggleStage extends PureComponent {
   onStageToggled = () => {
     this.props.stageToggled(this.props.index);
     this.props.setIsModified(true);
-    this.props.runStage(this.props.index);
+    this.props.runStage(this.props.index, true /* force execute */);
   };
 
   /**

packages/compass-aggregations/src/components/stage-editor-toolbar/toggle-stage.jsx

@@ -25,15 +25,16 @@ export const toggleAutoPreview = (
   newVal: boolean
 ): ThunkAction<void, RootState, void, AutoPreviewToggledAction> => {
   return (dispatch) => {
+    dispatch({
+      type: ActionTypes.AutoPreviewToggled,
+      value: newVal
+    });
+
     if (
       newVal &&
       global?.process?.env?.COMPASS_SHOW_NEW_AGGREGATION_TOOLBAR === 'true'
     ) {
-      dispatch(runStage(0));
+      dispatch(runStage(0, true /* force execute */));
     }
-    dispatch({
-      type: ActionTypes.AutoPreviewToggled,
-      value: newVal
-    });
   };
 };