Merge pull request #16 from MicroAppJS/develop

:update: config
MicroAppJS · Jan 9, 2020 · 9761ec4 · 9761ec4
2 parents c6ba118 + 822bce7
commit 9761ec4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -20,8 +20,8 @@ jobs:
                   GITHUB_CLIENT_SECRET: ${{ secrets.GITHUB_CLIENT_SECRET }}
 
             - name: Deploy
-              uses: JamesIves/github-pages-deploy-action@master
-              env:
+              uses: JamesIves/github-pages-deploy-action@releases/v3
+              with:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   BRANCH: gh-pages
                   FOLDER: docs/.vuepress/dist
diff --git a/bin/micro-app-vuepress b/bin/micro-app-vuepress
@@ -9,16 +9,20 @@ const path = require('path');
 const { tryRequire, logger, execa } = require('@micro-app/shared-utils');
 let MicroAppCLI = tryRequire('@micro-app/cli');
 if (!MicroAppCLI) {
-    logger.info('[auto]', 'npm install @micro-app/cli');
-    const { exitCode, stderr } = execa.sync('npm', [ 'install', '@micro-app/cli', '--no-save', '--no-package-lock' ], {
-        cwd: process.cwd(),
-        stdio: 'inherit',
-    });
-    if (exitCode) {
-        logger.throw(stderr);
-    }
     const importFresh = require('import-fresh'); // 依赖 @micro-app/shared-utils
-    MicroAppCLI = importFresh('@micro-app/cli');
+    try {
+        MicroAppCLI = importFresh('@micro-app/cli');
+    } catch (error) {
+        logger.info('[auto]', 'npm install @micro-app/cli');
+        const { exitCode, stderr } = execa.sync('npm', [ 'install', '@micro-app/cli', '--no-save', '--no-package-lock' ], {
+            cwd: __dirname,
+            stdio: 'inherit',
+        });
+        if (exitCode) {
+            logger.throw(stderr);
+        }
+        MicroAppCLI = importFresh('@micro-app/cli');
+    }
 }
 if (!MicroAppCLI) {
     logger.throw("Cannot find module '@micro-app/cli'!");

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@micro-app/plugin-vuepress",
-    "version": "0.0.12",
+    "version": "0.0.13",
     "description": "[Plugin] adapter vuepress plugin.",
     "main": "src/index.js",
     "bin": {

diff --git a/theme/components/Home.vue b/theme/components/Home.vue
@@ -146,7 +146,7 @@ export default {
         }
     }
 
-    .custom {
+    .custom[class] {
         max-width: 960px;
         margin: 0px auto;
         // padding: 0 1.2rem 2rem;