diff --git a/packages/cli/bin/install-plugin.js b/packages/cli/bin/install-plugin.js index 42ea84c63..f297bd62a 100644 --- a/packages/cli/bin/install-plugin.js +++ b/packages/cli/bin/install-plugin.js @@ -22,7 +22,7 @@ const installPlugin = (plugin, config) => try { const pluginConfigJSON = require(pluginPathConfig); if (!_.has(config.plugins[name].options)) { - _.set(config, `plugins[${name}]['options]`, pluginConfigJSON); + _.set(config, `plugins[${name}][options]`, pluginConfigJSON); } } catch (ex) { //a config.json file is not required at this time diff --git a/packages/core/src/lib/plugin_manager.js b/packages/core/src/lib/plugin_manager.js index a3a37ab58..e19e20dc6 100644 --- a/packages/core/src/lib/plugin_manager.js +++ b/packages/core/src/lib/plugin_manager.js @@ -42,11 +42,11 @@ const plugin_manager = function() { */ function initializePlugins(patternlab) { const nodeModulesPath = path.join(process.cwd(), 'node_modules'); - const foundPlugins = findModules(nodeModulesPath, plugin_manager.is_plugin); + const foundPlugins = findModules(nodeModulesPath, isPlugin); foundPlugins.forEach(plugin => { logger.info(`Found plugin: plugin-${plugin.name}`); logger.info(`Attempting to load and initialize plugin.`); - const pluginModule = plugin_manager.load_plugin(plugin.modulePath); + const pluginModule = loadPlugin(plugin.modulePath); pluginModule(patternlab); }); } diff --git a/packages/plugin-tab/README.md b/packages/plugin-tab/README.md index 8bd03b862..c7cea632f 100644 --- a/packages/plugin-tab/README.md +++ b/packages/plugin-tab/README.md @@ -28,7 +28,7 @@ Example: ``` "plugins": { - "pattern-lab-plugin-tab": { + "@pattern-lab/plugin-tab": { "enabled": true, "initialized": false, "options": { diff --git a/packages/plugin-tab/index.js b/packages/plugin-tab/index.js index b5cea6072..02259a909 100644 --- a/packages/plugin-tab/index.js +++ b/packages/plugin-tab/index.js @@ -9,7 +9,7 @@ const glob = require('glob'); const tab_loader = require('./src/tab-loader'); -const pluginName = 'pattern-lab-plugin-tab'; +const pluginName = '@pattern-lab/plugin-tab'; function writeConfigToOutput(patternlab, pluginConfig) { try { diff --git a/packages/plugin-tab/src/tab-loader.js b/packages/plugin-tab/src/tab-loader.js index 7ae297500..296245cc0 100644 --- a/packages/plugin-tab/src/tab-loader.js +++ b/packages/plugin-tab/src/tab-loader.js @@ -14,7 +14,7 @@ const fs = require('fs-extra'); function findTab(patternlab, pattern) { //read the filetypes from the configuration const fileTypes = - patternlab.config.plugins['pattern-lab-plugin-tab'].options.tabsToAdd; + patternlab.config.plugins['@pattern-lab/plugin-tab'].options.tabsToAdd; //exit if either of these two parameters are missing if (!patternlab) { diff --git a/packages/uikit-workshop/src/scripts/components/plugin-loader.js b/packages/uikit-workshop/src/scripts/components/plugin-loader.js index 239e1b992..7a7cc5c64 100644 --- a/packages/uikit-workshop/src/scripts/components/plugin-loader.js +++ b/packages/uikit-workshop/src/scripts/components/plugin-loader.js @@ -10,7 +10,7 @@ const scriptjs = require('scriptjs'); export const pluginLoader = { init() { for (let i = 0; i < window.plugins.length; ++i) { - const plugin = window.lugins[i]; + const plugin = window.plugins[i]; // load the templates for (const key in plugin.templates) {