Merge branch 'dev' into feat-translate

.circleci/config.yml

@@ -52,30 +52,42 @@ jobs:
       - attach_workspace:
           at: ~/
 
+      - run: curl -L https://unpkg.com/@pnpm/self-installer | node
+      - run: pnpm install
+
       # remake the pnpm link to vue-cli-plugin
-      - run: npm run build vuecli3 -- --ci
-      - run: npm run build vuecli-noplugin -- --ci
-      - run: npm run build vuecli3-vuetify-ie -- --ci
-      - run: npm run test:browser vuecli3
-      - run: npm run test:browser vuecli-noplugin
-      - run: npm run test:browser vuecli3-vuetify-ie
+      - run: pnpm build vuecli3 -- --ci
+      - run: pnpm test:browser vuecli3
+      - run: pnpm build vuecli-noplugin -- --ci
+      - run: pnpm test:browser vuecli-noplugin
+      - run: pnpm build vuecli3-vuetify-ie -- --ci
+      - run: pnpm test:browser vuecli3-vuetify-ie
 
   examples-other:
     <<: *defaults
     steps:
       - attach_workspace:
           at: ~/
 
+      - run: curl -L https://unpkg.com/@pnpm/self-installer | node
+      - run: pnpm install
+
+      # Build all examples
+      - run: pnpm run build nuxtjs -- --ci
+      - run: pnpm run build docgen-nuxt -- --ci
+
+      # Check that examples really works: no JS errors on load
+      - run: pnpm run test:browser nuxtjs
+      - run: pnpm run test:browser docgen-nuxt
+
       # Build all examples
       - run: npm run build jsx -- --ci
       - run: npm run build jsx-examples -- --ci
-      - run: npm run build nuxtjs -- --ci
       - run: npm run build vuetify -- --ci
 
       # Check that examples really works: no JS errors on load
       - run: npm run test:browser jsx
       - run: npm run test:browser jsx-examples
-      - run: npm run test:browser nuxtjs
       - run: npm run test:browser vuetify
 
   cypress:

package.json

@@ -117,13 +117,14 @@
 		"tslib": "^2.0.0",
 		"typescript": "^3.7.3",
 		"vue": "^2.6.12",
+		"vue-cli-plugin-styleguidist": "^4.0.0",
 		"vue-client-only": "^2.0.0",
 		"vue-i18n": "^8.21.1",
 		"vue-meta": "^2.4.0",
 		"vue-no-ssr": "^1.1.1",
 		"vue-router": "^3.4.5",
 		"vue-scrollactive": "^0.9.3",
-		"vue-styleguidist": "workspace:^4.32.4",
+		"vue-styleguidist": "^4.0.0",
 		"vue-template-compiler": "^2.6.12",
 		"vuepress": "^1.6.0",
 		"vuex": "^3.5.1",

start.sh

@@ -12,7 +12,12 @@ esac
 cd examples/$exampleName
 if [ $1 = "build" ]; 
 then
-    npm run styleguide:build -- $extra
+    if [[ $exampleName =~ vuecli3 ]] 
+    then
+        pnpm styleguide:build -- $extra
+    else
+        npm run styleguide:build -- $extra
+    fi
 else
     npm run styleguide -- $extra
 fi