use single package.json

phoenixframework · Jan 11, 2025 · 56ce0c4 · 56ce0c4
1 parent cc92bdd
commit 56ce0c4
Show file tree

Hide file tree

Showing 21 changed files with 6,613 additions and 15,403 deletions.
diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
@@ -48,7 +48,7 @@ jobs:
             ${{ runner.os }}-node-
 
       - name: Install npm dependencies
-        run: npm ci --prefix assets
+        run: npm ci
 
       - name: Build assets
         run: mix assets.build

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -147,7 +147,7 @@ jobs:
         if: always()
         with:
           name: js-unit-coverage
-          path: assets/coverage/
+          path: coverage/
           retention-days: 7
 
   e2e_test:
@@ -161,7 +161,7 @@ jobs:
 
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/playwright:v1.47.1-jammy
+      image: mcr.microsoft.com/playwright:v1.49.1-jammy
     env:
       ImageOS: ubuntu22
       HOME: /root
@@ -275,7 +275,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: js-unit-coverage
-          path: assets/coverage/
+          path: coverage/
 
       - name: Download e2e-test-results artifact
         uses: actions/download-artifact@v4

diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,4 @@ node_modules
 
 /test/e2e/test-results/
 /playwright-report/
+/coverage/
diff --git a/assets/.gitignore b/assets/.gitignore
diff --git a/assets/eslint.config.mjs b/assets/eslint.config.mjs
@@ -11,6 +11,7 @@ export default [{
     jest,
   },
 
+  files: ["js/**/*.js", "test/**/*.js"],
   ignores: ["coverage/**"],
 
   languageOptions: {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,3 +26,4 @@ node_modules

		/test/e2e/test-results/
		/playwright-report/
		/coverage/
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ export default [{ @@
         jest,
       },
+      files: ["js/**/*.js", "test/**/*.js"],
       ignores: ["coverage/**"],
       languageOptions: {
@@ Expand Down @@