Skip to content

Commit

Permalink
Merge pull request #220 from glorious-codes/webpack_dev_server_remotion
Browse files Browse the repository at this point in the history
Replace webpack-dev-server with live-server
  • Loading branch information
rafaelcamargo committed Aug 5, 2022
2 parents 81217d7 + 1b33111 commit 48b60ad
Show file tree
Hide file tree
Showing 74 changed files with 2,484 additions and 1,754 deletions.
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ jobs:
- "webpack.*.js"
- ".babelrc"
- ".eslintrc"
- "build-prepare.js"
- "pre-build.js"
- "pre-tasks.js"
- "node_modules"
- ".git/*"
- ".circleci/*"
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,3 @@ src/webapp/data
src/webapp/external
src/webapp/index.html
src/webapp/scripts/index.js
src/webapp/scripts/components/logo/logo.html
38 changes: 0 additions & 38 deletions build-prepare.js

This file was deleted.

6 changes: 6 additions & 0 deletions jest.setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ import 'angular';
import 'angular-mocks';
import path from 'path';
import * as Babel from '@babel/standalone/babel.min'
import GAnalytics from '@glorious/analytics';
import React from 'react';
import ReactDOM from 'react-dom';
import Vue from 'vue/dist/vue.min';
import project from './project.json';

// Needs to be mocked before importing index template, otherwise
// Analytics Service will be imported, cached and it won't be
// "mockable" anymore.
jest.mock('@glorious/analytics');

// Import index template to register pitsby-app angular module
// and its dependencies
require(path.join(__dirname, project.scripts.webapp.source.indexTemplate));
Expand Down
Loading

0 comments on commit 48b60ad

Please sign in to comment.