ashpie/swaf
1
0
Fork 0
Code Issues 22 Pull Requests Releases 11 Wiki Activity

Make rollup available in dependant projects

Browse Source
This commit is contained in:
Alice Gaudon 2021-11-20 19:52:44 +01:00
parent 9da35de4e0
commit d40481fe3b
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package.json
View File

@ -24,8 +24,6 @@
"release": "yarn build && yarn lint && yarn test && cd dist && yarn publish" "release": "yarn build && yarn lint && yarn test && cd dist && yarn publish"
}, },
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-node-resolve": "^13.0.6",
"@sveltejs/eslint-config": "sveltejs/eslint-config", "@sveltejs/eslint-config": "sveltejs/eslint-config",
"@tsconfig/svelte": "^2.0.1", "@tsconfig/svelte": "^2.0.1",
"@types/compression": "^1.7.0", "@types/compression": "^1.7.0",
@ -66,12 +64,6 @@
"node-fetch": "^3.0.0", "node-fetch": "^3.0.0",
"nodemon": "^2.0.6", "nodemon": "^2.0.6",
"require-from-string": "^2.0.2", "require-from-string": "^2.0.2",
"rollup": "^2.42.3",
"rollup-plugin-css-only": "^3.1.0",
"rollup-plugin-imagemin": "^0.4.1",
"rollup-plugin-livereload": "^2.0.0",
"rollup-plugin-svelte": "^7.1.0",
"rollup-plugin-terser": "^7.0.2",
"sass": "^1.32.12", "sass": "^1.32.12",
"supertest": "^6.0.0", "supertest": "^6.0.0",
"svelte-check": "^2.2.8", "svelte-check": "^2.2.8",
@ -79,6 +71,8 @@
"typescript": "^4.0.2" "typescript": "^4.0.2"
}, },
"dependencies": { "dependencies": {
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-node-resolve": "^13.0.6",
"argon2": "^0.28.2", "argon2": "^0.28.2",
"clear-module": "^4.1.1", "clear-module": "^4.1.1",
"compression": "^1.7.4", "compression": "^1.7.4",
@ -98,6 +92,12 @@
"nunjucks": "^3.2.1", "nunjucks": "^3.2.1",
"on-finished": "^2.3.0", "on-finished": "^2.3.0",
"redis": "^3.0.2", "redis": "^3.0.2",
"rollup": "^2.42.3",
"rollup-plugin-css-only": "^3.1.0",
"rollup-plugin-imagemin": "^0.4.1",
"rollup-plugin-livereload": "^2.0.0",
"rollup-plugin-svelte": "^7.1.0",
"rollup-plugin-terser": "^7.0.2",
"svelte": "^3.35.0", "svelte": "^3.35.0",
"svelte-preprocess": "4.6.9", "svelte-preprocess": "4.6.9",
"ts-node": "^10.4.0", "ts-node": "^10.4.0",

1
scripts/dist.js
View File

@ -7,6 +7,7 @@ const {copyRecursively} = require('./_functions.js');
'yarn.lock', 'yarn.lock',
'README.md', 'README.md',
'config/', 'config/',
'rollup.config.js',
].forEach(file => { ].forEach(file => {
copyRecursively(file, 'dist'); copyRecursively(file, 'dist');
}); });

1
scripts/prepare-sources.js
View File

@ -1,6 +1,5 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const {copyRecursively} = require("./_functions");
// These folders must exist for nodemon not to loop indefinitely. // These folders must exist for nodemon not to loop indefinitely.
[ [

10
src/frontend/AssetCompiler.ts
View File

@ -1,9 +1,12 @@
import child_process from "child_process"; import child_process from "child_process";
import config from "config"; import config from "config";
import fs from "fs"; import fs from "fs";
import path from "path";
import {logger} from "../Logger.js"; import {logger} from "../Logger.js";
import {listFilesRecursively} from "../Utils.js"; import {doesFileExist, listFilesRecursively} from "../Utils.js";
const ROLLUP_CONFIG_FILE_NAME = 'rollup.config.js';
export default class AssetCompiler { export default class AssetCompiler {
private rollup?: child_process.ChildProcess; private rollup?: child_process.ChildProcess;
@ -35,9 +38,12 @@ export default class AssetCompiler {
const production = !config.get<boolean>('view.dev'); const production = !config.get<boolean>('view.dev');
if (!this.rollup) { if (!this.rollup) {
const rollupConfigPath = await doesFileExist(ROLLUP_CONFIG_FILE_NAME) ?
ROLLUP_CONFIG_FILE_NAME :
path.resolve('node_modules/swaf/' + ROLLUP_CONFIG_FILE_NAME);
const args = [ const args = [
'rollup', 'rollup',
'-c', 'rollup.config.js', '-c', rollupConfigPath,
'--environment', `ENV:${production ? 'production' : 'dev'},BUILD_DIR:${this.sourceDir},PUBLIC_DIR:${this.targetDir},INPUT:${input.join(':')}`, '--environment', `ENV:${production ? 'production' : 'dev'},BUILD_DIR:${this.sourceDir},PUBLIC_DIR:${this.targetDir},INPUT:${input.join(':')}`,
]; ];
if (watch) args.push('--watch'); if (watch) args.push('--watch');