Skip to content

Commit

Permalink
fix: correct paths with new published folder structure
Browse files Browse the repository at this point in the history
  • Loading branch information
Callin Mullaney committed Jun 10, 2024
1 parent 5d5cd92 commit 048c64c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 19 deletions.
10 changes: 5 additions & 5 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ module.exports = {
'../../../../components/**/*.stories.@(js|jsx|ts|tsx)',
],
addons: [
'../../@storybook/addon-a11y',
'../../@storybook/addon-links',
'../../@storybook/addon-essentials',
'../../@storybook/addon-themes',
'../../@storybook/addon-styling-webpack'
'../../../@storybook/addon-a11y',
'../../../@storybook/addon-links',
'../../../@storybook/addon-essentials',
'../../../@storybook/addon-themes',
'../../../@storybook/addon-styling-webpack'
],
core: {
builder: 'webpack5',
Expand Down
14 changes: 2 additions & 12 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,10 @@ import Twig from 'twig';
import { setupTwig } from './setupTwig';

// GLOBAL CSS
(async () => {
let compiled;
try {
compiled = await import('../../../../dist/css/style.css');
} catch (e) {}
})();
import('../../../../dist/css/style.css');

// Custom theme preview config if it exists.
(async () => {
let preview;
try {
preview = await import('../../../../config/emulsify-core/storybook/preview');
} catch (e) {}
})();
import('../../../../config/emulsify-core/storybook/preview');

// If in a Drupal project, it's recommended to import a symlinked version of drupal.js.
import './_drupal.js';
Expand Down
4 changes: 2 additions & 2 deletions config/webpack/loaders.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ let postcssConfig;
if (fs.existsSync('./config/babel.config.js')) {
babelConfig = './config/babel.config.js';
} else {
babelConfig = './node_modules/emulsify-core/config/babel.config.js';
babelConfig = './node_modules/@emulsify/core/config/babel.config.js';
}

// Check if custom postcss config is available.
if (fs.existsSync('./config/postcss.config.js')) {
postcssConfig = './config/postcss.config.js';
} else {
postcssConfig = './node_modules/emulsify-core/config/postcss.config.js';
postcssConfig = './node_modules/@emulsify/core/config/postcss.config.js';
}

const JSLoader = {
Expand Down

0 comments on commit 048c64c

Please sign in to comment.