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

Webpack #3596

Merged
merged 28 commits into from
Apr 20, 2021
Merged

Webpack #3596

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f7f3326
Add webpack
bbert Mar 10, 2021
21ce874
Complete webpack
bbert Apr 2, 2021
8d90f18
remove .jshintrc
bbert Apr 2, 2021
f77bf7f
remove jshint ignore:line
bbert Apr 2, 2021
18b11da
clean
bbert Apr 6, 2021
c35a23f
package.json: fix main
bbert Apr 6, 2021
ec7dae5
use rimraf instrad of clean-webpack-plugin
bbert Apr 6, 2021
fef5dff
keep bundle filenames as current ones
bbert Apr 6, 2021
62955c8
use node modules replace-in-file and ftp-deploy for ftp deployment
bbert Apr 8, 2021
c92b2ab
update circleci config
bbert Apr 8, 2021
bf71393
Replace version in src/core/Version.js with package version
bbert Apr 8, 2021
a55249e
.eslintrc
bbert Apr 8, 2021
9d1ca66
test ftp deploy
bbert Apr 8, 2021
29727cf
test ftp deploy
bbert Apr 8, 2021
0d1f54e
revert remove jshint ignore:line
bbert Apr 8, 2021
333c428
remove
bbert Apr 12, 2021
b95d6b7
remove polyjuice dev dep
bbert Apr 12, 2021
9a27bfb
Merge branch 'development' into webpack
bbert Apr 12, 2021
f84e47c
restore build of offline bundle
bbert Apr 13, 2021
ccb69c9
update deploy.js
bbert Apr 13, 2021
f997228
update EADME
bbert Apr 13, 2021
48d04b5
reorder package.json config
bbert Apr 13, 2021
323de81
restore build of offline bundle
bbert Apr 13, 2021
505db42
Merge remote-tracking branch 'dashif/development' into webpack
bbert Apr 14, 2021
4088e35
Merge branch 'development' into webpack
bbert Apr 16, 2021
520c578
update githooks.js
bbert Apr 16, 2021
5c70bfc
fix deploy script
bbert Apr 19, 2021
b1b4cc8
circle ci:restore deploy job
bbert Apr 19, 2021
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
9 changes: 5 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ commands:
steps:
- run:
name: Build and run unit tests
command: npm run build
mlasak marked this conversation as resolved.
Show resolved Hide resolved
command: |
npm run build
npm run test

jobs:
build-and-unit-test:
Expand All @@ -61,9 +63,8 @@ jobs:
- deploy:
name: Deploy
command: |
if [ "${CIRCLE_BRANCH}" = "development" ] && [ -n "$DEPLOY_HOST" ] && [ -n "$DEPLOY_USER" ] && [ -n "$DEPLOY_PASSWORD" ]; then
sudo npm install -g grunt-cli
grunt deploy --git-commit=$CIRCLE_SHA1 --ftp-host=$DEPLOY_HOST --ftp-user=$DEPLOY_USER --ftp-pass=$DEPLOY_PASSWORD
if [ -n "$DEPLOY_HOST" ] && [ -n "$DEPLOY_USER" ] && [ -n "$DEPLOY_PASSWORD" ]; then
Copy link
Contributor

@mlasak mlasak Apr 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing the condition "${CIRCLE_BRANCH}" = "development" would result in having builds from any branch deployed via ftp as circle ci builds happen on any branch. Most of those deployment would be not desired in most cases (feature branches would overwrite the "nightly build"). Only from one agreed on branch deployments should happen (currently this was/is "development").

Btw, sorry, i owe you all some docu/howto on circle ci config ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was done temporarily to check ftp push feature in this branch .
This will restore before being merged

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, i'll keep this one open so we do not forget..

node deploy.js --host=$DEPLOY_HOST --user=$DEPLOY_USER --password=$DEPLOY_PASSWORD
else
echo "Not on development branch or deploy not configured. Dry run only, nothing will be deployed."
fi
Expand Down
25 changes: 25 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"env": {
"browser": true,
"es6": true,
"mocha": true,
mlasak marked this conversation as resolved.
Show resolved Hide resolved
"node": true
},
"globals": {
"dashjs": true,
"WebKitMediaSource": true,
"MediaSource": true,
"WebKitMediaKeys": true,
"MSMediaKeys": true,
"MediaKeys": true
},
"parser": "babel-eslint",
"rules": {
"no-caller": 2,
"no-undef": 2,
"no-unused-vars": 0,
mlasak marked this conversation as resolved.
Show resolved Hide resolved
"no-use-before-define": 0,
"strict": 0,
"no-loop-func": 0
}
}
34 changes: 0 additions & 34 deletions .jshintrc

This file was deleted.

Loading