Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix: include compiled css and js in the package #1028

Merged
merged 2 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion .releaserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
"assets": [
{"path": "dist/release.zip", "name": "release-${nextRelease.gitTag}.zip"}
]
}]
}],
["semantic-release-plugin-update-version-in-files", {
"files": [
"package/moj/all.js"
],
"placeholder": "0.0.0-development"
}]
]
}
27 changes: 13 additions & 14 deletions gulp/build-javascript.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
var concat = require('gulp-concat');
const gulp = require('gulp');
const rename = require("gulp-rename");
const uglify = require("gulp-uglify");
var concat = require('gulp-concat');
var umd = require('gulp-umd');

gulp.task('build:javascript', () => {
return gulp.src([
'src/moj/namespace.js',
'src/moj/helpers.js',
'src/moj/all.js',
'src/moj/version.js',
'src/moj/components/**/!(*.spec).js'
])
.pipe(concat('all.js'))
Expand All @@ -22,24 +24,21 @@ gulp.task('build:javascript', () => {
.pipe(gulp.dest('package/moj/'));
});

gulp.task('build:javascript-with-jquery', () => {
gulp.task('build:javascript-minified', () => {
return gulp
.src("package/moj/all.js")
.pipe(uglify())
.pipe(rename("moj-frontend.min.js"))
.pipe(gulp.dest("package/moj"));
})

gulp.task('build:javascript-minified-with-jquery', () => {
return gulp.src([
'node_modules/jquery/dist/jquery.js',
'gulp/jquery/scope.js',
'src/moj/namespace.js',
'src/moj/helpers.js',
'src/moj/all.js',
'src/moj/components/**/!(*.spec).js',
'package/moj/all.js',
])
.pipe(concat('all.jquery.min.js'))
.pipe(umd({
exports: function() {
return 'MOJFrontend';
},
namespace: function() {
return 'MOJFrontend';
}
}))
.pipe(uglify())
.pipe(gulp.dest('package/moj/'));
});
21 changes: 21 additions & 0 deletions gulp/build-styles.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const autoprefixer = require("autoprefixer");
const cssnano = require("cssnano");
const gulp = require("gulp");
const postcss = require("gulp-postcss");
const rename = require("gulp-rename");
const sass = require("gulp-sass")(require("sass"));

gulp.task("build:css", () => {
return gulp
.src("gulp/dist-scss/*.scss")
.pipe(sass())
.pipe(postcss([autoprefixer, cssnano]))
.pipe(
rename((path) => ({
dirname: path.dirname,
basename: path.basename.replace("all", "moj-frontend"),
extname: ".min.css",
}))
)
.pipe(gulp.dest("package/moj"));
});
4 changes: 3 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ gulp.task(
"build:clean",
"build:copy-files",
"build:javascript",
"build:javascript-with-jquery",
"build:javascript-minified",
"build:javascript-minified-with-jquery",
"build:css",
"build:compress-images",
)
);
Expand Down
14 changes: 12 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
"moment": "^2.29.4",
"nunjucks": "^3.2.3",
"require-dir": "^1.2.0",
"sass": "^1.79.3"
"sass": "^1.79.3",
"semantic-release-plugin-update-version-in-files": "^1.1.0"
},
"devDependencies": {
"@babel/core": "^7.14.3",
Expand Down
1 change: 1 addition & 0 deletions src/moj/version.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MOJFrontend.version = '0.0.0-development'
Loading