Merge 4f2a17f into 813e927

tienvx · Jul 17, 2022 · 7e1e543 · 7e1e543
2 parents 813e927 + 4f2a17f
commit 7e1e543
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5,098 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,8 +18,6 @@ jobs:
 
             - name: Install PHP dependencies
               uses: ramsey/composer-install@v1
-              with:
-                  dependency-versions: 'locked'
 
             - name: Run PHP CS Fixer
               run: php-cs-fixer fix --diff --dry-run
@@ -51,7 +49,7 @@ jobs:
         strategy:
             matrix:
                 php-versions: ['7.4', '8.0', '8.1']
-                dependencies: [ 'lowest', 'locked', 'highest' ]
+                dependencies: [ 'lowest', 'highest' ]
         name: PHP ${{ matrix.php-versions }} with ${{ matrix.dependencies }} dependencies
         steps:
             - name: Setup PHP
@@ -78,7 +76,7 @@ jobs:
               run: |
                   composer global require php-coveralls/php-coveralls
                   php-coveralls --coverage_clover=clover.xml -v
-              if: matrix.php-versions == '8.0' && matrix.dependencies == 'locked'
+              if: matrix.php-versions == '8.0' && matrix.dependencies == 'highest'
 
     test-js:
         runs-on: ubuntu-latest

diff --git a/src/Resources/assets/dist/controller.js b/src/Resources/assets/dist/controller.js
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _stimulus = require("stimulus");
+var _stimulus = require("@hotwired/stimulus");
 
 var _symfonyCollectionJs = _interopRequireDefault(require("symfony-collection-js"));
 

diff --git a/src/Resources/assets/package.json b/src/Resources/assets/package.json
@@ -2,7 +2,7 @@
     "name": "@tienvx/ux-collection-js",
     "description": "Symfony UX integration for collection form type",
     "license": "MIT",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "symfony": {
         "controllers": {
             "collection": {
@@ -28,15 +28,15 @@
         "symfony-collection-js": "4.2.0-js-only"
     },
     "peerDependencies": {
-        "stimulus": "^2.0.0"
+        "@hotwired/stimulus": "^3.0.0"
     },
     "devDependencies": {
         "@babel/cli": "^7.12.1",
         "@babel/core": "^7.12.3",
         "@babel/plugin-proposal-class-properties": "^7.12.1",
         "@babel/preset-env": "^7.12.7",
-        "@symfony/stimulus-testing": "^1.1.0",
-        "stimulus": "^2.0.0",
+        "@symfony/stimulus-testing": "^2.0.1",
+        "@hotwired/stimulus": "^3.0.0",
         "@babel/eslint-parser": "^7.12.1",
         "eslint": "^7.15.0",
         "eslint-config-prettier": "^6.15.0",

diff --git a/src/Resources/assets/src/controller.js b/src/Resources/assets/src/controller.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import { Controller } from 'stimulus';
+import { Controller } from '@hotwired/stimulus';
 import formCollection from 'symfony-collection-js';
 
 export default class extends Controller {

diff --git a/src/Resources/assets/test/controller.test.js b/src/Resources/assets/test/controller.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import { Application } from 'stimulus';
+import { Application } from '@hotwired/stimulus';
 import { getByTestId, waitFor } from '@testing-library/dom';
 import { clearDOM, mountDOM } from '@symfony/stimulus-testing';
 import CollectionJsController from '../dist/controller';