Skip to content

Commit

Permalink
Merge pull request #910 from ThornWalli/feature/update
Browse files Browse the repository at this point in the history
Feature/update
  • Loading branch information
ThornWalli authored Jul 28, 2023
2 parents 69a929b + 0179155 commit 949ea14
Show file tree
Hide file tree
Showing 41 changed files with 22,260 additions and 35,339 deletions.
4 changes: 2 additions & 2 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"projects": {
"default": "web-workbench"
"default": "lammpee-web-workbench"
}
}
}
2 changes: 1 addition & 1 deletion .github/workflows/beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [16]
node: [18]

steps:
- uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [16]
node: [18]

steps:
- uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [16]
node: [18]

steps:
- uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.18.1
v18.16.0
9 changes: 9 additions & 0 deletions .prettierrc.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
export default {
"arrowParens": "avoid",
"bracketSameLine": true,
"trailingComma": "none",
"singleQuote": true,
"semi": true,
"printWidth": 80
};

18 changes: 9 additions & 9 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "node",
"request": "launch",
"name": "BasicInterpreter",
"runtimeVersion": "12.1.0",
"runtimeVersion": "18.16.0",
"runtimeArgs": [
"--inspect",
"-r",
Expand All @@ -18,7 +18,7 @@
"type": "node",
"request": "launch",
"name": "MathParser",
"runtimeVersion": "12.1.0",
"runtimeVersion": "18.16.0",
"runtimeArgs": [
"--inspect",
"-r",
Expand All @@ -31,7 +31,7 @@
"type": "node",
"request": "launch",
"name": "StringParameterParser",
"runtimeVersion": "12.1.0",
"runtimeVersion": "18.16.0",
"runtimeArgs": [
"--inspect",
"-r",
Expand All @@ -44,7 +44,7 @@
"type": "node",
"request": "launch",
"name": "web-workbench",
"runtimeVersion": "12.1.0",
"runtimeVersion": "18.16.0",
"runtimeArgs": [
"--inspect",
"-r",
Expand All @@ -57,7 +57,7 @@
"type": "node",
"request": "launch",
"name": "web-workbench (Input)",
"runtimeVersion": "12.1.0",
"runtimeVersion": "18.16.0",
"runtimeArgs": [
"--inspect",
"-r",
Expand All @@ -71,7 +71,7 @@
"type": "node",
"request": "launch",
"name": "Debug (nuxt)",
"runtimeVersion": "12.1.0",
"runtimeVersion": "18.16.0",
"runtimeArgs": [
"--inspect"
],
Expand All @@ -82,7 +82,7 @@
"type": "node",
"request": "launch",
"name": "Debug (generate)",
"runtimeVersion": "12.1.0",
"runtimeVersion": "18.16.0",
"runtimeArgs": [
"--inspect"
],
Expand All @@ -96,7 +96,7 @@
"type": "node",
"request": "launch",
"name": "Debug (start)",
"runtimeVersion": "12.1.0",
"runtimeVersion": "18.16.0",
"runtimeArgs": [
"--inspect"
],
Expand All @@ -110,7 +110,7 @@
"type": "node",
"request": "launch",
"name": "Debug (build)",
"runtimeVersion": "12.1.0",
"runtimeVersion": "18.16.0",
"runtimeArgs": [
"--inspect"
],
Expand Down
74 changes: 38 additions & 36 deletions nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ export default {
if (ctx.isDev) {
config.devtool = ctx.isClient ? 'source-map' : 'inline-source-map';
}

config.module.rules.find(rule => rule.test.test('.vue')).options.prettify = false;

config.module.rules.push(
{
test: /\.md$/i,
Expand Down Expand Up @@ -80,41 +83,43 @@ export default {
},

postcss: {
plugins: {
'postcss-preset-env': {
preserve: true,
stage: 0,
importFrom: 'src/globals/postcss.js',
features: {
'custom-properties': {
disableDeprecationNotice: true
},
'nesting-rules': true
postcssOptions: {
plugins: {
'postcss-preset-env': {
preserve: true,
stage: 0,
importFrom: 'src/globals/postcss.js',
features: {
'custom-properties': {
disableDeprecationNotice: true
},
'nesting-rules': true
}
},
'postcss-normalize': {},
'@fullhuman/postcss-purgecss': {
content: [
'src/pages/**/*.vue',
'src/layouts/**/*.vue',
'src/components/**/*.vue',
'src/assets/svg/**/*.svg'
],
safelist: [
'html', 'body', /^nuxt/, /js--/, /wb-/, /wb_/
]
},
'rucksack-css': {},
cssnano: {
preset: [
'default', {
discardDuplicates: false,
mergeRules: false
}
]
}
},
'postcss-normalize': {},
'@fullhuman/postcss-purgecss': {
content: [
'src/pages/**/*.vue',
'src/layouts/**/*.vue',
'src/components/**/*.vue',
'src/assets/svg/**/*.svg'
],
safelist: [
'html', 'body', /^nuxt/, /js--/, /wb-/, /wb_/
]
},
'rucksack-css': {},
cssnano: {
preset: [
'default', {
discardDuplicates: false,
mergeRules: false
}
]
}
},
order: 'cssnanoLast'
order: 'cssnanoLast'
}
},

parallel: false
Expand Down Expand Up @@ -217,9 +222,6 @@ export default {
],

buildModules: [
'@nuxt/postcss8',
'@nuxtjs/eslint-module',
'@nuxtjs/stylelint-module',
[
'@nuxtjs/pwa', {
workbox: {
Expand Down
Loading

0 comments on commit 949ea14

Please sign in to comment.