Skip to content

Commit

Permalink
Merge pull request #320 from EnviDat/build/upgrade_ol_v6.15.7
Browse files Browse the repository at this point in the history
Merge Vue CLI updates & upgrade to OpenLayers v6.15.7
  • Loading branch information
chrismayer authored Jun 26, 2023
2 parents b3bb734 + 12d4fa6 commit 2f2be80
Show file tree
Hide file tree
Showing 139 changed files with 33,885 additions and 14,165 deletions.
39 changes: 0 additions & 39 deletions .babelrc

This file was deleted.

3 changes: 3 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
> 1%
last 2 versions
not dead
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
app/
dist/
node_modules/
test/unit/coverage/
tests/unit/coverage/
.git/
8 changes: 2 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
root = true

[*]
charset = utf-8
[*.{js,jsx,ts,tsx,vue}]
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
insert_final_newline = true
5 changes: 3 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
build/*.js
config/*.js
/build/
/config/
/test/unit/coverage/
70 changes: 37 additions & 33 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,44 +1,48 @@
// http://eslint.org/docs/user-guide/configuring

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
sourceType: 'module'
},
env: {
browser: true,
node: true
},
// https://github.com/standard/standard/blob/master/docs/RULES-en.md
extends: 'standard',
// required to lint *.vue files
plugins: [
'html'
extends: [
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
'plugin:vue/essential',
'@vue/standard'
],
// add your custom rules here
'rules': {
// allow paren-less arrow functions
'arrow-parens': 'off',
// allow async-await
'generator-star-spacing': 'off',
// allow debugger during development
rules: {
/* eslint-disable quote-props */
// 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',

// allow semicolons and the end of a statement
'semi': 'off',

// weaken some rules in development mode
'no-multiple-empty-lines': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'no-unused-vars': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'space-before-blocks': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'space-before-function-paren': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'object-curly-spacing': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'indent': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'comma-dangle': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'comma-spacing': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'quotes': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'object-curly-spacing': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'padded-blocks': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'keyword-spacing': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'arrow-spacing': process.env.NODE_ENV === 'development' ? 'warn' : 'error'
}
'no-multiple-empty-lines': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'no-unused-vars': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'space-before-blocks': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'space-before-function-paren': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'object-curly-spacing': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'indent': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'comma-dangle': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'comma-spacing': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'quotes': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'padded-blocks': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'keyword-spacing': process.env.NODE_ENV === 'development' ? 'warn' : 'error',
'arrow-spacing': process.env.NODE_ENV === 'development' ? 'warn' : 'error'
/* eslint-enable quote-props */
},
parserOptions: {
parser: '@babel/eslint-parser'
},
overrides: [
{
files: [
'**/__tests__/*.{j,t}s?(x)',
'**/tests/unit/**/*.spec.{j,t}s?(x)'
],
env: {
mocha: true
}
}
]
}
21 changes: 17 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
.DS_Store
node_modules/
dist/
node_modules
/dist


# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
test/unit/coverage
pnpm-debug.log*

# Unit tests coverage reports
test/unit/coverage/
tests/unit/coverage/

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sln
*.sw?
2 changes: 1 addition & 1 deletion .gitpod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ports:
onOpen: open-preview
tasks:
- init: npm install && npm run init:app
command: npm run dev
command: npm run serve
vscode:
extensions:
- dbaeumer.vscode-eslint
8 changes: 0 additions & 8 deletions .postcssrc.js

This file was deleted.

28 changes: 23 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ npm run init:app

``` bash
# serve with hot reload at localhost:8081
npm run dev
npm run serve
```

### Unit tests

To run all unit tests execute the following:
To run all unit tests using Karma test runner execute the following:

``` bash
# run all tests
npm test
npm run test
```

NB the unit tests require Chrome or Chromium browser executable to be found.
Expand All @@ -83,7 +83,25 @@ Run the build script in order to create a production build, which can be copied
npm run build
```

For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
### Linting your files

Run the lint script in order to lint all your files without fixing the errors. The problems will be reported in the console only.

``` bash
npm run lint
```

### Linting and fixing your files

Run the lint script in order to lint all your files and fix the errors at the same time.

``` bash
npm run lint:fix
```

### Customize configuration

See [Configuration Reference](https://cli.vuejs.org/config/).

## Run with Docker

Expand Down Expand Up @@ -140,6 +158,6 @@ You need professional support or teachings for Wegue? Please contact a service p

## Credits

The basic project setup was created by https://github.com/vuejs-templates/webpack.
The basic project setup was created with [Vue CLI](https://cli.vuejs.org).

Thanks for this great template! :+1:
14 changes: 7 additions & 7 deletions app-starter/WguApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
</template>

<script>
import WguAppTemplate from './WguAppTemplate.vue';
export default {
name: 'my-wgu-app',
components: {
'wgu-app-tpl': WguAppTemplate
}
// add Vue methods and hooks here
import WguAppTemplate from './WguAppTemplate.vue';
export default {
name: 'my-wgu-app',
components: {
'wgu-app-tpl': WguAppTemplate
}
// add Vue methods and hooks here
}
</script>
Loading

0 comments on commit 2f2be80

Please sign in to comment.