chore: fix clipper CI failing

This commit is contained in:
Aman Harwara
2023-07-12 19:42:45 +05:30
parent e4b858f2e8
commit af3eafb009
31 changed files with 275 additions and 39 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -4,7 +4,7 @@
"description": "Web clipper for Standard Notes",
"permissions": ["activeTab", "storage", "<all_urls>"],
"browser_action": {
"default_popup": "popup/index.html?route=extension"
"default_popup": "popup.html?route=extension"
},
"background": {
"scripts": ["background.js"],

View File

@@ -4,7 +4,7 @@
"description": "Web clipper for Standard Notes",
"permissions": ["activeTab", "storage"],
"action": {
"default_popup": "popup/index.html?route=extension"
"default_popup": "popup.html?route=extension"
},
"background": {
"service_worker": "background.js"

View File

@@ -1,26 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta content="IE=edge" http-equiv="X-UA-Compatible" />
<meta content="viewport-fit=cover, width=device-width, initial-scale=1" name="viewport" />
<meta name="theme-color" content="#ffffff" />
<title>Standard Notes</title>
<script src="./globals.js"></script>
<script src="../web/app.js" debug="false"></script>
<link rel="stylesheet" media="all" href="../web/app.css" debug="false" />
<style>
html,
body {
min-width: 350px;
max-width: 350px;
}
</style>
</head>
<body></body>
</html>

View File

@@ -17,9 +17,9 @@ module.exports = (env, argv) => {
patterns: [
{
from: '../web/dist',
to: './web',
to: './',
globOptions: {
ignore: isProd ? ['**/app.js.map'] : [],
ignore: isProd ? ['**/*.js.map'] : [],
},
},
{
@@ -36,7 +36,7 @@ module.exports = (env, argv) => {
},
{
from: './src/popup',
to: './popup',
to: './',
},
{
from: './images',

View File

@@ -102,9 +102,9 @@ export class RouteParser implements RouteParserInterface {
return RouteType.Onboarding
}
const isIndexPath = this.path.endsWith('index.html')
const isValidPath = ['index.html', 'popup.html'].some((path) => this.path.endsWith(path))
if (this.path !== RootRoutes.None && !isIndexPath) {
if (this.path !== RootRoutes.None && !isValidPath) {
return RouteType.None
}

View File

@@ -0,0 +1,23 @@
module.exports = ({ htmlWebpackPlugin }) => {
return `<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta content="IE=edge" http-equiv="X-UA-Compatible" />
<meta content="viewport-fit=cover, width=device-width, initial-scale=1" name="viewport" />
<meta name="theme-color" content="#ffffff" />
<title>Standard Notes</title>
<script src="./globals.js"></script>
${htmlWebpackPlugin.tags.headTags}
<style>
html,
body {
min-width: 350px;
max-width: 350px;
min-height: 260px;
}
</style>
</head>
<body></body>
</html>`
}

View File

@@ -72,6 +72,7 @@
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "^7.31.11",
"eslint-plugin-react-hooks": "^4.6.0",
"html-webpack-plugin": "^5.5.3",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",

View File

@@ -4,6 +4,8 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const CircularDependencyPlugin = require('circular-dependency-plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const mergeWithEnvDefaults = require('./web.webpack-defaults')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const clipperHtmlTemplate = require('./clipper.htmlTemplate')
require('dotenv').config()
module.exports = (env) => {
@@ -28,8 +30,16 @@ module.exports = (env) => {
return {
entry: './src/javascripts/index.ts',
output: {
filename: './app.js',
filename: process.env.BUILD_TARGET === 'clipper' ? './[name].bundle.js' : './app.js',
},
optimization:
process.env.BUILD_TARGET === 'clipper'
? {
splitChunks: {
chunks: 'all',
},
}
: undefined,
plugins: [
new CircularDependencyPlugin({
// exclude detection of files based on a RegExp
@@ -55,6 +65,12 @@ module.exports = (env) => {
new CopyWebpackPlugin({
patterns: copyPluginPatterns,
}),
process.env.BUILD_TARGET === 'clipper' &&
new HtmlWebpackPlugin({
filename: 'popup.html',
inject: false,
templateContent: clipperHtmlTemplate,
}),
],
resolve: {
extensions: ['.ts', '.tsx', '.js'],

232
yarn.lock
View File

@@ -2413,6 +2413,16 @@ __metadata:
languageName: node
linkType: hard
"@jridgewell/source-map@npm:^0.3.3":
version: 0.3.5
resolution: "@jridgewell/source-map@npm:0.3.5"
dependencies:
"@jridgewell/gen-mapping": ^0.3.0
"@jridgewell/trace-mapping": ^0.3.9
checksum: 1ad4dec0bdafbade57920a50acec6634f88a0eb735851e0dda906fa9894e7f0549c492678aad1a10f8e144bfe87f238307bf2a914a1bc85b7781d345417e9f6f
languageName: node
linkType: hard
"@jridgewell/sourcemap-codec@npm:1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.10":
version: 1.4.14
resolution: "@jridgewell/sourcemap-codec@npm:1.4.14"
@@ -4840,6 +4850,7 @@ __metadata:
eslint-plugin-react: ^7.31.11
eslint-plugin-react-hooks: ^4.6.0
fast-diff: ^1.3.0
html-webpack-plugin: ^5.5.3
identity-obj-proxy: ^3.0.0
jest: ^29.3.1
jest-environment-jsdom: ^29.3.1
@@ -5306,6 +5317,13 @@ __metadata:
languageName: node
linkType: hard
"@types/html-minifier-terser@npm:^6.0.0":
version: 6.1.0
resolution: "@types/html-minifier-terser@npm:6.1.0"
checksum: eb843f6a8d662d44fb18ec61041117734c6aae77aa38df1be3b4712e8e50ffaa35f1e1c92fdd0fde14a5675fecf457abcd0d15a01fae7506c91926176967f452
languageName: node
linkType: hard
"@types/http-cache-semantics@npm:*, @types/http-cache-semantics@npm:^4.0.1":
version: 4.0.1
resolution: "@types/http-cache-semantics@npm:4.0.1"
@@ -6330,6 +6348,15 @@ __metadata:
languageName: node
linkType: hard
"acorn@npm:^8.8.2":
version: 8.10.0
resolution: "acorn@npm:8.10.0"
bin:
acorn: bin/acorn
checksum: 538ba38af0cc9e5ef983aee196c4b8b4d87c0c94532334fa7e065b2c8a1f85863467bb774231aae91613fcda5e68740c15d97b1967ae3394d20faddddd8af61d
languageName: node
linkType: hard
"add-stream@npm:^1.0.0":
version: 1.0.0
resolution: "add-stream@npm:1.0.0"
@@ -8015,6 +8042,16 @@ __metadata:
languageName: node
linkType: hard
"camel-case@npm:^4.1.2":
version: 4.1.2
resolution: "camel-case@npm:4.1.2"
dependencies:
pascal-case: ^3.1.2
tslib: ^2.0.3
checksum: bcbd25cd253b3cbc69be3f535750137dbf2beb70f093bdc575f73f800acc8443d34fd52ab8f0a2413c34f1e8203139ffc88428d8863e4dfe530cfb257a379ad6
languageName: node
linkType: hard
"camelcase-css@npm:^2.0.1":
version: 2.0.1
resolution: "camelcase-css@npm:2.0.1"
@@ -8310,6 +8347,15 @@ __metadata:
languageName: node
linkType: hard
"clean-css@npm:^5.2.2":
version: 5.3.2
resolution: "clean-css@npm:5.3.2"
dependencies:
source-map: ~0.6.0
checksum: 8787b281acc9878f309b5f835d410085deedfd4e126472666773040a6a8a72f472a1d24185947d23b87b1c419bf2c5ed429395d5c5ff8279c98b05d8011e9758
languageName: node
linkType: hard
"clean-stack@npm:^2.0.0":
version: 2.2.0
resolution: "clean-stack@npm:2.2.0"
@@ -8612,6 +8658,13 @@ __metadata:
languageName: node
linkType: hard
"commander@npm:^8.3.0":
version: 8.3.0
resolution: "commander@npm:8.3.0"
checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0
languageName: node
linkType: hard
"commander@npm:^9.1.0, commander@npm:^9.3.0, commander@npm:^9.4.1":
version: 9.5.0
resolution: "commander@npm:9.5.0"
@@ -9874,6 +9927,15 @@ __metadata:
languageName: node
linkType: hard
"dom-converter@npm:^0.2.0":
version: 0.2.0
resolution: "dom-converter@npm:0.2.0"
dependencies:
utila: ~0.4
checksum: ea52fe303f5392e48dea563abef0e6fb3a478b8dbe3c599e99bb5d53981c6c38fc4944e56bb92a8ead6bb989d10b7914722ae11febbd2fd0910e33b9fc4aaa77
languageName: node
linkType: hard
"dom-serializer@npm:^1.0.1":
version: 1.4.1
resolution: "dom-serializer@npm:1.4.1"
@@ -9919,7 +9981,7 @@ __metadata:
languageName: node
linkType: hard
"domhandler@npm:^4.2.0, domhandler@npm:^4.3.1":
"domhandler@npm:^4.0.0, domhandler@npm:^4.2.0, domhandler@npm:^4.3.1":
version: 4.3.1
resolution: "domhandler@npm:4.3.1"
dependencies:
@@ -9944,7 +10006,7 @@ __metadata:
languageName: node
linkType: hard
"domutils@npm:^2.8.0":
"domutils@npm:^2.5.2, domutils@npm:^2.8.0":
version: 2.8.0
resolution: "domutils@npm:2.8.0"
dependencies:
@@ -9966,6 +10028,16 @@ __metadata:
languageName: node
linkType: hard
"dot-case@npm:^3.0.4":
version: 3.0.4
resolution: "dot-case@npm:3.0.4"
dependencies:
no-case: ^3.0.4
tslib: ^2.0.3
checksum: a65e3519414856df0228b9f645332f974f2bf5433370f544a681122eab59e66038fc3349b4be1cdc47152779dac71a5864f1ccda2f745e767c46e9c6543b1169
languageName: node
linkType: hard
"dot-prop@npm:^5.1.0":
version: 5.3.0
resolution: "dot-prop@npm:5.3.0"
@@ -12590,6 +12662,15 @@ __metadata:
languageName: node
linkType: hard
"he@npm:^1.2.0":
version: 1.2.0
resolution: "he@npm:1.2.0"
bin:
he: bin/he
checksum: 3d4d6babccccd79c5c5a3f929a68af33360d6445587d628087f39a965079d84f18ce9c3d3f917ee1e3978916fc833bb8b29377c3b403f919426f91bc6965e7a7
languageName: node
linkType: hard
"hermes-estree@npm:0.8.0":
version: 0.8.0
resolution: "hermes-estree@npm:0.8.0"
@@ -12684,6 +12765,50 @@ __metadata:
languageName: node
linkType: hard
"html-minifier-terser@npm:^6.0.2":
version: 6.1.0
resolution: "html-minifier-terser@npm:6.1.0"
dependencies:
camel-case: ^4.1.2
clean-css: ^5.2.2
commander: ^8.3.0
he: ^1.2.0
param-case: ^3.0.4
relateurl: ^0.2.7
terser: ^5.10.0
bin:
html-minifier-terser: cli.js
checksum: ac52c14006476f773204c198b64838477859dc2879490040efab8979c0207424da55d59df7348153f412efa45a0840a1ca3c757bf14767d23a15e3e389d37a93
languageName: node
linkType: hard
"html-webpack-plugin@npm:^5.5.3":
version: 5.5.3
resolution: "html-webpack-plugin@npm:5.5.3"
dependencies:
"@types/html-minifier-terser": ^6.0.0
html-minifier-terser: ^6.0.2
lodash: ^4.17.21
pretty-error: ^4.0.0
tapable: ^2.0.0
peerDependencies:
webpack: ^5.20.0
checksum: ccf685195739c372ad641bbd0c9100a847904f34eedc7aff3ece7856cd6c78fd3746d2d615af1bb71e5727993fe711b89e9b744f033ed3fde646540bf5d5e954
languageName: node
linkType: hard
"htmlparser2@npm:^6.1.0":
version: 6.1.0
resolution: "htmlparser2@npm:6.1.0"
dependencies:
domelementtype: ^2.0.1
domhandler: ^4.0.0
domutils: ^2.5.2
entities: ^2.0.0
checksum: 81a7b3d9c3bb9acb568a02fc9b1b81ffbfa55eae7f1c41ae0bf840006d1dbf54cb3aa245b2553e2c94db674840a9f0fdad7027c9a9d01a062065314039058c4e
languageName: node
linkType: hard
"htmlparser2@npm:^8.0.1":
version: 8.0.1
resolution: "htmlparser2@npm:8.0.1"
@@ -15310,7 +15435,7 @@ __metadata:
languageName: node
linkType: hard
"lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.5":
"lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.5":
version: 4.17.21
resolution: "lodash@npm:4.17.21"
checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
@@ -15372,6 +15497,15 @@ __metadata:
languageName: node
linkType: hard
"lower-case@npm:^2.0.2":
version: 2.0.2
resolution: "lower-case@npm:2.0.2"
dependencies:
tslib: ^2.0.3
checksum: 83a0a5f159ad7614bee8bf976b96275f3954335a84fad2696927f609ddae902802c4f3312d86668722e668bef41400254807e1d3a7f2e8c3eede79691aa1f010
languageName: node
linkType: hard
"lowercase-keys@npm:^2.0.0":
version: 2.0.0
resolution: "lowercase-keys@npm:2.0.0"
@@ -16771,6 +16905,16 @@ __metadata:
languageName: node
linkType: hard
"no-case@npm:^3.0.4":
version: 3.0.4
resolution: "no-case@npm:3.0.4"
dependencies:
lower-case: ^2.0.2
tslib: ^2.0.3
checksum: 0b2ebc113dfcf737d48dde49cfebf3ad2d82a8c3188e7100c6f375e30eafbef9e9124aadc3becef237b042fd5eb0aad2fd78669c20972d045bbe7fea8ba0be5c
languageName: node
linkType: hard
"nocache@npm:^3.0.1":
version: 3.0.4
resolution: "nocache@npm:3.0.4"
@@ -17952,6 +18096,16 @@ __metadata:
languageName: node
linkType: hard
"param-case@npm:^3.0.4":
version: 3.0.4
resolution: "param-case@npm:3.0.4"
dependencies:
dot-case: ^3.0.4
tslib: ^2.0.3
checksum: b34227fd0f794e078776eb3aa6247442056cb47761e9cd2c4c881c86d84c64205f6a56ef0d70b41ee7d77da02c3f4ed2f88e3896a8fefe08bdfb4deca037c687
languageName: node
linkType: hard
"parent-module@npm:^1.0.0":
version: 1.0.1
resolution: "parent-module@npm:1.0.1"
@@ -18066,6 +18220,16 @@ __metadata:
languageName: node
linkType: hard
"pascal-case@npm:^3.1.2":
version: 3.1.2
resolution: "pascal-case@npm:3.1.2"
dependencies:
no-case: ^3.0.4
tslib: ^2.0.3
checksum: ba98bfd595fc91ef3d30f4243b1aee2f6ec41c53b4546bfa3039487c367abaa182471dcfc830a1f9e1a0df00c14a370514fa2b3a1aacc68b15a460c31116873e
languageName: node
linkType: hard
"pascalcase@npm:^0.1.1":
version: 0.1.1
resolution: "pascalcase@npm:0.1.1"
@@ -18568,6 +18732,16 @@ __metadata:
languageName: node
linkType: hard
"pretty-error@npm:^4.0.0":
version: 4.0.0
resolution: "pretty-error@npm:4.0.0"
dependencies:
lodash: ^4.17.20
renderkid: ^3.0.0
checksum: a5b9137365690104ded6947dca2e33360bf55e62a4acd91b1b0d7baa3970e43754c628cc9e16eafbdd4e8f8bcb260a5865475d4fc17c3106ff2d61db4e72cdf3
languageName: node
linkType: hard
"pretty-format@npm:^26.5.2, pretty-format@npm:^26.6.2":
version: 26.6.2
resolution: "pretty-format@npm:26.6.2"
@@ -19593,6 +19767,13 @@ __metadata:
languageName: node
linkType: hard
"relateurl@npm:^0.2.7":
version: 0.2.7
resolution: "relateurl@npm:0.2.7"
checksum: 5891e792eae1dfc3da91c6fda76d6c3de0333a60aa5ad848982ebb6dccaa06e86385fb1235a1582c680a3d445d31be01c6bfc0804ebbcab5aaf53fa856fde6b6
languageName: node
linkType: hard
"relaxed-json@npm:1.0.3":
version: 1.0.3
resolution: "relaxed-json@npm:1.0.3"
@@ -19619,6 +19800,19 @@ __metadata:
languageName: node
linkType: hard
"renderkid@npm:^3.0.0":
version: 3.0.0
resolution: "renderkid@npm:3.0.0"
dependencies:
css-select: ^4.1.3
dom-converter: ^0.2.0
htmlparser2: ^6.1.0
lodash: ^4.17.21
strip-ansi: ^6.0.1
checksum: 77162b62d6f33ab81f337c39efce0439ff0d1f6d441e29c35183151f83041c7850774fb904da163d6c844264d440d10557714e6daa0b19e4561a5cd4ef305d41
languageName: node
linkType: hard
"repeat-element@npm:^1.1.2":
version: 1.1.4
resolution: "repeat-element@npm:1.1.4"
@@ -20724,7 +20918,7 @@ __metadata:
languageName: node
linkType: hard
"source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.1":
"source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0, source-map@npm:~0.6.1":
version: 0.6.1
resolution: "source-map@npm:0.6.1"
checksum: 59ce8640cf3f3124f64ac289012c2b8bd377c238e316fb323ea22fbfe83da07d81e000071d7242cad7a23cd91c7de98e4df8830ec3f133cb6133a5f6e9f67bc2
@@ -21414,7 +21608,7 @@ __metadata:
languageName: node
linkType: hard
"tapable@npm:^2.1.1, tapable@npm:^2.2.0":
"tapable@npm:^2.0.0, tapable@npm:^2.1.1, tapable@npm:^2.2.0":
version: 2.2.1
resolution: "tapable@npm:2.2.1"
checksum: 3b7a1b4d86fa940aad46d9e73d1e8739335efd4c48322cb37d073eb6f80f5281889bf0320c6d8ffcfa1a0dd5bfdbd0f9d037e252ef972aca595330538aac4d51
@@ -21544,6 +21738,20 @@ __metadata:
languageName: node
linkType: hard
"terser@npm:^5.10.0":
version: 5.19.0
resolution: "terser@npm:5.19.0"
dependencies:
"@jridgewell/source-map": ^0.3.3
acorn: ^8.8.2
commander: ^2.20.0
source-map-support: ~0.5.20
bin:
terser: bin/terser
checksum: 31c937f1a30c03b68825df7803a3584b13616647438be6cbc0914b688f064a3f4f938d8182e476342ddd1675e84798393b076caeb549393f4df768aec9abd6bd
languageName: node
linkType: hard
"terser@npm:^5.14.1, terser@npm:^5.15.0":
version: 5.16.5
resolution: "terser@npm:5.16.5"
@@ -21961,6 +22169,13 @@ __metadata:
languageName: node
linkType: hard
"tslib@npm:^2.0.3":
version: 2.6.0
resolution: "tslib@npm:2.6.0"
checksum: c01066038f950016a18106ddeca4649b4d76caa76ec5a31e2a26e10586a59fceb4ee45e96719bf6c715648e7c14085a81fee5c62f7e9ebee68e77a5396e5538f
languageName: node
linkType: hard
"tsutils@npm:^3.21.0":
version: 3.21.0
resolution: "tsutils@npm:3.21.0"
@@ -22481,6 +22696,13 @@ __metadata:
languageName: node
linkType: hard
"utila@npm:~0.4":
version: 0.4.0
resolution: "utila@npm:0.4.0"
checksum: 97ffd3bd2bb80c773429d3fb8396469115cd190dded1e733f190d8b602bd0a1bcd6216b7ce3c4395ee3c79e3c879c19d268dbaae3093564cb169ad1212d436f4
languageName: node
linkType: hard
"utils-merge@npm:1.0.1":
version: 1.0.1
resolution: "utils-merge@npm:1.0.1"