Unverified Commit 72c1496c authored by Yi (Flora) Liu's avatar Yi (Flora) Liu Committed by GitHub
Browse files

Update theme to 111 (#167)



* Update theme to 111, but on IE has compile err, need further look later
Signed-off-by: Yi Liu's avatarYi Liu <yi.liu@eclipse-foundation.org>

* Update Node version
Signed-off-by: Yi Liu's avatarYi Liu <yi.liu@eclipse-foundation.org>

* update theme
Signed-off-by: Yi Liu's avatarYi Liu <yi.liu@eclipse-foundation.org>

* add 3rd lib
Signed-off-by: Yi Liu's avatarYi Liu <yi.liu@eclipse-foundation.org>

* Update on notice, and make polyfill prod depend
Signed-off-by: Yi Liu's avatarYi Liu <yi.liu@eclipse-foundation.org>

* update version num in notice
Signed-off-by: Yi Liu's avatarYi Liu <yi.liu@eclipse-foundation.org>

* fix IE compile
Signed-off-by: Yi Liu's avatarYi Liu <yi.liu@eclipse-foundation.org>
parent f52a2ccf
language: node_js
matrix:
include:
- node_js: 10
env: HUGO_ENV=dev
- node_js: 12
env: HUGO_ENV=production
node_js:
- "12"
install:
- npm install
- npm ci
- wget https://github.com/gohugoio/hugo/releases/download/v0.76.5/hugo_0.76.5_Linux-64bit.deb
- sudo dpkg -i hugo*.deb
script:
- if [ "$HUGO_ENV" = "dev" ]; then hugo --gc --minify --buildFuture; fi;
- if [ "$HUGO_ENV" = "production" ]; then hugo --gc --minify ; fi;
\ No newline at end of file
- hugo --gc --minify --buildFuture
\ No newline at end of file
......@@ -3,7 +3,7 @@ ARG NGINX_IMAGE_TAG=stable-alpine-for-hugo
FROM debian:10-slim AS builder
ARG HUGO_VERSION=0.76.5
ARG NODE_VERSION=10.15.0
ARG NODE_VERSION=12.18.3
RUN apt-get update && apt-get install -y \
build-essential \
......
......@@ -29,7 +29,7 @@ pipeline {
parameters {
string(name: 'hugo_version', defaultValue: '0.76.5', description: 'The Hugo version that will be used to build the website. Must match versions speficied on https://github.com/gohugoio/hugo/releases.')
string(name: 'node_version', defaultValue: '10.15.3', description: 'The Node.js version that will be used to build the website. Must match versions specified on https://nodejs.org/en/download/releases/. It is adivsed to stick to LTS versions.')
string(name: 'node_version', defaultValue: '12.18.3', description: 'The Node.js version that will be used to build the website. Must match versions specified on https://nodejs.org/en/download/releases/. It is adivsed to stick to LTS versions.')
}
environment {
......
......@@ -71,3 +71,26 @@ The project maintains the following source code repositories:
### jquery.matchHeight.js (^0.7.2)
* License: The MIT License (MIT)
### React (^16.13.1)
* License: The MIT License (MIT)
### prop-types (^15.7.2)
* License: The MIT License (MIT)
### @babel/preset-env (^7.12,11)
* License: The MIT License (MIT)
### @babel/preset-react (^7.12.10)
* License: The MIT License (MIT)
### promise-polyfill (^8.2.0)
* License: The MIT License (MIT)
### unfetch (^4.2.0)
* License: The MIT License (MIT)
module.exports = {
presets: ['@babel/preset-env', '@babel/preset-react'],
};
\ No newline at end of file
{
"presets":[
[
"@babel/preset-env",
{
"useBuiltIns":"entry",
"targets":{
"ie":"11"
}
}
],
"@babel/preset-react"
],
"plugins":[
"@babel/plugin-proposal-class-properties",
"@babel/proposal-object-rest-spread"
]
}
\ No newline at end of file
// These must be the first lines in src/index.js
import 'react-app-polyfill/ie11';
import 'react-app-polyfill/stable';
import 'promise-polyfill/src/polyfill';
import 'unfetch/polyfill';
import React from 'react';
import ReactDOM from 'react-dom';
import EventsDataFetcher from './components/EventsDataFetcher';
......
......@@ -2,6 +2,9 @@
publish = "public"
command = "npm run build_netlify && hugo --gc --minify -b https://eclipsefdn-events.netlify.com"
[build.environment]
NODE_VERSION = "12.18.3"
[context.production.environment]
HUGO_VERSION = "0.76.5"
HUGO_ENV = "production"
......
This diff is collapsed.
......@@ -13,29 +13,29 @@
"url": "git://github.com/eclipsefdn/events.eclipse.org.git"
},
"scripts": {
"dev": "NODE_ENV=development webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "NODE_ENV=development webpack --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"dev": "NODE_ENV=development webpack --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "NODE_ENV=development webpack --watch --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
"hot": "NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"production": "NODE_ENV=production webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"install": "NODE_ENV=production npm run production",
"production": "NODE_ENV=production webpack --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
"postinstall": "NODE_ENV=production npm run production",
"disallow_robots_txt": "echo \"User-agent: *\r\nDisallow: /\" > layouts/robots.txt",
"build_netlify": "NODE_ENV=production npm run disallow_robots_txt && npm run production",
"test": "jest"
},
"dependencies": {
"eclipsefdn-hugo-solstice-theme": "0.0.107",
"@babel/preset-react": "^7.12.10",
"eclipsefdn-hugo-solstice-theme": "0.0.111",
"promise-polyfill": "^8.2.0",
"prop-types": "^15.7.2",
"react": "^16.13.1",
"react-dom": "^16.13.1"
"react-dom": "^16.13.1",
"unfetch": "^4.2.0"
},
"devDependencies": {
"@babel/preset-env": "^7.11.5",
"@babel/preset-react": "^7.10.4",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.0.4",
"babel-jest": "^26.3.0",
"jest": "^26.4.2",
"react-app-polyfill": "^1.0.6",
"react-test-renderer": "^16.13.1"
},
"development": [
......@@ -43,5 +43,6 @@
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
],
"browserslist": "last 5 version, > 0.2%, not dead, IE 11"
}
......@@ -16,7 +16,7 @@ mix.setPublicPath('static');
mix.setResourceRoot('../');
mix.less('./less/styles.less', 'static/css/styles.css');
mix.scripts([
mix.babel([
'./node_modules/jquery/dist/jquery.min.js',
'./node_modules/bootstrap/dist/js/bootstrap.min.js',
'./node_modules/jquery-match-height/dist/jquery.matchHeight-min.js',
......@@ -31,4 +31,4 @@ mix.scripts([
'./node_modules/eclipsefdn-solstice-assets/js/solstice.eventsmodal.js'
], './static/js/solstice.js');
mix.react('js/App.js', 'js');
\ No newline at end of file
mix.js('js/App.js', './static/js/App.js').react();
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment