Commit 438033d2 authored by Rajab Natshah's avatar Rajab Natshah
Browse files

Issue #3299786: Configure Twig Namespaces to work for nested components and Drupal template system

parent 4fba242b

.storybook/main.js

0 → 100755
+1 −0
Original line number Diff line number Diff line

.storybook/addons.js→.storybook/manager.js

+1 −1

File changed and moved.

Contains only whitespace changes.

.storybook/config.js→.storybook/preview.js

100755 → 100644
+3 −3
Original line number Diff line number Diff line 
import { configure } from '@storybook/html';

import Twig from 'twig';

import twig from 'twig';

import twigDrupal from 'twig-drupal-filters';

import 'bootstrap/dist/css/bootstrap.min.css';

import 'bootstrap/dist/js/bootstrap';

// Add the filters to Twig instance.

twigDrupal(Twig);



configure(require.context('../src/components', true, /\.stories\.js$/), module);



twigDrupal(twig);

.storybook/webpack.config.js

+34 −6
Original line number Diff line number Diff line
@@ -2,20 +2,48 @@ const path = require('path'); 


module.exports = ({ config }) => {



  // Twig:

  // Twig

  config.module.rules.push({

    test: /\.twig$/,

    use: [{

    test: /\.(html.twig|twig)$/,

    use: [

      {

        loader: 'twig-loader',

    }, ],

        options: {

          twigOptions: {

            namespaces: {

              vartheme_bs5: path.resolve(__dirname, '../', 'src/components'),

              atoms: path.resolve(__dirname, '../', 'src/components/atoms'),

              molecules: path.resolve(__dirname, '../', 'src/components/molecules'),

              organisms: path.resolve(__dirname, '../', 'src/components/organisms'),

              templates: path.resolve(__dirname, '../', 'src/components/templates'),

              pages: path.resolve(__dirname, '../', 'src/components/pages'),

            },

          },

        },

      },

    ],

  });



  // Sass:

  config.module.rules.push({

    test: /\.scss$/,

    test: /\.s[ac]ss$/i,

    use: ['style-loader', 'css-loader', 'sass-loader'],

    include: path.resolve(__dirname, '../'),

  });



  // Row text loader.

  config.module.rules.push({

    test: /\.txt$/i,

    use: [

      {

        loader: 'raw-loader',

        options: {

          esModule: false,

        },

      },

    ],

  });



  return config;

};

package.json

+5 −2
Original line number Diff line number Diff line
@@ -44,11 +44,11 @@ 
		"@storybook/addon-backgrounds": "~6",

		"@storybook/addon-controls": "~6",

		"@storybook/addon-docs": "~6",

		"@storybook/addon-knobs": "~6",

		"@storybook/addon-links": "~6",

		"@storybook/addon-storysource": "~6",

		"@storybook/addon-viewport": "~6",

    "@storybook/addon-interactions": "~6",

    "@storybook/addon-postcss": "~2",

		"@storybook/html": "~6",

		"@storybook/react": "~6",

    "raw-loader": "~4",
@@ -59,6 +59,9 @@ 
		"style-loader": "~3",

		"twig": "~1",

		"twig-drupal-filters": "~3",

		"twig-loader": "^0.5.5"

		"twig-loader": "https://github.com/fourkitchens/twig-loader",

    "webpack": "~5",

    "webpack-cli": "~4",

    "webpack-merge": "~5"

	}

}