Merge ae5c09e into b1a77e3

Alorel · May 4, 2021 · 57d9844 · 57d9844
2 parents b1a77e3 + ae5c09e
commit 57d9844
Show file tree

Hide file tree

Showing 12 changed files with 17,476 additions and 47,484 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -17,7 +17,6 @@
 *.nycrc text
 *.toml text
 *.pug text
-yarn.lock text
 *.md text
 *.scss text
 *.sass text

diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -5,42 +5,51 @@ on:
 
 jobs:
   lint:
+    name: Lint
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os:
           - ubuntu-latest
         node:
-          - 14.x
+          - 14
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-      - name: Cache
-        uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         name: Set up node
         with:
           node-version: ${{ matrix.node }}
-          registry-url: https://npm.pkg.github.com/alorel
-      - name: Set up yarn
-        run: npm install -g yarn@^2.0.0-rc.27
+          registry-url: https://npm.pkg.github.com
+      - name: Get NPM cache dir
+        id: npm-cache-dir
+        run: |
+          echo "::set-output name=dir::$(npm config get cache)"
+      - name: Cache NPM
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.npm-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-npm-${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-npm-${{ matrix.node }}-
+      - name: Install NPM^7.11
+        run: npm install -g npm@^7.11.2 --no-fund --no-audit
+#      - name: Output NPM version
+#        id: npm-version
+#        run: |
+#          echo "::set-output name=version::$(npm -v)"
+#      - name: Install NPM7
+#        if: ${{ !startsWith(npm-version.version, '7' }}
+#        run: npm install -g npm@^7.7.6
       - name: Install deps
-        run: yarn install --immutable
+        run: npm ci --no-fund
         env:
-          YARN_NPM_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Lint
-        run: yarn run lint
+        run: npm run lint
   test:
     runs-on: ${{ matrix.os }}
+    name: Test ${{ matrix.os }}/Node ${{ matrix.node }}
     strategy:
       fail-fast: false
       matrix:
@@ -49,43 +58,50 @@ jobs:
 #          - macos-latest
           - ubuntu-latest
         node:
-          - 14.x
-          - 12.x
+          - 15
+          - 14
+          - 12
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-      - name: Cache
-        uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         name: Set up node
         with:
           node-version: ${{ matrix.node }}
-          registry-url: https://npm.pkg.github.com/alorel
-      - name: Set up yarn
-        run: npm install -g yarn@^2.0.0-rc.27
+          registry-url: https://npm.pkg.github.com
+      - name: Get NPM cache dir
+        id: npm-cache-dir
+        run: |
+          echo "::set-output name=dir::$(npm config get cache)"
+      - name: Cache NPM
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.npm-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-npm-${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-npm-${{ matrix.node }}-
+      - name: Install NPM^7.11
+        run: npm install -g npm@^7.11.2 --no-fund --no-audit
+      #      - name: Output NPM version
+      #        id: npm-version
+      #        run: |
+      #          echo "::set-output name=version::$(npm -v)"
+      #      - name: Install NPM7
+      #        if: ${{ !startsWith(npm-version.version, '7' }}
+      #        run: npm install -g npm@^7.7.6
       - name: Install deps
-        run: yarn install --immutable
+        run: npm ci --no-fund
         env:
-          YARN_ENABLE_GLOBAL_CACHE: 'false'
-          YARN_NPM_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Test
-        run: yarn run test --forbid-only --forbid-pending
+        run: npm run test -- --forbid-only --forbid-pending
       - name: Upload coverage
         if: ${{ matrix.os != 'windows-latest' }}
         continue-on-error: true
         uses: coverallsapp/github-action@v1.1.2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          flag-name: node-${{ matrix.node }}-on-${{ matrix.os }}
+          flag-name: node-${{ matrix.node }}-on-${{ matrix.os }}-${{ github.event_name }}
           parallel: true
   posttest:
     runs-on: ubuntu-latest
@@ -98,8 +114,9 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
   release:
+    name: Release
     runs-on: ${{ matrix.os }}
-    if: ${{ github.ref == 'refs/heads/master' }}
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
     needs:
       - lint
       - test
@@ -108,35 +125,43 @@ jobs:
         os:
           - ubuntu-latest
         node:
-          - 14.x
+          - 14
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          fetch-depth: 100
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-      - name: Cache
-        uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
-      - uses: actions/setup-node@v1
+          fetch-depth: 1000
+      - uses: actions/setup-node@v2
         name: Set up node
         with:
           node-version: ${{ matrix.node }}
-          registry-url: https://npm.pkg.github.com/alorel
-      - name: Set up yarn
-        run: npm install -g yarn@^2.0.0-rc.27
+          registry-url: https://npm.pkg.github.com
+      - name: Get NPM cache dir
+        id: npm-cache-dir
+        run: |
+          echo "::set-output name=dir::$(npm config get cache)"
+      - name: Cache NPM
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.npm-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-npm-${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-npm-${{ matrix.node }}-
+      - name: Install NPM^7.11
+        run: npm install -g npm@^7.11.2 --no-fund --no-audit
+      #      - name: Output NPM version
+      #        id: npm-version
+      #        run: |
+      #          echo "::set-output name=version::$(npm -v)"
+      #      - name: Install NPM7
+      #        if: ${{ !startsWith(npm-version.version, '7' }}
+      #        run: npm install -g npm@^7.7.6
       - name: Install deps
-        run: yarn install --immutable
+        run: npm ci --no-fund
         env:
-          YARN_ENABLE_GLOBAL_CACHE: 'false'
-          YARN_NPM_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Release
-        run: yarn run release
+        run: npm run release
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+@alorel:registry=https://npm.pkg.github.com
diff --git a/.releaserc.js b/.releaserc.js
@@ -17,20 +17,20 @@ module.exports = {
   prepare: [
     '@semantic-release/changelog',
     NPM,
-    exec('yarn run sync-pkg'),
-    exec('yarn run doctoc'),
+    exec('npm run sync-pkg'),
+    exec('npm run doctoc'),
     {
       assets: [
         'CHANGELOG.md',
         'README.md',
         'package.json',
-        'yarn.lock',
+        'package-lock.json',
         ...projectNames.flatMap(n => [`projects/${n}/package.json`, `projects/${n}.README.md`])
       ],
       message: 'chore(release): ${nextRelease.version}',
       path: '@semantic-release/git'
     },
-    exec('yarn run rollup')
+    exec('npm run rollup')
   ],
   publish: [
     ...projectNames.map(p => exec(`bash -c "cd dist/${p} && npm publish"`)),

diff --git a/.yarn/.gitignore b/.yarn/.gitignore