axe-web-public
/
block-dev-tool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Added "Content-Type" to files that are sent to S3.

wordpress-build
Roman Axelrod 2 years ago
parent
e2553358be
commit
8ca6cb0365
4 changed files with 90 additions and 8148 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      helpers.js
  2. 8124
      package-lock.json
  3. 7
      package.json
  4. 86
      server.js

21
helpers.js
View File

@ -11,6 +11,7 @@ import {buildHubspotEmail} from "./platforms/hubspot/hubspot-email-adapter.js";
import {buildHubspotPage} from "./platforms/hubspot/hubspot-page-adapter.js"; import {buildHubspotPage} from "./platforms/hubspot/hubspot-page-adapter.js";
import fs from "fs/promises"; import fs from "fs/promises";
import fetch from "node-fetch"; import fetch from "node-fetch";
import mime from "mime-types";
const __filename = fileURLToPath(import.meta.url); const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename); const __dirname = path.dirname(__filename);
@ -180,7 +181,14 @@ export function removeCommentsFromJs(content) {
} }
export async function uploadFile(filePath, uploadUrl, validator) { export async function uploadFile(filePath, uploadUrl, validator) {
let body = await fs.readFile(filePath, {encoding: 'utf8'}); const options = {};
const contentType = mime.lookup(filePath);
if (['text/css', 'application/javascript'].includes(contentType)) {
options.encoding = 'utf8';
}
let body = await fs.readFile(filePath, options);
if (validator) { if (validator) {
body = validator(body); body = validator(body);
@ -190,11 +198,12 @@ export async function uploadFile(filePath, uploadUrl, validator) {
const response = await fetch(uploadUrl, { const response = await fetch(uploadUrl, {
method: 'PUT', method: 'PUT',
body: body, body: body,
headers: {'Content-Type': 'application/javascript'} headers: {'Content-Type': contentType}
}); });
return response.status !== 200; return response.status !== 200;
} catch (err) { } catch (err) {
console.log(err)
const fileName = filePath.split('/').pop(); const fileName = filePath.split('/').pop();
throw new Error(`Can't upload "${fileName}" file. Server permission error.`); throw new Error(`Can't upload "${fileName}" file. Server permission error.`);
} }
@ -235,3 +244,11 @@ export async function isFileEmpty(filePath, ignoreComments = false) {
return true; return true;
} }
export function replaceNames(content, images, uploadedImages) {
images.forEach((image, index) => {
content = content.replace(image, uploadedImages[index].fileName);
});
return content;
}

8124
package-lock.json
View File

File diff suppressed because it is too large

7
package.json
View File

@ -7,9 +7,9 @@
"url": "https://axe-web.com/" "url": "https://axe-web.com/"
}, },
"scripts": { "scripts": {
"info": "NODE_ENV=development BLOCK_NAME=content MODULE_PATH= node debug.js", "info": "NODE_ENV=development BLOCK_NAME=buttons MODULE_PATH= node debug.js",
"dev": "NODE_ENV=development BLOCK_NAME=content MODULE_PATH= node server.js", "dev": "NODE_ENV=development BLOCK_NAME=buttons MODULE_PATH= node server.js",
"build-platform": "NODE_ENV=development BLOCK_NAME=content MODULE_PATH= node ./build.js", "build-platform": "NODE_ENV=development BLOCK_NAME=buttons MODULE_PATH= node ./build.js",
"dev-dev-tool": "NODE_ENV=development rollup --config rollup.config.js --watch", "dev-dev-tool": "NODE_ENV=development rollup --config rollup.config.js --watch",
"build-dev-tool": "rollup --config rollup.config.js" "build-dev-tool": "rollup --config rollup.config.js"
}, },
@ -37,6 +37,7 @@
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"mem-fs": "^2.2.1", "mem-fs": "^2.2.1",
"mem-fs-editor": "^9.5.0", "mem-fs-editor": "^9.5.0",
"mime-types": "^2.1.35",
"ngrok": "^5.0.0-beta.2", "ngrok": "^5.0.0-beta.2",
"node-fetch": "^3.2.10", "node-fetch": "^3.2.10",
"open": "^8.4.0", "open": "^8.4.0",

86
server.js
View File

