Merge pull request #17868 from storybookjs/tom/sb-232-get-rid-of-unne…

…cessary-web-cjs Update some references to use ESM rather than CJS
storybookjs · Apr 4, 2022 · bcea801 · bcea801
2 parents 7ffc089 + becc386
commit bcea801
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/addons/links/react.js b/addons/links/react.js
@@ -1 +1 @@
-module.exports = require('./dist/cjs/react');
+module.exports = require('./dist/esm/react');
diff --git a/app/angular/src/server/framework-preset-angular-cli.test.ts b/app/angular/src/server/framework-preset-angular-cli.test.ts
@@ -766,8 +766,8 @@ const newWebpackConfiguration = (
     bail: false,
     devtool: 'cheap-module-source-map',
     entry: [
-      '/Users/joe/storybook/lib/core-server/dist/cjs/globals/polyfills.js',
-      '/Users/joe/storybook/lib/core-server/dist/cjs/globals/globals.js',
+      '/Users/joe/storybook/lib/core-server/dist/esm/globals/polyfills.js',
+      '/Users/joe/storybook/lib/core-server/dist/esm/globals/globals.js',
       '/Users/joe/storybook/examples/angular-cli/.storybook/storybook-init-framework-entry.js',
       '/Users/joe/storybook/addons/docs/dist/esm/frameworks/common/config.js-generated-other-entry.js',
       '/Users/joe/storybook/addons/docs/dist/esm/frameworks/angular/config.js-generated-other-entry.js',

diff --git a/examples/official-storybook/components/addon-measure/ShadowRoot.js b/examples/official-storybook/components/addon-measure/ShadowRoot.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { drawSelectedElement } from '@storybook/addon-measure/dist/cjs/box-model/visualizer';
+import { drawSelectedElement } from '@storybook/addon-measure/dist/esm/box-model/visualizer';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { init, destroy } from '@storybook/addon-measure/dist/cjs/box-model/canvas';
+import { init, destroy } from '@storybook/addon-measure/dist/esm/box-model/canvas';
 
 export const ShadowRoot = ({ label = 'Hello from shadow DOM', drawMode = 'ROOT' }) => {
   const ref = React.useRef();

diff --git a/examples/official-storybook/components/addon-measure/Visualization.js b/examples/official-storybook/components/addon-measure/Visualization.js
@@ -1,9 +1,9 @@
 import React, { useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { drawSelectedElement } from '@storybook/addon-measure/dist/cjs/box-model/visualizer';
+import { drawSelectedElement } from '@storybook/addon-measure/dist/esm/box-model/visualizer';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { init, destroy } from '@storybook/addon-measure/dist/cjs/box-model/canvas';
+import { init, destroy } from '@storybook/addon-measure/dist/esm/box-model/canvas';
 
 export const Visualization = ({ render }) => {
   const element = useRef(null);

diff --git a/lib/components/html.js b/lib/components/html.js
@@ -1 +1 @@
-module.exports = require('./dist/cjs/html');
+module.exports = require('./dist/esm/html');
diff --git a/lib/core/client.js b/lib/core/client.js
@@ -1 +1 @@
-module.exports = require('./dist/cjs/index');
+module.exports = require('./dist/esm/index');
diff --git a/lib/router/utils.js b/lib/router/utils.js
@@ -1 +1 @@
-module.exports = require('./dist/cjs/utils');
+module.exports = require('./dist/esm/utils');
diff --git a/lib/theming/create.js b/lib/theming/create.js
@@ -1 +1 @@
-module.exports = require('./dist/cjs/create');
+module.exports = require('./dist/esm/create');