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.

Sign up for GitHub

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

2023 Refactor: upgrading packages #74

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

2023 Refactor: upgrading packages #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53473ab
refactor: 2023 upgrade - initial commit
Mar 3, 2023
a917318
feat: adding more files
Mar 3, 2023
9e2d49e
feat: fixing build
Mar 3, 2023
f1ba99c
feat: fixing build again
Mar 3, 2023
02ed3c2
fix(webpack): fixing after upgrade
Mar 6, 2023
0470418
fix: fixing WDIO tests - in progress
Mar 6, 2023
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
4 changes: 4 additions & 0 deletions .husky/commit-msg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no -- commitlint --edit $1
6 changes: 6 additions & 0 deletions .husky/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm test
npm run lint
npx --no lint-staged
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12.13.1
18.12.1
4 changes: 2 additions & 2 deletions examples/iframe-full/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css" />
</head>
<body>
<section style="margin: 15px;">
<button class="button" id="iframe-full-setup-post-quecast" style="margin-bottom: 15px;">
<section style="margin: 15px">
<button class="button" id="iframe-full-setup-post-quecast" style="margin-bottom: 15px">
Setup Post Quecast
</button>
<div class="columns" id="iframe-full"></div>
Expand Down
2 changes: 1 addition & 1 deletion examples/iframe-lite/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css" />
</head>
<body>
<section style="margin: 15px;">
<section style="margin: 15px">
<div class="columns" id="iframe-lite"></div>
</section>
</body>
Expand Down
40 changes: 12 additions & 28 deletions examples/main/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,46 +11,38 @@
<section class="hero is-primary">
<div class="hero-body">
<div class="container">
<h1 class="title">
Main 1
</h1>
<h2 class="subtitle">
Top Level Window
</h2>
<h1 class="title">Main 1</h1>
<h2 class="subtitle">Top Level Window</h2>
</div>
</div>
</section>

<section style="margin: 15px;">
<section style="margin: 15px">
<button class="button" id="main-1-setup-post-quecast">Setup Post Quecast</button>
<button class="button" id="main-1-close-full">Close Full</button>
<button class="button" id="main-1-close-lite">Close Lite</button>
</section>

<div class="columns" id="main-1" style="margin-left: 0; margin-right: 0;"></div>
<div class="columns" id="main-1" style="margin-left: 0; margin-right: 0"></div>
</section>

<section class="column">
<section class="hero is-primary">
<div class="hero-body">
<div class="container">
<h1 class="title">
Main 2
</h1>
<h2 class="subtitle">
Top Level Window
</h2>
<h1 class="title">Main 2</h1>
<h2 class="subtitle">Top Level Window</h2>
</div>
</div>
</section>

<section style="margin: 15px;">
<section style="margin: 15px">
<button class="button" id="main-2-setup-post-quecast">Setup Post Quecast</button>
<button class="button" id="main-2-close-full">Close Full</button>
<button class="button" id="main-2-close-lite">Close Lite</button>
</section>

<div class="columns" id="main-2" style="margin-left: 0; margin-right: 0;"></div>
<div class="columns" id="main-2" style="margin-left: 0; margin-right: 0"></div>
</section>
</div>

Expand All @@ -59,12 +51,8 @@ <h2 class="subtitle">
<section class="hero is-primary">
<div class="hero-body">
<div class="container">
<h1 class="title">
IFrame Full
</h1>
<h2 class="subtitle">
IFrame with send and receive capabilities
</h2>
<h1 class="title">IFrame Full</h1>
<h2 class="subtitle">IFrame with send and receive capabilities</h2>
</div>
</div>
</section>
Expand All @@ -82,12 +70,8 @@ <h2 class="subtitle">
<section class="hero is-primary">
<div class="hero-body">
<div class="container">
<h1 class="title">
IFrame Lite
</h1>
<h2 class="subtitle">
IFrame with only send capabilities
</h2>
<h1 class="title">IFrame Lite</h1>
<h2 class="subtitle">IFrame with only send capabilities</h2>
</div>
</div>
</section>
Expand Down
76 changes: 23 additions & 53 deletions examples/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,36 @@
const path = require('path');
const { TsConfigPathsPlugin } = require('awesome-typescript-loader');
const TsConfigPathsPlugin = require('tsconfig-paths-webpack-plugin');

const TSCONFIG = path.resolve(__dirname, 'tsconfig.json');
const DIST_TSCONFIG = path.resolve(__dirname, 'tsconfig.dist.json');
const SRC = path.resolve(__dirname, '..', 'src');
const NODE_MODULES = path.resolve(__dirname, '..', 'node_modules');

const config = ({ name, prod, performance, entry }) => {
const pathPlugin = new TsConfigPathsPlugin({ configFileName: prod ? DIST_TSCONFIG : TSCONFIG });
module.exports = (env, argv) => {
const prod = argv.mode === 'production';
const pathPlugin = new TsConfigPathsPlugin({ configFile: prod ? DIST_TSCONFIG : TSCONFIG });

return {
mode: 'development',
context: path.resolve(__dirname, name),
entry,
context: path.resolve(__dirname),

entry: {
'main/index-1': './main/index-1.ts',
'main/index-2': './main/index-2.ts',
'iframe-full/index': './iframe-full/index.ts',
'iframe-lite/index': './iframe-lite/index.ts',
},

output: {
filename: '[name].js',
path: path.resolve(__dirname, `dist`, name),
path: path.resolve(__dirname, `dist`),
},

stats: prod ? 'errors-only' : { all: undefined },
performance,

devServer: {
port: 8080,
inline: false,
contentBase: __dirname,
performance: prod && {
maxEntrypointSize: 130 * 1024,
hints: 'error',
},

resolve: {
Expand All @@ -34,6 +39,11 @@ const config = ({ name, prod, performance, entry }) => {
plugins: [pathPlugin],
},

devServer: {
port: 8080,
static: __dirname,
},

module: {
rules: [
{
Expand All @@ -48,9 +58,9 @@ const config = ({ name, prod, performance, entry }) => {
exclude: [/node_modules/],
use: [
{
loader: 'awesome-typescript-loader',
loader: 'ts-loader',
options: {
configFileName: TSCONFIG,
configFile: TSCONFIG,
},
},
],
Expand All @@ -61,43 +71,3 @@ const config = ({ name, prod, performance, entry }) => {
devtool: 'source-map',
};
};

module.exports = (env, argv) => {
const prod = argv.mode === 'production';
const apps = {
main: {
performance: prod && {
maxEntrypointSize: 13 * 1024,
hints: 'error',
},
entry: {
'index-1': './index-1.ts',
'index-2': './index-2.ts',
},
},
'iframe-full': {
performance: prod && {
maxEntrypointSize: 13 * 1024,
hints: 'error',
},
entry: {
index: './index.ts',
},
},
'iframe-lite': {
performance: prod && {
maxEntrypointSize: 6 * 1024,
hints: 'error',
},
entry: {
index: './index.ts',
},
},
};

return Object.keys(apps)
.map((name) => ({ name, value: apps[name] }))
.map(({ name, value }) =>
config({ name, prod, performance: value.performance, entry: value.entry }),
);
};
2 changes: 2 additions & 0 deletions jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ module.exports = {
projects: [
{
displayName: 'src',
testEnvironment: 'jsdom',
roots: ['<rootDir>/src'],
transform: {
'^.+\\.tsx?$': 'ts-jest',
},
},
{
displayName: 'addons',
testEnvironment: 'jsdom',
roots: ['<rootDir>/addons'],
transform: {
'^.+\\.[t,j]sx?$': 'ts-jest',
Expand Down
Loading