Skip to content
Snippets Groups Projects
Commit 1f598657 authored by Yannis Barlas's avatar Yannis Barlas
Browse files

Merge branch 'deploy-fix' into 'master'

ci(*): fix deployment to use dist folders

See merge request !502
parents a5fe57d3 574e8972
No related branches found
No related tags found
1 merge request!502ci(*): fix deployment to use dist folders
Pipeline #55069 failed with stages
in 1 minute
...@@ -7,6 +7,7 @@ RUN apt-get update && \ ...@@ -7,6 +7,7 @@ RUN apt-get update && \
apt-get upgrade -y apt-get upgrade -y
WORKDIR /home/wax WORKDIR /home/wax
ENV NODE_ENV=production
COPY package.json . COPY package.json .
COPY editors/demo/package.json editors/demo/ COPY editors/demo/package.json editors/demo/
...@@ -20,6 +21,7 @@ RUN yarn install --frozen-lockfile ...@@ -20,6 +21,7 @@ RUN yarn install --frozen-lockfile
COPY . . COPY . .
RUN yarn build
RUN cd editors/demo && yarn react-app-rewired build RUN cd editors/demo && yarn react-app-rewired build
###### ######
......
const path = require('path'); const path = require('path');
module.exports = function override(config, env) { module.exports = function override(config, env) {
config.resolve = { config.resolve = {
symlinks: true, symlinks: true,
alias: { };
if (process.env.NODE_ENV !== 'production') {
config.resolve.alias = {
'wax-prosemirror-core': path.resolve( 'wax-prosemirror-core': path.resolve(
__dirname, __dirname,
'../../wax-prosemirror-core/index', '../../wax-prosemirror-core/index',
...@@ -19,8 +23,9 @@ module.exports = function override(config, env) { ...@@ -19,8 +23,9 @@ module.exports = function override(config, env) {
__dirname, __dirname,
'../../wax-table-service/index', '../../wax-table-service/index',
), ),
}, };
}; }
config.module = { config.module = {
rules: [ rules: [
{ {
......
...@@ -7,6 +7,11 @@ import HHMI from './HHMI/HHMI'; ...@@ -7,6 +7,11 @@ import HHMI from './HHMI/HHMI';
import NCBI from './NCBI/NCBI'; import NCBI from './NCBI/NCBI';
import OEN from './OEN/OEN'; import OEN from './OEN/OEN';
import 'wax-prosemirror-core/dist/index.css';
import 'wax-prosemirror-services/dist/index.css';
import 'wax-prosemirror-questions/dist/index.css';
import 'wax-prosemirror-table/dist/index.css';
const GlobalStyle = createGlobalStyle` const GlobalStyle = createGlobalStyle`
body { body {
margin: 0; margin: 0;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment