mirror of
https://github.com/chinchang/web-maker.git
synced 2025-07-23 23:11:12 +02:00
Merge remote-tracking branch 'origin/master' into v6
This commit is contained in:
@@ -8,6 +8,6 @@
|
||||
- package.json
|
||||
- manifest.json
|
||||
- commit and tag (`git tag {version}`)
|
||||
- Run `gulp buildExtension`
|
||||
- Run `gulp buildExtension`. This will generate a zip - `extension-{version}.zip`
|
||||
- Test out extension-{version}.zip
|
||||
- If everything is good, push to master
|
||||
|
21262
package-lock.json
generated
21262
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "web-maker",
|
||||
"version": "5.2.0",
|
||||
"version": "5.3.0",
|
||||
"description": "A blazing fast & offline web playground",
|
||||
"scripts": {
|
||||
"start": "concurrently --kill-others \"gulp start-preview-server\" \"npm run -s dev\"",
|
||||
|
@@ -10,6 +10,12 @@ export function trackEvent(category, action, label, value) {
|
||||
}
|
||||
if (window.ga) {
|
||||
ga('send', 'event', category, action, label, value);
|
||||
|
||||
fetch('https://event-ajhkrtmkaq-uc.a.run.app', {
|
||||
method: 'post',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ category, action, label, value })
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
16
src/assets/tailwind-logo.svg
Normal file
16
src/assets/tailwind-logo.svg
Normal file
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="128" height="128" viewBox="0 0 128 128" xml:space="preserve">
|
||||
<desc>Created with Fabric.js 5.2.4</desc>
|
||||
<defs>
|
||||
</defs>
|
||||
<rect x="0" y="0" width="100%" height="100%" fill="transparent"></rect>
|
||||
<g transform="matrix(1 0 0 1 64 64)" id="f3d7db2e-8d04-4ee3-99c9-b0befc232687" >
|
||||
<rect style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(255,255,255); fill-rule: nonzero; opacity: 1; visibility: hidden;" vector-effect="non-scaling-stroke" x="-64" y="-64" rx="0" ry="0" width="128" height="128" />
|
||||
</g>
|
||||
<g transform="matrix(Infinity NaN NaN Infinity 0 0)" id="3dd1926a-5f11-4f73-a873-48f6092f16b5" >
|
||||
</g>
|
||||
<g transform="matrix(2.54 0 0 2.54 63.96 65.38)" >
|
||||
<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(56,189,248); fill-rule: evenodd; opacity: 1;" vector-effect="non-scaling-stroke" transform=" translate(-25.52, -15.22)" d="M 25.517 0 C 18.712 0 14.46 3.382 12.758 10.146 C 15.309999999999999 6.764000000000001 18.287 5.496 21.689 6.341000000000001 C 23.63 6.823000000000001 25.018 8.223 26.553 9.773000000000001 C 29.055 12.297 31.951 15.218000000000002 38.275 15.218000000000002 C 45.079 15.218000000000002 49.332 11.836000000000002 51.033 5.073000000000002 C 48.482 8.455000000000002 45.505 9.723000000000003 42.103 8.877000000000002 C 40.161 8.395000000000003 38.773 6.995000000000003 37.238 5.446000000000002 C 34.736 2.92 31.841 0 25.517 0 z M 12.758 15.218 C 5.954 15.218 1.701 18.6 0 25.364 C 2.552 21.982 5.529 20.714 8.93 21.559 C 10.872 22.041 12.26 23.441000000000003 13.795 24.991 C 16.297 27.515 19.192 30.436 25.517 30.436 C 32.321 30.436 36.574 27.055 38.275 20.291 C 35.723 23.673000000000002 32.745999999999995 24.941000000000003 29.344 24.096 C 27.403000000000002 23.613 26.015 22.213 24.48 20.664 C 21.978 18.14 19.082 15.218000000000002 12.758000000000001 15.218000000000002 z" stroke-linecap="round" />
|
||||
</g>
|
||||
</svg>
|
After Width: | Height: | Size: 2.3 KiB |
@@ -49,11 +49,11 @@ export function HelpModal(props) {
|
||||
</Trans>
|
||||
.
|
||||
</p>
|
||||
<p class="show-when-extension">
|
||||
<p>
|
||||
<Trans>
|
||||
Like this extension? Please{' '}
|
||||
Like this app? Please{' '}
|
||||
<a
|
||||
href="https://chrome.google.com/webstore/detail/web-maker/lkfkkhfhhdkiemehlpkgjeojomhpccnh/reviews"
|
||||
href="https://chromewebstore.google.com/detail/web-maker/lkfkkhfhhdkiemehlpkgjeojomhpccnh/reviews"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
@@ -75,7 +75,7 @@ export function HelpModal(props) {
|
||||
<Trans>Support the developer</Trans>
|
||||
</Button>{' '}
|
||||
<a
|
||||
href="https://chrome.google.com/webstore/detail/web-maker/lkfkkhfhhdkiemehlpkgjeojomhpccnh/reviews"
|
||||
href="https://chromewebstore.google.com/detail/web-maker/lkfkkhfhhdkiemehlpkgjeojomhpccnh/reviews"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
class="btn btn-icon"
|
||||
@@ -86,7 +86,7 @@ export function HelpModal(props) {
|
||||
<Trans>Review Web Maker</Trans>
|
||||
</a>{' '}
|
||||
<a
|
||||
href="https://spectrum.chat/web-maker"
|
||||
href="https://github.com/chinchang/web-maker/discussions"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
class="btn btn-icon"
|
||||
@@ -94,7 +94,7 @@ export function HelpModal(props) {
|
||||
<svg>
|
||||
<use xlinkHref="#chat-icon" />
|
||||
</svg>
|
||||
<Trans>Chat</Trans>
|
||||
<Trans>Discuss</Trans>
|
||||
</a>{' '}
|
||||
<a
|
||||
href="https://github.com/chinchang/web-maker/issues"
|
||||
|
@@ -74,7 +74,7 @@ function Notification({ version, isLatest, ...props }) {
|
||||
</a>
|
||||
</p>
|
||||
<p>
|
||||
Web Maker now has more than 50K weekly active users! Thank you for
|
||||
Web Maker now has more than 60K weekly active users! Thank you for
|
||||
being a part of this community of awesome developers. If you find
|
||||
Web Maker helpful,{' '}
|
||||
<a
|
||||
@@ -114,6 +114,17 @@ export function Notifications(props) {
|
||||
return (
|
||||
<div>
|
||||
<h1>Whats new?</h1>
|
||||
<Notification version="5.3.0" {...props} isLatest={true}>
|
||||
<li>
|
||||
<strong>Tailwind CSS templates</strong>: Tailwind CSS template is now
|
||||
available! If you are on the Chrome extension, use the Tailwind CSS 2
|
||||
template which is old but works without JavaScript (since JavaScript
|
||||
is disabled currently in Chrome extension). That said, JavaScript is
|
||||
coming back soon to the Chrome extension! 😃
|
||||
</li>
|
||||
<li>⬆️ Popular libraries updated to latest versions.</li>
|
||||
</Notification>
|
||||
|
||||
<Notification version="5.2.0" {...props}>
|
||||
<li>
|
||||
<strong>Improvement</strong>: Atomic CSS (Atomizer) has been updated
|
||||
@@ -157,7 +168,7 @@ export function Notifications(props) {
|
||||
Add library feature is fixed.
|
||||
</NotificationItem>
|
||||
</Notification>
|
||||
<Notification version="5.0.0" {...props} isLatest={true}>
|
||||
<Notification version="5.0.0" {...props}>
|
||||
<li>
|
||||
<strong>We are Back! 😎</strong>: After almost 2 years of nothing
|
||||
being shipped, we are back in action. That too with a bang! We have a
|
||||
|
@@ -82,7 +82,7 @@ if (module.hot) {
|
||||
}
|
||||
|
||||
const UNSAVED_WARNING_COUNT = 15;
|
||||
const version = '5.2.0';
|
||||
const version = '5.3.0';
|
||||
|
||||
// Read forced settings as query parameters
|
||||
window.forcedSettings = {};
|
||||
@@ -186,6 +186,8 @@ export default class App extends Component {
|
||||
this.setState({ user: authUser });
|
||||
window.user = authUser;
|
||||
window.localStorage.setItem('user', authUser);
|
||||
trackEvent('fn', 'loggedIn', window.IS_EXTENSION ? 'extension' : 'web');
|
||||
|
||||
if (!window.localStorage[LocalStorageKeys.ASKED_TO_IMPORT_CREATIONS]) {
|
||||
this.fetchItems(false, true).then(items => {
|
||||
if (!items.length) {
|
||||
|
@@ -95,7 +95,7 @@ export const jsLibs = [
|
||||
type: 'js'
|
||||
},
|
||||
{
|
||||
url: 'https://cdn.tailwindcss.com/3.3.1',
|
||||
url: 'https://cdn.tailwindcss.com/3.4.3',
|
||||
label: 'Tailwind 3',
|
||||
type: 'js'
|
||||
}
|
||||
@@ -128,7 +128,7 @@ export const cssLibs = [
|
||||
},
|
||||
|
||||
{
|
||||
url: 'https://cdnjs.cloudflare.com/ajax/libs/hint.css/2.7.0/hint.min.css',
|
||||
url: 'https://cdnjs.cloudflare.com/ajax/libs/hint.css/3.0.0/hint.min.css',
|
||||
label: 'Hint.css',
|
||||
type: 'css'
|
||||
},
|
||||
|
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "Web Maker",
|
||||
"version": "5.2.0",
|
||||
"version": "5.3.0",
|
||||
"manifest_version": 2,
|
||||
"description": "Blazing fast & offline playground for your web experiments",
|
||||
"homepage_url": "https://webmaker.app",
|
||||
"permissions": ["storage", "tabs", "<all_urls>"],
|
||||
"optional_permissions": ["downloads"],
|
||||
"content_security_policy": "script-src 'self' filesystem: http://localhost:* https://localhost:* https://apis.google.com https://ajax.googleapis.com https://code.jquery.com https://cdnjs.cloudflare.com https://unpkg.com https://maxcdn.com https://cdn77.com https://maxcdn.bootstrapcdn.com https://cdn.jsdelivr.net/ https://*.stripe.com/ https://builds.framerjs.com/ https://rawgit.com https://wzrd.in https://www.gstatic.com https://semantic-ui.com https://www.google-analytics.com https://cdn.tailwindcss.com 'unsafe-eval'; object-src 'self'",
|
||||
"content_security_policy": "script-src 'self' filesystem: http://localhost:* https://localhost:* https://apis.google.com https://ajax.googleapis.com https://code.jquery.com https://cdnjs.cloudflare.com https://unpkg.com https://maxcdn.com https://cdn77.com https://maxcdn.bootstrapcdn.com https://cdn.jsdelivr.net/ https://*.stripe.com/ https://builds.framerjs.com/ https://rawgit.com https://wzrd.in https://www.gstatic.com https://semantic-ui.com https://www.google-analytics.com https://cdn.tailwindcss.com https://www.googletagmanager.com 'unsafe-eval'; object-src 'self'",
|
||||
"options_ui": {
|
||||
"page": "options.html",
|
||||
"chrome_style": true
|
||||
|
@@ -1,4 +1,4 @@
|
||||
<!DOCTYPE html>
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Settings - Web Maker</title>
|
||||
@@ -35,7 +35,7 @@
|
||||
<body>
|
||||
<h3>
|
||||
Settings
|
||||
<span style="opacity: 0.6; font-size: 0.7em"> v5.2.0</span>
|
||||
<span style="opacity: 0.6; font-size: 0.7em"> v5.3.0</span>
|
||||
</h3>
|
||||
<form name="optionsForm">
|
||||
<label>
|
||||
|
@@ -15,6 +15,16 @@ export default [
|
||||
title: 'Preact',
|
||||
img: '/assets/preact-logo.svg'
|
||||
},
|
||||
{
|
||||
id: 'tailwind2',
|
||||
title: 'Tailwind CSS 2',
|
||||
img: 'assets/tailwind-logo.svg'
|
||||
},
|
||||
{
|
||||
id: 'tailwind',
|
||||
title: 'Tailwind CSS 3',
|
||||
img: 'assets/tailwind-logo.svg'
|
||||
},
|
||||
{
|
||||
id: 'kontra-game-engine',
|
||||
title: 'Kontra Game Engine',
|
||||
|
17
src/templates/template-tailwind.json
Normal file
17
src/templates/template-tailwind.json
Normal file
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"title": "Tailwind CSS 3 template",
|
||||
"html": "<div class=\"m-6 p-3 shadow-lg text-xl bg-purple-100 text-purple-800 rounded-md\">\n Hello world\n</div>",
|
||||
"css": "",
|
||||
"js": "",
|
||||
"externalLibs": {
|
||||
"js": "https://cdn.tailwindcss.com/3.4.3",
|
||||
"css": ""
|
||||
},
|
||||
"layoutMode": 1,
|
||||
"htmlMode": "html",
|
||||
"cssMode": "css",
|
||||
"jsMode": "js",
|
||||
"updatedOn": 1713157902575,
|
||||
"mainSizes": [50, 50],
|
||||
"sizes": [51, 45, 4]
|
||||
}
|
17
src/templates/template-tailwind2.json
Normal file
17
src/templates/template-tailwind2.json
Normal file
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"title": "Tailwind CSS 3 template",
|
||||
"html": "<div class=\"m-6 p-3 shadow-lg text-xl bg-purple-100 text-purple-800 rounded-md\">\n Hello world\n</div>",
|
||||
"css": "",
|
||||
"js": "",
|
||||
"externalLibs": {
|
||||
"js": "",
|
||||
"css": "https://cdn.jsdelivr.net/npm/tailwindcss/dist/tailwind.min.css"
|
||||
},
|
||||
"layoutMode": 1,
|
||||
"htmlMode": "html",
|
||||
"cssMode": "css",
|
||||
"jsMode": "js",
|
||||
"updatedOn": 1713157902575,
|
||||
"mainSizes": [50, 50],
|
||||
"sizes": [51, 45, 4]
|
||||
}
|
Reference in New Issue
Block a user