Merge pull request #801 from nextcloud/feat/deps-npm7

nextcloud · Jun 16, 2021 · 4e1d098 · 4e1d098
2 parents 0a6791d + 75efe53
commit 4e1d098
Show file tree

Hide file tree

Showing 18 changed files with 21,626 additions and 8,011 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
           coverage: none
@@ -38,10 +38,10 @@ jobs:
     name: cs php${{ matrix.php-versions }}
     steps:
     - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v2
 
     - name: Set up php
-      uses: shivammathur/setup-php@master
+      uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-versions }}
         coverage: none
@@ -55,18 +55,17 @@ jobs:
   node:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-versions: [12.x]
-
-    name: eslint node${{ matrix.node-versions }}
+    name: eslint node
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up node ${{ matrix.node-versions }}
-        uses: actions/setup-node@v1
+      - name: Set up node
+        uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node-versions }}
+          node-version: 14
+
+      - name: Set up npm7
+        run: npm i -g npm@7
 
       - name: Install dependencies
         run: npm ci
@@ -77,18 +76,17 @@ jobs:
   stylelint:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-versions: [12.x]
-
-    name: stylelint node${{ matrix.node-versions }}
+    name: stylelint node
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up node ${{ matrix.node-versions }}
-        uses: actions/setup-node@v1
+      - name: Set up node
+        uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node-versions }}
+          node-version: 14
+
+      - name: Set up npm7
+        run: npm i -g npm@7
 
       - name: Install dependencies
         run: npm ci

diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -11,18 +11,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-versions: [12.x]
-
-    name: node${{ matrix.node-versions }}
+    name: node
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up node ${{ matrix.node-versions }}
-        uses: actions/setup-node@v1
+      - name: Set up node 
+        uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node-versions }}
+          node-version: 14
+
+      - name: Set up npm7
+        run: npm i -g npm@7
 
       - name: Install dependencies & build
         run: |

diff --git a/babel.config.js b/babel.config.js
@@ -1,11 +1,3 @@
-module.exports = {
-	plugins: ['@babel/plugin-syntax-dynamic-import'],
-	presets: [
-		[
-			'@babel/preset-env',
-			{
-				modules: false
-			}
-		]
-	]
-}
+const babelConfig = require('@nextcloud/babel-config')
+
+module.exports = babelConfig
diff --git a/js/photos-main.js b/js/photos-main.js