@ -29,6 +29,7 @@ import {
readJSONFile, readJSONFile,
removeCommentsFromCss, removeCommentsFromCss,
removeCommentsFromJs, removeCommentsFromJs,
replaceNames,
uploadFile, uploadFile,
zipProject zipProject
} from "./helpers.js"; } from "./helpers.js";
@ -139,18 +140,24 @@ app.get('/view/:baseView', (req, res) => {
app.get('/publish', async (req, res) => { app.get('/publish', async (req, res) => {
const data = await readJSONFile(path.join(projectPath, `block.json`)); const data = await readJSONFile(path.join(projectPath, `block.json`));
data.static_files = { // Trigger build on the registry server only if the type of the unit is `foundation` or `component`.
css: getBlockName(data.name).name + '.min.css', const uploadStaticFiles = ['foundation', 'component'].includes(data.type);
js: getBlockName(data.name).name + '.min.js',
images: await getImagesList(path.join(projectPath, 'src', 'images')),
}
if (await isFileEmpty(path.join(projectPath, `src/scripts`, data.static_files.js), true)) { // Prepare list of static files for the registry server.
delete data.static_files.js; if (uploadStaticFiles) {
} data.static_files = {
css: getBlockName(data.name).name + '.min.css',
js: getBlockName(data.name).name + '.min.js',
images: await getImagesList(path.join(projectPath, 'src', 'images')),
}
if (await isFileEmpty(path.join(projectPath, `src/scripts`, data.static_files.js), true)) {
delete data.static_files.js;
}
if (!data.static_files.images.length) { if (!data.static_files.images.length) {
delete data.static_files.images; delete data.static_files.images;
}
} }
let responseData = { let responseData = {
@ -183,25 +190,36 @@ app.get('/publish', async (req, res) => {
await uploadFile(path.join(projectPath, 'dist.zip'), responseData.uploadBundleUrl); // Bundle await uploadFile(path.join(projectPath, 'dist.zip'), responseData.uploadBundleUrl); // Bundle
} }
// TODO: Upload CSS/JS/Images files only if the type of the unit is `foundation` or `component`. if (uploadStaticFiles) {
if (responseData.staticFilesUrls.css) { if (responseData.staticFilesUrls.css) {
await uploadFile( await uploadFile(
path.join(projectPath, 'src/styles', data.static_files.css), path.join(projectPath, 'src/styles', data.static_files.css),
responseData.staticFilesUrls.css.uploadUrl, responseData.staticFilesUrls.css.uploadUrl,
(data) => removeCommentsFromCss(data)); // CSS (content) => {
} if (responseData.staticFilesUrls.images) {
content = replaceNames(content, data.static_files.images, responseData.staticFilesUrls.images);
}
removeCommentsFromCss(content)
return content;
}); // CSS
}
if (responseData.staticFilesUrls.js) { if (responseData.staticFilesUrls.js) {
await uploadFile( await uploadFile(
path.join(projectPath, 'src/scripts', data.static_files.js), path.join(projectPath, 'src/scripts', data.static_files.js),
responseData.staticFilesUrls.js.uploadUrl, responseData.staticFilesUrls.js.uploadUrl,
(data) => removeCommentsFromJs(data)); // JS (data) => removeCommentsFromJs(data)
} ); // JS
}
if (responseData.staticFilesUrls.images) { if (responseData.staticFilesUrls.images) {
for (let i = 0; i < data.static_files.images.length; i++) { for (let i = 0; i < data.static_files.images.length; i++) {
await uploadFile(path.join(projectPath, 'src/images', data.static_files.images[i]), await uploadFile(
responseData.staticFilesUrls.images[i].uploadUrl); // Images path.join(projectPath, 'src/images', data.static_files.images[i]),
responseData.staticFilesUrls.images[i].uploadUrl,
); // Images
}
} }
} }
} catch (err) { } catch (err) {
@ -214,12 +232,14 @@ app.get('/publish', async (req, res) => {
await fs.unlink(path.join(projectPath, 'dist.zip')); // Remove local bundle await fs.unlink(path.join(projectPath, 'dist.zip')); // Remove local bundle
// TODO: Trigger build on the registry server only if the type of the unit is `foundation` or `component`. // Trigger project's global files build on the registry server.
try { if (uploadStaticFiles) {
await triggerGlobalProjectFilesBuild(getBlockName(data.name).project); try {
} catch (err) { await triggerGlobalProjectFilesBuild(getBlockName(data.name).project);
res.json({success: false, message: 'Something wrong with Project Builder.'}); } catch (err) {
return; res.json({success: false, message: 'Something wrong with Project Builder.'});
return;
}
} }
res.json({success: true}); res.json({success: true});

Write Preview
Loading…
Cancel
Save