re-add old version support

Author: weaverryan

lib/WebpackConfig.js

@@ -131,6 +131,10 @@ class WebpackConfig {
             resolveUrlLoader: true,
             resolveUrlLoaderOptions: {}
         };
+        /** @deprecated */
+        this.stimulusOptions = {
+            controllerJsonPath: null,
+        };
         this.preactOptions = {
             preactCompat: false
         };
@@ -682,6 +686,7 @@ class WebpackConfig {
             this.addEntry(name, rootDir + '/' + controllersData.entrypoints[name]);
         }
 
+        this.stimulusOptions.controllersJsonPath = controllerJsonPath;
         this.addAliases({
             '@symfony/stimulus-bridge/controllers.json': path.resolve(controllerJsonPath),
         });

lib/config-generator.js

@@ -38,6 +38,7 @@ const friendlyErrorPluginUtil = require('./plugins/friendly-errors');
 const assetOutputDisplay = require('./plugins/asset-output-display');
 const notifierPluginUtil = require('./plugins/notifier');
 const PluginPriorities = require('./plugins/plugin-priorities');
+const stimulusBridge = require('./plugins/stimulus-bridge');
 const applyOptionsCallback = require('./utils/apply-options-callback');
 const copyEntryTmpName = require('./utils/copyEntryTmpName');
 const getVueVersion = require('./utils/get-vue-version');
@@ -422,6 +423,8 @@ class ConfigGenerator {
 
         variableProviderPluginUtil(plugins, this.webpackConfig);
 
+        stimulusBridge(plugins, this.webpackConfig);
+
         cleanPluginUtil(plugins, this.webpackConfig);
 
         definePluginUtil(plugins, this.webpackConfig);

lib/plugins/stimulus-bridge.js

@@ -0,0 +1,43 @@
+/*
+ * This file is part of the Symfony Webpack Encore package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+'use strict';
+
+const WebpackConfig = require('../WebpackConfig'); //eslint-disable-line no-unused-vars
+const loaderFeatures = require('../features');
+const fs = require('fs');
+const packageHelper = require('../package-helper');
+const semver = require('semver');
+
+/**
+ * Support for @symfony/stimulus-bridge 1.1 or lower.
+ *
+ * @param {Array} plugins
+ * @param {WebpackConfig} webpackConfig
+ * @deprecated
+ * @return {void}
+ */
+module.exports = function(plugins, webpackConfig) {
+    if (webpackConfig.useStimulusBridge) {
+        loaderFeatures.ensurePackagesExistAndAreCorrectVersion('stimulus');
+
+        const version = packageHelper.getPackageVersion('@symfony/stimulus-bridge');
+        if (semver.satisfies(version, '^1.2.0')) {
+            // package is new and doesn't require this plugin
+
+            return;
+        }
+
+        const createPlugin = require('@symfony/stimulus-bridge/webpack-helper'); // eslint-disable-line node/no-unpublished-require
+
+        plugins.push({
+            plugin: createPlugin(JSON.parse(fs.readFileSync(webpackConfig.stimulusOptions.controllersJsonPath))),
+        });
+    }
+};

package.json

@@ -59,7 +59,7 @@
     "@babel/preset-react": "^7.0.0",
     "@babel/preset-typescript": "^7.0.0",
     "@symfony/mock-module": "file:fixtures/stimulus/mock-module",
-    "@symfony/stimulus-bridge": "git://github.com/symfony/stimulus-bridge#main",
+    "@symfony/stimulus-bridge": "^1.1.0",
     "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
     "@vue/babel-preset-jsx": "^1.0.0",
     "@vue/compiler-sfc": "^3.0.2",

test/functional.js

@@ -18,6 +18,8 @@ const path = require('path');
 const testSetup = require('./helpers/setup');
 const fs = require('fs-extra');
 const getVueVersion = require('../lib/utils/get-vue-version');
+const packageHelper = require('../lib/package-helper');
+const semver = require('semver');
 
 function createWebpackConfig(outputDirName = '', command, argv = {}) {
     const webpackConfig = testSetup.createWebpackConfig(
@@ -1913,9 +1915,17 @@ module.exports = {
             });
         });
 
-        it('Symfony - Stimulus standard app is built correctly', (done) => {
+        it('Symfony - Stimulus standard app is built correctly', function (done) {
             const appDir = testSetup.createTestAppDir();
 
+            const version = packageHelper.getPackageVersion('@symfony/stimulus-bridge');
+            if (!semver.satisfies(version, '^1.2.0')) {
+                // we support the old version, but it's not tested
+                this.skip();
+
+                return;
+            }
+
             const config = testSetup.createWebpackConfig(appDir, 'www/build', 'dev');
             config.enableSingleRuntimeChunk();
             config.setPublicPath('/build');

yarn.lock

@@ -973,11 +973,12 @@
 "@symfony/mock-module@file:fixtures/stimulus/mock-module":
   version "1.0.0"
 
-"@symfony/stimulus-bridge@git://github.com/symfony/stimulus-bridge#main":
+"@symfony/stimulus-bridge@^1.1.0":
   version "1.1.0"
-  resolved "git://github.com/symfony/stimulus-bridge#a720035de8c3d6f4dac6af097364ba4f92bf187f"
+  resolved "https://registry.yarnpkg.com/@symfony/stimulus-bridge/-/stimulus-bridge-1.1.0.tgz#34548c633fe49bcda84cc812939f63640e698af7"
+  integrity sha512-Sz8iwKQHBjrgCnxCGwH87S/J/Min0gX3EuXJaHi4vpibY3BjVm+WYuP8+OYPkMIROPyNZKYgTffFfJLBAFLwFQ==
   dependencies:
-    "@babel/plugin-proposal-class-properties" "^7.12.1"
+    webpack-virtual-modules "^0.3.2"
 
 "@types/anymatch@*":
   version "1.3.1"
@@ -8234,6 +8235,13 @@ webpack-virtual-modules@^0.2.2:
   dependencies:
     debug "^3.0.0"
 
+webpack-virtual-modules@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.3.2.tgz#b7baa30971a22d99451f897db053af48ec29ad2c"
+  integrity sha512-RXQXioY6MhzM4CNQwmBwKXYgBs6ulaiQ8bkNQEl2J6Z+V+s7lgl/wGvaI/I0dLnYKB8cKsxQc17QOAVIphPLDw==
+  dependencies:
+    debug "^3.0.0"
+
 webpack@^5.12:
   version "5.12.2"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.12.2.tgz#f79574cdb7a4ef711c5f47f3d189e045a14217e5"