Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(build): upgrade to WebPack 5 #225

Merged
merged 6 commits into from
Jan 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ charset = utf-8
end_of_line = lf
indent_style = space
indent_size = 4
insert_final_newline = true
insert_final_newline = false
trim_trailing_whitespace = true

[*]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
wait-on: 'http://localhost:8888'
config-file: test/cypress.json
browser: chrome
# record: true
record: true
env:
# pass the Dashboard record key as an environment variable
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
Expand All @@ -76,9 +76,9 @@ jobs:
name: cypress-screenshots
path: cypress/screenshots

- name: deploy
- name: Deploy to gh-pages
if: github.ref == 'refs/heads/master'
uses: peaceiris/actions-gh-pages@v3
if: success()
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Thumbs.db
# Distribution folder
dist
dist-demo
docs

# Tests Report & Coverage
**/node_modules
Expand Down
17 changes: 9 additions & 8 deletions examples/webpack-demo-vanilla-bundle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"src": "src"
},
"scripts": {
"build:demo": "webpack --env.production",
"dev:watch": "webpack-dev-server --env.server",
"build:demo": "webpack --env production",
"dev:watch": "webpack serve --env development",
"test": "echo testing slickgrid-universal demo code"
},
"author": "Ghislain B.",
Expand All @@ -30,29 +30,30 @@
"@slickgrid-universal/text-export": "^0.8.0",
"@slickgrid-universal/vanilla-bundle": "^0.8.0",
"bulma": "^0.9.1",
"moment-mini": "^2.24.0"
"moment-mini": "^2.24.0",
"whatwg-fetch": "^3.5.0"
},
"devDependencies": {
"@types/jquery": "^3.5.5",
"@types/moment": "^2.13.0",
"@types/node": "^14.14.20",
"@types/webpack": "^4.41.25",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^6.4.1",
"copy-webpack-plugin": "^7.0.0",
"css-loader": "^5.0.1",
"file-loader": "^6.2.0",
"fork-ts-checker-webpack-plugin": "^6.0.8",
"html-loader": "^1.3.2",
"html-webpack-plugin": "^4.5.1",
"html-webpack-plugin": "5.0.0-beta.1",
"mini-css-extract-plugin": "^1.3.3",
"node-sass": "5.0.0",
"sass-loader": "^10.1.0",
"style-loader": "^2.0.0",
"ts-loader": "^8.0.14",
"ts-node": "^9.1.1",
"url-loader": "^4.1.1",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12",
"webpack": "^5.11.1",
"webpack-cli": "^4.3.1",
"webpack-dev-server": "^3.11.1"
}
}
}
2 changes: 0 additions & 2 deletions examples/webpack-demo-vanilla-bundle/src/app-routing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ export class AppRouting {
{ route: 'example10', name: 'example10', title: 'Example10', moduleId: './examples/example10' },
{ route: 'example11', name: 'example11', title: 'Example11', moduleId: './examples/example11' },
{ route: 'example12', name: 'example12', title: 'Example12', moduleId: './examples/example12' },
{ route: 'example50', name: 'example50', title: 'Example50', moduleId: './examples/example50' },
{ route: 'example51', name: 'example51', title: 'Example51', moduleId: './examples/example51' },
{ route: 'icons', name: 'icons', title: 'icons', moduleId: './examples/icons' },
{ route: '', redirect: 'example01' },
{ route: '**', redirect: 'example01' }
Expand Down
4 changes: 0 additions & 4 deletions examples/webpack-demo-vanilla-bundle/src/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ <h4 class="title is-4 has-text-white">Slickgrid-Universal</h4>
<a class="navbar-item" onclick.delegate="loadRoute('example12')">
Example12 - Item Editor Modal
</a>
<!--
<hr class="navbar-divider">
<a class="navbar-item" onclick.delegate="loadRoute('example50')">Example50 - SE Tree Data</a>
<a class="navbar-item" onclick.delegate="loadRoute('example51')">Example51 - SE Tree Data</a> -->
</div>
</div>
</div>
Expand Down
36 changes: 0 additions & 36 deletions examples/webpack-demo-vanilla-bundle/src/examples/example50.html

This file was deleted.

41 changes: 0 additions & 41 deletions examples/webpack-demo-vanilla-bundle/src/examples/example50.scss

This file was deleted.

Loading