Skip to content
Snippets Groups Projects
Commit dee01650 authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Update: Use yarn 2 with pnp (coscine/issues#1227)

parent 557d0a1d
Branches
Tags
No related merge requests found
#root = true
[*]
indent_style = space
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
max_line_length = 100
indent_size = 2
[*.md]
trim_trailing_whitespace = false
...@@ -2,6 +2,14 @@ ...@@ -2,6 +2,14 @@
node_modules node_modules
/dist /dist
# yarn
.yarn/*
!.yarn/releases
!.yarn/plugins
!.yarn/sdks
!.yarn/versions
.pnp.*
# local env files # local env files
.env.local .env.local
.env.*.local .env.*.local
...@@ -14,7 +22,6 @@ yarn-error.log* ...@@ -14,7 +22,6 @@ yarn-error.log*
# Editor directories and files # Editor directories and files
.idea .idea
.vscode .vscode
.vs
*.suo *.suo
*.ntvs* *.ntvs*
*.njsproj *.njsproj
......
include:
- project: coscine/tools/gitlab-ci-templates
file:
- /docker-runner.yml
- /nodejs.yml
stages: stages:
- test - build
# there are more stages in the imported file but we only want to import some
# - test
- publish - publish
- release
- pre_release
before_script:
- npm install
test:
stage: test
script:
- npm run build
- npm test
except:
refs:
- master
- tags
variables:
- $GITLAB_USER_ID == $GIT_BOT_USER_ID
publish: build-branch:
stage: publish extends: .build-branch
script:
- npm run build
- npm test
- npx semantic-release
only:
- master
except:
variables:
- $GITLAB_USER_ID == $GIT_BOT_USER_ID
release: build-npm-release:
stage: release extends: .build-npm-release
script:
- npm run build
artifacts:
paths:
- dist
only:
- tags
pre_release: publish-gitlab:
stage: pre_release extends: .publish-gitlab-release
script:
- npm run build
artifacts:
paths:
- dist
when: manual
except:
- tags
- master
packageExtensions:
"@vue/cli-service@*":
peerDependencies:
"@vue/cli-plugin-babel": "*"
"@vue/cli-plugin-eslint": "*"
"@vue/cli-plugin-typescript": "*"
"@vue/cli-plugin-typescript@*":
peerDependencies:
"babel-loader": "*"
"fork-ts-checker-webpack-plugin@*":
dependencies:
"vue-template-compiler": "*"
peerDependencies:
"typescript": "*"
"vue-i18n@*":
dependencies:
"vue": "^2.6.12"
"vue-material-design-icons@*":
dependencies:
"vue": "^2.6.12"
"vue-multiselect@*":
dependencies:
"vue": "^2.6.12"
"vue-router@*":
dependencies:
"vue": "^2.6.12"
"vuex@*":
dependencies:
"vue": "^2.6.12"
"bootstrap-vue@*":
dependencies:
"vue": "^2.6.12"
"jquery": "*"
# vue-template # Project
This template includes: This app represents our CoScInE projects.
\ No newline at end of file
* Vue.js application template
* Linting using TSLint and the Vue builders
* Automatic releases using semantic-release (ESLint Code Convention) and Gitlab CI / CD
* Automatic Unit tests using Mocha/Chai and the Vue cli
* Automatic documentation publishing using Gitlab CI / CD and a self written script which puts the docs in the docs folder to the wiki
* For public registry: Publishing of packages, for usage add the following lines to package.json, add the npm publish module in .releaserc and provide a valid NPM token:
```
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org/",
"tag": "latest"
}
```
## Project setup
```
npm install
```
### Compiles and hot-reloads for development
```
npm run serve
```
### Compiles and minifies for production
```
npm run build
```
### Run your tests
```
npm run test
```
### Lints and fixes files
```
npm run lint
```
### Run your unit tests
```
npm run test:unit
```
### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/).
module.exports = {
presets: [
'@vue/app',
["@babel/preset-env",
{
"targets": {
"ie": "11"
}
}]
],
}
Source diff could not be displayed: it is too large. Options to address this: view the blob.
...@@ -8,38 +8,32 @@ ...@@ -8,38 +8,32 @@
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build",
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint"
"test:unit": "vue-cli-service test:unit"
}, },
"dependencies": { "dependencies": {
"@coscine/component-library": "1.4.1", "@coscine/api-connection": "^1.24.2",
"@coscine/api-connection": "^1.23.1", "@coscine/app-util": "^1.8.1",
"@coscine/app-util": "^1.7.1", "@coscine/component-library": "^1.5.0",
"@itcenter-layout/bootstrap": "^1.5.5", "@itcenter-layout/bootstrap": "^1.5.5",
"@itcenter-layout/masterpage": "^1.3.0", "@itcenter-layout/masterpage": "^1.3.0",
"@types/jquery": "^3.5.2", "@types/jquery": "^3.5.5",
"bootstrap-vue": "^2.17.3", "bootstrap-vue": "^2.21.2",
"jquery": "^3.5.1", "jquery": "^3.5.1",
"vue": "^2.6.12", "vue": "^2.6.12",
"vue-i18n": "^8.22.0", "vue-i18n": "^8.22.3",
"vue-runtime-helpers": "^1.1.2" "vue-runtime-helpers": "^1.1.2"
}, },
"devDependencies": { "devDependencies": {
"@babel/preset-env": "^7.11.5",
"@hutson/semantic-delivery-gitlab": "^9.1.0", "@hutson/semantic-delivery-gitlab": "^9.1.0",
"@semantic-release/commit-analyzer": "^8.0.1", "@semantic-release/commit-analyzer": "^8.0.1",
"@semantic-release/git": "^9.0.0", "@semantic-release/git": "^9.0.0",
"@semantic-release/gitlab": "^6.0.5", "@semantic-release/gitlab": "^6.0.5",
"@semantic-release/npm": "^7.0.6", "@semantic-release/npm": "^7.0.6",
"@semantic-release/release-notes-generator": "^9.0.1", "@semantic-release/release-notes-generator": "^9.0.1",
"@types/chai": "^4.2.13", "@types/node": "^14.14.20",
"@types/mocha": "^8.0.3",
"@vue/cli-plugin-babel": "^4.5.7",
"@vue/cli-plugin-typescript": "^4.5.7", "@vue/cli-plugin-typescript": "^4.5.7",
"@vue/cli-plugin-unit-mocha": "^4.5.7",
"@vue/cli-service": "^4.5.7", "@vue/cli-service": "^4.5.7",
"@vue/test-utils": "1.1.0", "core-js": "^3.8.2",
"chai": "^4.2.0",
"semantic-release": "^17.3.1", "semantic-release": "^17.3.1",
"typescript": "^4.0.3", "typescript": "^4.0.3",
"vue-template-compiler": "^2.6.12" "vue-template-compiler": "^2.6.12"
......
module.exports = {
plugins: {
autoprefixer: {}
}
}
...@@ -21,6 +21,7 @@ import Vue from 'vue'; ...@@ -21,6 +21,7 @@ import Vue from 'vue';
import { GuidUtil, LinkUtil } from '@coscine/app-util'; import { GuidUtil, LinkUtil } from '@coscine/app-util';
import { ProjectApi } from '@coscine/api-connection'; import { ProjectApi } from '@coscine/api-connection';
import { CoscineCard, CoscineHeadline } from '@coscine/component-library'; import { CoscineCard, CoscineHeadline } from '@coscine/component-library';
import '@coscine/component-library/dist/index.css';
import projectImagePath from './assets/RWTH_Piktogramm_Projekte.png'; import projectImagePath from './assets/RWTH_Piktogramm_Projekte.png';
import zusatzImagePath from './assets/RWTH_Piktogramm_Zusatzangebot.png'; import zusatzImagePath from './assets/RWTH_Piktogramm_Zusatzangebot.png';
......
...@@ -4,8 +4,8 @@ declare module '*.vue' { ...@@ -4,8 +4,8 @@ declare module '*.vue' {
} }
declare module '@coscine/api-connection'; declare module '@coscine/api-connection';
declare module '@coscine/app-util';
declare module '@coscine/component-library'; declare module '@coscine/component-library';
declare module '@coscine/project-creation';
declare module "*.png" { declare module "*.png" {
const value: any; const value: any;
......
...@@ -10,10 +10,13 @@ ...@@ -10,10 +10,13 @@
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"sourceMap": true, "sourceMap": true,
"baseUrl": ".", "baseUrl": ".",
"skipLibCheck": true,
"outDir": "dist",
"declaration": true,
"declarationDir": "dist",
"types": [ "types": [
"webpack-env", "webpack-env",
"mocha", "node"
"chai"
], ],
"paths": { "paths": {
"@/*": [ "@/*": [
......
{
"defaultSeverity": "warning",
"extends": [
"tslint:recommended"
],
"linterOptions": {
"exclude": [
"node_modules/**"
]
},
"rules": {
"quotemark": [true, "single"],
"indent": [true, "spaces", 2],
"interface-name": false,
"ordered-imports": false,
"object-literal-sort-keys": false,
"no-consecutive-blank-lines": false
}
}
Source diff could not be displayed: it is too large. Options to address this: view the blob.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment