Skip to content

Commit

Permalink
Build(npm): update npm dependencies.
Browse files Browse the repository at this point in the history
This commit also upgrade Tinymce to 5.5.1 and fixed some eslint issues.
  • Loading branch information
Armour committed Nov 1, 2020
1 parent 6bc162c commit f5cd4c4
Show file tree
Hide file tree
Showing 40 changed files with 4,144 additions and 26,359 deletions.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
> 1%
last 2 versions
not dead
13 changes: 9 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,23 @@ jobs:
steps:
- checkout

# Download and cache dependencies
# Download dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
# Fallback to using the latest cache if no exact match is found
- v1-dependencies-

- run: yarn install

- run: yarn lint

- run: yarn test:unit

- run: yarn build:prod

# Cache dependencies
- save_cache:
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}

- run: yarn lint && yarn build:prod
9 changes: 0 additions & 9 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,11 +1,2 @@
# Base api
VUE_APP_BASE_API = '/dev-api'

# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
# It only does one thing by converting all import() to require().
# This configuration can significantly increase the speed of hot updates,
# when you have a large number of pages.
# Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js

VUE_CLI_BABEL_TRANSPILE_MODULES = true
5 changes: 3 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
node: true
},
extends: [
'plugin:vue/recommended',
'plugin:vue/essential',
'@vue/standard',
'@vue/typescript/recommended'
],
Expand All @@ -24,6 +24,7 @@ module.exports = {
}
}],
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-var-requires': 'off',
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'space-before-function-paren': ['error', 'never'],
Expand All @@ -33,7 +34,7 @@ module.exports = {
'vue/brace-style': 'error',
'vue/camelcase': 'error',
'vue/comma-dangle': 'error',
'vue/component-name-in-template-casing': 'error',
'vue/component-name-in-template-casing': ['error', 'kebab-case'],
'vue/eqeqeq': 'error',
'vue/key-spacing': 'error',
'vue/match-component-file-name': 'error',
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v1
uses: actions/checkout@v2
- name: Install and Build
run: |
npm install
npm run build:prod
- name: Deploy
uses: maxheld83/ghpages@v0.2.1
uses: maxheld83/ghpages@v0.3.0
env:
BUILD_DIR: dist/
GH_PAT: ${{ secrets.GH_PAT }}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ node_modules
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*

# Editor directories and files
.idea
Expand All @@ -24,4 +25,4 @@ yarn-error.log*
*.ntvs*
*.njsproj
*.sln
*.sw*
*.sw?
6 changes: 0 additions & 6 deletions README-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,6 @@ yarn lint
yarn test:unit
```

### 运行端对端测试

```bash
yarn test:e2e
```

### 自动生成 svg 组件

```bash
Expand Down
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,6 @@ yarn run lint
yarn run test:unit
```

#### Run your end-to-end tests

```bash
yarn run test:e2e
```

#### Generate all svg components

```bash
Expand Down
5 changes: 4 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
module.exports = {
preset: '@vue/cli-plugin-unit-jest/presets/typescript-and-babel'
preset: '@vue/cli-plugin-unit-jest/presets/typescript-and-babel',
transform: {
'^.+\\.vue$': 'vue-jest'
}
}
Loading

0 comments on commit f5cd4c4

Please sign in to comment.