From 6ed4dcc86a99e6c8aca69ff89216091c835b405a Mon Sep 17 00:00:00 2001 From: Amir Raminfar Date: Wed, 6 May 2020 15:44:12 -0700 Subject: [PATCH] Uses webpack instead of parcel (#438) --- .babelrc | 5 +- .htmlnanorc.js | 3 - Dockerfile | 4 +- assets/App.spec.js | 5 - assets/components/ContainerTitle.vue | 2 +- assets/components/Icon.vue | 7 +- assets/components/LogEventSource.spec.js | 7 +- assets/favicon.ico | Bin 90374 -> 0 bytes assets/favicon.svg | 5 + assets/{index.html => index.ejs} | 6 +- assets/pages/Index.spec.js | 5 - assets/pages/Settings.vue | 7 +- integration/Dockerfile | 2 +- ...ge-renders-full-page-on-desktop-1-snap.png | Bin 26936 -> 26931 bytes ...home-page-renders-ipad-viewport-1-snap.png | Bin 45738 -> 45946 bytes integration/docker-compose.test.yml | 2 +- jest.config.js | 13 + package.json | 56 +- routes.go | 2 - webpack.config.js | 69 + yarn.lock | 4730 ++++++++--------- 21 files changed, 2487 insertions(+), 2443 deletions(-) delete mode 100644 .htmlnanorc.js delete mode 100644 assets/favicon.ico create mode 100644 assets/favicon.svg rename assets/{index.html => index.ejs} (94%) create mode 100644 jest.config.js create mode 100644 webpack.config.js diff --git a/.babelrc b/.babelrc index 9014c23a..9a79ca61 100644 --- a/.babelrc +++ b/.babelrc @@ -1,9 +1,8 @@ { - "presets": [["@babel/preset-env", { "modules": false }]], - "plugins": [["@babel/plugin-transform-runtime", { "regenerator": true }]], + "presets": [["env", { "modules": false }]], "env": { "test": { - "presets": [["@babel/preset-env", { "targets": { "node": "current" } }]] + "presets": [["env", { "targets": { "node": "current" } }]] } } } diff --git a/.htmlnanorc.js b/.htmlnanorc.js deleted file mode 100644 index 86d7fe93..00000000 --- a/.htmlnanorc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - minifySvg: false, -}; diff --git a/Dockerfile b/Dockerfile index d8853a89..75235681 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,16 +10,14 @@ COPY package*.json yarn.lock ./ RUN yarn install --network-timeout 1000000 # Copy config files -COPY .* ./ +COPY .* webpack*.js ./ # Copy assets to build COPY assets ./assets - # Do the build RUN yarn build - FROM golang:1.14-alpine AS builder RUN apk add --no-cache git ca-certificates diff --git a/assets/App.spec.js b/assets/App.spec.js index 3a487e58..57472e94 100644 --- a/assets/App.spec.js +++ b/assets/App.spec.js @@ -32,11 +32,6 @@ describe("", () => { }); }); - test("is a Vue instance", async () => { - const wrapper = shallowMount(App, { stubs, store, localVue }); - expect(wrapper.isVueInstance()).toBeTruthy(); - }); - test("has right title", async () => { const wrapper = shallowMount(App, { stubs, store, localVue }); await wrapper.vm.$nextTick(); diff --git a/assets/components/ContainerTitle.vue b/assets/components/ContainerTitle.vue index e03b1174..2406438c 100644 --- a/assets/components/ContainerTitle.vue +++ b/assets/components/ContainerTitle.vue @@ -1,4 +1,4 @@ -