Browse Source

Upgrade everything

master
Wesley Kerfoot 6 years ago
parent
commit
3e3f629077
  1. 4
      app/Dockerfile
  2. 3666
      app/package-lock.json
  3. 58
      app/package.json
  4. 16
      app/rollup.config.editor.js
  5. 16
      app/rollup.config.riotblog.js
  6. 2
      app/scripts/editor.tag

4
app/Dockerfile

@ -2,10 +2,10 @@ FROM ubuntu:latest
MAINTAINER wes kerfoot "wjak56@gmail.com" MAINTAINER wes kerfoot "wjak56@gmail.com"
RUN apt-get update -y RUN apt-get update -y
RUN apt-get install -y python3-pip python3-dev build-essential RUN apt-get install -y python3-pip python3-dev build-essential sassc jq
RUN apt-get install -y curl RUN apt-get install -y curl
RUN curl -sL https://deb.nodesource.com/setup_11.x | bash RUN curl -sL https://deb.nodesource.com/setup_11.x | bash
RUN apt-get install -y sassc nodejs jq RUN apt-get install -y nodejs
RUN npm install -g uglifycss uglifyjs RUN npm install -g uglifycss uglifyjs
COPY . ./src COPY . ./src

3666
app/package-lock.json

File diff suppressed because it is too large

58
app/package.json

@ -4,8 +4,8 @@
"description": "Riot Blog", "description": "Riot Blog",
"main": "src/scripts/riotblog.js", "main": "src/scripts/riotblog.js",
"scripts": { "scripts": {
"build_riotblog": "rollup --input /src/scripts/riotblog.js -c /src/rollup.config.riotblog.js", "build_riotblog": "rollup /src/scripts/riotblog.js --config /src/rollup.config.riotblog.js",
"build_editor": "rollup --input /src/scripts/editor.js -c /src/rollup.config.editor.js" "build_editor": "rollup /src/scripts/editor.js --config /src/rollup.config.editor.js"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -18,41 +18,41 @@
}, },
"homepage": "https://github.com/nisstyre56/riotblog#readme", "homepage": "https://github.com/nisstyre56/riotblog#readme",
"devDependencies": { "devDependencies": {
"ramda": "^0.23.0", "ramda": "^0.26.1",
"riot": "^3.3.1", "riot": "^3.0.0",
"riot-route": "^3.1.0", "riot-route": "^3.1.4",
"rollup": "^0.41.4", "rollup": "^1.20.3",
"rollup-plugin-buble": "^0.15.0", "rollup-plugin-buble": "^0.19.8",
"rollup-plugin-commonjs": "^8.0.2", "rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^2.0.0", "rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-riot": "^1.1.0", "rollup-plugin-riot": "^2.0.0",
"whatwg-fetch": "^2.0.2" "whatwg-fetch": "^3.0.0"
}, },
"dependencies": { "dependencies": {
"animate.css": "^3.5.2", "animate.css": "^3.7.2",
"axios": "^0.18.1", "axios": "^0.19.0",
"babel-core": "^6.26.0", "babel-core": "^6.26.3",
"babel-plugin-transform-es2015-template-literals": "^6.22.0", "babel-plugin-transform-es2015-template-literals": "^6.22.0",
"babel-preset-es2015-riot": "^1.1.0", "babel-preset-es2015-riot": "^1.1.0",
"closest": "^0.0.1", "closest": "^0.0.1",
"element-closest": "^2.0.2", "element-closest": "^3.0.1",
"es6-promise": "^4.1.1", "es6-promise": "^4.2.8",
"fetch-cached": "^2.0.3", "fetch-cached": "^2.0.3",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"immutable": "^3.8.1", "immutable": "^3.8.2",
"jquery": "^3.4.0", "jquery": "^3.4.1",
"lodash": "^4.17.13", "lodash": "^4.17.15",
"lodash-es": "^4.17.4", "lodash-es": "^4.17.15",
"moment": "^2.18.1", "moment": "^2.24.0",
"querystring": "^0.2.0", "querystring": "^0.2.0",
"riotcontrol": "^0.0.3", "riotcontrol": "^0.0.3",
"rollup-plugin-babel": "^3.0.1", "rollup-plugin-babel": "^4.3.3",
"rollup-plugin-json": "^2.1.1", "rollup-plugin-json": "^4.0.0",
"rollup-plugin-uglify": "^2.0.1", "rollup-plugin-uglify": "^6.0.3",
"showdown": "^1.6.4", "showdown": "^1.9.0",
"smoothscroll-polyfill": "^0.3.5", "smoothscroll-polyfill": "^0.4.4",
"spectre.css": "^0.2.14", "spectre.css": "^0.5.8",
"twitter-widgets": "^1.0.0", "twitter-widgets": "^2.0.0",
"whatwg-fetch": "^2.0.2" "whatwg-fetch": "^3.0.0"
} }
} }

16
app/rollup.config.editor.js

@ -2,23 +2,25 @@ import riot from 'rollup-plugin-riot'
import nodeResolve from 'rollup-plugin-node-resolve' import nodeResolve from 'rollup-plugin-node-resolve'
import commonjs from 'rollup-plugin-commonjs' import commonjs from 'rollup-plugin-commonjs'
import buble from 'rollup-plugin-buble' import buble from 'rollup-plugin-buble'
import uglify from 'rollup-plugin-uglify'; import { uglify } from 'rollup-plugin-uglify';
function makeBundle(item) { function makeBundle(item) {
console.log(item); console.log(item);
var entry = item[0]; var entry = item[0];
var dest = item[1]; var dest = item[1];
return { return {
entry: entry, input: entry,
dest: dest, output: {
"file" : dest,
"format" : "iife"
},
plugins: [ plugins: [
riot(), riot({"ext" : "tag"}),
nodeResolve({ jsnext: true, preferBuiltins: false}), nodeResolve({ preferBuiltins: false}),
commonjs(), commonjs(),
buble(), buble(),
uglify() uglify()
], ]
format: 'iife'
}; };
} }

16
app/rollup.config.riotblog.js

@ -2,23 +2,25 @@ import riot from 'rollup-plugin-riot'
import nodeResolve from 'rollup-plugin-node-resolve' import nodeResolve from 'rollup-plugin-node-resolve'
import commonjs from 'rollup-plugin-commonjs' import commonjs from 'rollup-plugin-commonjs'
import buble from 'rollup-plugin-buble' import buble from 'rollup-plugin-buble'
import uglify from 'rollup-plugin-uglify'; import { uglify } from 'rollup-plugin-uglify';
function makeBundle(item) { function makeBundle(item) {
console.log(item); console.log(item);
var entry = item[0]; var entry = item[0];
var dest = item[1]; var dest = item[1];
return { return {
entry: entry, input: entry,
dest: dest, output: {
"file" : dest,
"format" : "iife"
},
plugins: [ plugins: [
riot(), riot({"ext" : "tag"}),
nodeResolve({ jsnext: true, preferBuiltins: false}), nodeResolve({ preferBuiltins: false}),
commonjs(), commonjs(),
buble(), buble(),
uglify() uglify()
], ]
format: 'iife'
}; };
} }

2
app/scripts/editor.tag

@ -86,7 +86,7 @@
import './loading.tag'; import './loading.tag';
import './raw.tag'; import './raw.tag';
import { default as showdown } from 'showdown'; import { default as showdown } from 'showdown';
import querystring from 'querystring'; import { default as querystring } from 'querystring';
import Z from './zipper.js'; import Z from './zipper.js';
this.loading = false; this.loading = false;

Loading…
Cancel
Save