Skip to content

Commit

Permalink
Merge pull request #74 from vinayakkulkarni/fix/minor-housekeeping
Browse files Browse the repository at this point in the history
  • Loading branch information
vinayakkulkarni committed Jul 26, 2020
2 parents d0eb34a + ab4b8a6 commit f7c8569
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 42 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: ci
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
ci:
Expand All @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [12, 14]
node: [14]

steps:
- uses: actions/setup-node@v1
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/shipjs-trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,19 @@ name: Ship js trigger
on:
push:
branches:
- master
- main
jobs:
build:
name: Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: master
ref: main
- uses: actions/setup-node@v1
with:
registry-url: "https://registry.npmjs.org"
- run: |
if [ -f "yarn.lock" ]; then
yarn install
else
npm install
fi
- run: npm i
- run: npm run test
- run: npm run release:trigger
env:
Expand Down
5 changes: 1 addition & 4 deletions build/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import babel from 'rollup-plugin-babel';
import babel from '@rollup/plugin-babel';
import commonjs from '@rollup/plugin-commonjs';
import vue from 'rollup-plugin-vue';

Expand All @@ -14,7 +14,6 @@ export default [
plugins: [
babel({
exclude: 'node_modules/**',
runtimeHelpers: true,
}),
commonjs(),
vue(),
Expand All @@ -32,7 +31,6 @@ export default [
plugins: [
babel({
exclude: 'node_modules/**',
runtimeHelpers: true,
}),
commonjs(),
vue(),
Expand All @@ -53,7 +51,6 @@ export default [
plugins: [
babel({
exclude: 'node_modules/**',
runtimeHelpers: true,
}),
commonjs(),
vue(),
Expand Down
3 changes: 1 addition & 2 deletions build/rollup.min.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import babel from 'rollup-plugin-babel';
import babel from '@rollup/plugin-babel';
import commonjs from '@rollup/plugin-commonjs';
import { terser } from 'rollup-plugin-terser';
import vue from 'rollup-plugin-vue';
Expand All @@ -16,7 +16,6 @@ export default {
plugins: [
babel({
exclude: 'node_modules/**',
runtimeHelpers: true,
}),
commonjs(),
terser(),
Expand Down
2 changes: 2 additions & 0 deletions docs/.vuepress/config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
module.exports = {
title: 'V-Intl',
description: 'Easy i18n in your next Vue app :)',
themeConfig: {
sidebar: {
'/': [
Expand Down
26 changes: 13 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,36 +34,36 @@
"registry": "https://registry.npmjs.org"
},
"dependencies": {
"@vue/composition-api": "^0.6.3"
"@vue/composition-api": "^1.0.0-beta.6"
},
"devDependencies": {
"@ava/babel": "^1.0.1",
"@babel/core": "^7.10.2",
"@babel/preset-env": "^7.10.2",
"@commitlint/cli": "^9.0.1",
"@commitlint/config-conventional": "^9.0.1",
"@babel/core": "^7.10.5",
"@babel/preset-env": "^7.10.4",
"@commitlint/cli": "^9.1.1",
"@commitlint/config-conventional": "^9.1.1",
"@rollup/plugin-babel": "^5.1.0",
"@rollup/plugin-commonjs": "^14.0.0",
"@vue/test-utils": "^1.0.3",
"ava": "^3.8.2",
"ava": "^3.10.1",
"babel-eslint": "^10.1.0",
"babel-plugin-module-resolver": "^4.0.0",
"browser-env": "^3.3.0",
"eslint": "^7.2.0",
"eslint": "^7.5.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-vue": "^2.0.2",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-vue": "^6.2.2",
"husky": "^4.2.5",
"jsdom-global": "^3.0.2",
"prettier": "^2.0.5",
"require-extension-hooks": "^0.3.3",
"require-extension-hooks-babel": "^1.0.0",
"require-extension-hooks-vue": "^3.0.0",
"rollup": "^2.16.1",
"rollup-plugin-babel": "^4.4.0",
"rollup": "^2.23.0",
"rollup-plugin-terser": "^6.1.0",
"rollup-plugin-vue": "^5.1.6",
"shipjs": "^0.20.0",
"shipjs": "^0.20.1",
"vue": "^2.6.11",
"vue-template-compiler": "^2.6.11",
"vuepress": "^1.5.2"
Expand All @@ -86,5 +86,5 @@
"bugs": {
"url": "https://github.com/vinayakkulkarni/v-intl/issues"
},
"homepage": "https://github.com/vinayakkulkarni/v-intl#readme"
"homepage": "https://v-intl.netlify.app/"
}

0 comments on commit f7c8569

Please sign in to comment.