From 76336c255816c33bd87d61ff9c2b4bd81fa9a14e Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 17 Jun 2019 22:41:17 +0000 Subject: [PATCH] Sapper template for Rollup --- .travis.yml | 11 ------ _template/build-pkg.js | 13 ------- _template/build.sh | 19 --------- _template/create-branches.sh | 31 --------------- package.json | 36 +++++++++++++++++ package_template.json | 52 ------------------------- webpack.config.js | 75 ------------------------------------ 7 files changed, 36 insertions(+), 201 deletions(-) delete mode 100644 .travis.yml delete mode 100644 _template/build-pkg.js delete mode 100755 _template/build.sh delete mode 100755 _template/create-branches.sh create mode 100644 package.json delete mode 100644 package_template.json delete mode 100644 webpack.config.js diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 53c7097..0000000 --- a/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -sudo: false -language: node_js -node_js: - - "stable" -env: - global: - - BUILD_TIMEOUT=10000 -branches: - only: - - master -script: _template/build.sh diff --git a/_template/build-pkg.js b/_template/build-pkg.js deleted file mode 100644 index 30df946..0000000 --- a/_template/build-pkg.js +++ /dev/null @@ -1,13 +0,0 @@ -const fs = require('fs'); - -const type = process.argv[2]; - -const pkg = require('../package_template.json'); -for (const key in pkg['merge-configs'][type]) { - Object.assign(pkg[key], pkg['merge-configs'][type][key]); -} -delete pkg['merge-configs']; -fs.writeFileSync( - __dirname + '/../package.json', - JSON.stringify(pkg, null, ' ') + '\n' -); diff --git a/_template/build.sh b/_template/build.sh deleted file mode 100755 index deb8dfb..0000000 --- a/_template/build.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -cd "$(dirname $0)" - -if [ "$CI" ]; then - # write out SSH key - [ "$SSH_KEY" ] || exit 1 - echo "$SSH_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa -fi - -# branch names -DEFAULT=master -ROLLUP=rollup -WEBPACK=webpack - -./create-branches.sh $DEFAULT $ROLLUP $WEBPACK - -# force push rollup and webpack branches -git push git@github.com:sveltejs/sapper-template.git $ROLLUP $WEBPACK -f diff --git a/_template/create-branches.sh b/_template/create-branches.sh deleted file mode 100755 index 1128578..0000000 --- a/_template/create-branches.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -cd "$(dirname $0)"/.. - -DEFAULT=${1:-master} -ROLLUP=${2:-rollup} -WEBPACK=${3:-webpack} - -echo "Creating $ROLLUP and $WEBPACK branches from $DEFAULT" - -# make sure we're on master, and delete the $ROLLUP and $WEBPACK branches -git symbolic-ref HEAD "refs/heads/$DEFAULT" -git reset --hard -git branch -D $ROLLUP $WEBPACK - -# create the $ROLLUP branch off the current master -git checkout -b $ROLLUP -node _template/build-pkg.js rollup -git rm -r --cached .travis.yml _template package_template.json webpack.config.js -git add package.json -git commit -m 'Sapper template for Rollup' -git symbolic-ref HEAD "refs/heads/$DEFAULT" -git reset --hard - -# create the $WEBPACK branch off the current master -git checkout -b $WEBPACK -node _template/build-pkg.js webpack -git rm -r --cached .travis.yml _template package_template.json rollup.config.js -git add package.json -git commit -m 'Sapper template for webpack' -git symbolic-ref HEAD "refs/heads/$DEFAULT" -git reset --hard \ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 0000000..0fe0136 --- /dev/null +++ b/package.json @@ -0,0 +1,36 @@ +{ + "name": "TODO", + "description": "TODO", + "version": "0.0.1", + "scripts": { + "dev": "sapper dev", + "build": "sapper build --legacy", + "export": "sapper export --legacy", + "start": "node __sapper__/build", + "cy:run": "cypress run", + "cy:open": "cypress open", + "test": "run-p --race dev cy:run" + }, + "dependencies": { + "compression": "^1.7.1", + "polka": "^0.5.0", + "sirv": "^0.4.0" + }, + "devDependencies": { + "npm-run-all": "^4.1.5", + "sapper": "^0.27.0", + "svelte": "^3.0.0", + "@babel/core": "^7.0.0", + "@babel/plugin-syntax-dynamic-import": "^7.0.0", + "@babel/plugin-transform-runtime": "^7.0.0", + "@babel/preset-env": "^7.0.0", + "@babel/runtime": "^7.0.0", + "rollup": "^1.0.0", + "rollup-plugin-babel": "^4.0.2", + "rollup-plugin-commonjs": "^9.1.6", + "rollup-plugin-node-resolve": "^4.0.0", + "rollup-plugin-replace": "^2.0.0", + "rollup-plugin-svelte": "^5.0.1", + "rollup-plugin-terser": "^4.0.4" + } +} diff --git a/package_template.json b/package_template.json deleted file mode 100644 index 290ec35..0000000 --- a/package_template.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "TODO", - "description": "TODO", - "version": "0.0.1", - "scripts": { - "dev": "sapper dev", - "build": "sapper build", - "export": "sapper export", - "start": "node __sapper__/build", - "cy:run": "cypress run", - "cy:open": "cypress open", - "test": "run-p --race dev cy:run" - }, - "dependencies": { - "compression": "^1.7.1", - "polka": "^0.5.0", - "sirv": "^0.4.0" - }, - "devDependencies": { - "npm-run-all": "^4.1.5", - "sapper": "^0.27.0", - "svelte": "^3.0.0" - }, - "merge-configs": { - "rollup": { - "scripts": { - "build": "sapper build --legacy", - "export": "sapper export --legacy" - }, - "devDependencies": { - "@babel/core": "^7.0.0", - "@babel/plugin-syntax-dynamic-import": "^7.0.0", - "@babel/plugin-transform-runtime": "^7.0.0", - "@babel/preset-env": "^7.0.0", - "@babel/runtime": "^7.0.0", - "rollup": "^1.0.0", - "rollup-plugin-babel": "^4.0.2", - "rollup-plugin-commonjs": "^9.1.6", - "rollup-plugin-node-resolve": "^4.0.0", - "rollup-plugin-replace": "^2.0.0", - "rollup-plugin-svelte": "^5.0.1", - "rollup-plugin-terser": "^4.0.4" - } - }, - "webpack": { - "devDependencies": { - "svelte-loader": "^2.9.0", - "webpack": "^4.7.0" - } - } - } -} diff --git a/webpack.config.js b/webpack.config.js deleted file mode 100644 index a9ad9fa..0000000 --- a/webpack.config.js +++ /dev/null @@ -1,75 +0,0 @@ -const webpack = require('webpack'); -const config = require('sapper/config/webpack.js'); -const pkg = require('./package.json'); - -const mode = process.env.NODE_ENV; -const dev = mode === 'development'; - -const extensions = ['.mjs', '.js', '.json', '.svelte', '.html']; -const mainFields = ['svelte', 'module', 'browser', 'main']; - -module.exports = { - client: { - entry: config.client.entry(), - output: config.client.output(), - resolve: { extensions, mainFields }, - module: { - rules: [ - { - test: /\.(svelte|html)$/, - use: { - loader: 'svelte-loader', - options: { - dev, - hydratable: true, - hotReload: false // pending https://github.com/sveltejs/svelte/issues/2377 - } - } - } - ] - }, - mode, - plugins: [ - // pending https://github.com/sveltejs/svelte/issues/2377 - // dev && new webpack.HotModuleReplacementPlugin(), - new webpack.DefinePlugin({ - 'process.browser': true, - 'process.env.NODE_ENV': JSON.stringify(mode) - }), - ].filter(Boolean), - devtool: dev && 'inline-source-map' - }, - - server: { - entry: config.server.entry(), - output: config.server.output(), - target: 'node', - resolve: { extensions, mainFields }, - externals: Object.keys(pkg.dependencies).concat('encoding'), - module: { - rules: [ - { - test: /\.(svelte|html)$/, - use: { - loader: 'svelte-loader', - options: { - css: false, - generate: 'ssr', - dev - } - } - } - ] - }, - mode: process.env.NODE_ENV, - performance: { - hints: false // it doesn't matter if server.js is large - } - }, - - serviceworker: { - entry: config.serviceworker.entry(), - output: config.serviceworker.output(), - mode: process.env.NODE_ENV - } -};