diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..7d914ab --- /dev/null +++ b/.editorconfig @@ -0,0 +1,13 @@ +# editorconfig.org +root: true + +[*] +charset: utf-8 +end_of_line: lf +indent_size: 2 +indent_style: space +insert_final_newline: true +trim_trailing_whitespace: true + +[*.{md,diff}] +trim_trailing_whitespace: false diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..3a01b9c --- /dev/null +++ b/.eslintrc @@ -0,0 +1,50 @@ +{ + "plugins": ["prettier", "svelte3"], + "extends": ["prettier"], + "parserOptions": { + "ecmaVersion": 6, + "sourceType": "module", + "ecmaFeatures": { + "arrowFunctions": true, + "defaultParams": true, + "modules": true, + "classes": true + } + }, + "rules": { + "prettier": true, + "prettier/prettier": [ + "error", + { + "endOfLine": "auto" + } + ], + "array-callback-return": [ + "error", + { + "allowImplicit": true + } + ], + "no-extra-semi": 2, + "eqeqeq": 1, + "strict": 2, + "no-undef": 2, + "no-unused-vars": [ + 1, + { + "vars": "all", + "args": "none" + } + ], + "no-loop-func": 2, + "no-unused-expressions": [ + "error", + { + "allowShortCircuit": true, + "allowTernary": true + } + ], + "semi": 1, + "no-mixed-spaces-and-tabs": 2 + } +} diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5a0d5e4 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto eol=lf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f2d8194 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.DS_Store +/.history/ +/coverage/ +/node_modules/ +yarn-error.log diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..c9e4d1b --- /dev/null +++ b/.prettierignore @@ -0,0 +1,6 @@ +/.history/ +/coverage/ +/node_modules/ +**/node_modules/ +**/__sapper__/ +**/cypress/screenshots/ diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..45691c7 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,8 @@ +{ + "singleQuote": true, + "endOfLine": "auto", + "proseWrap": "preserve", + "trailingComma": "all", + "tabWidth": 2, + "useTabs": false +} diff --git a/.storybook/config.js b/.storybook/config.js new file mode 100644 index 0000000..d46a7b6 --- /dev/null +++ b/.storybook/config.js @@ -0,0 +1,8 @@ +import { configure } from '@storybook/svelte'; + +function loadStories() { + const req = require.context('../packages', true, /\.stories\.js$/); + req.keys().forEach(filename => req(filename)); +} + +configure(loadStories, module); diff --git a/README.md b/README.md new file mode 100644 index 0000000..85467b4 --- /dev/null +++ b/README.md @@ -0,0 +1,17 @@ + + +```bash +# cd into ./packages +npx degit "sveltejs/sapper-template#rollup" another-app && cd $_ && rm -f cypress.json && rm -rf ./cypress && rm -f appveyor.yml + +# Clean install +npx degit "sveltejs/sapper-template#rollup" app-web-rollup && cd $_ + +# this will install a new sapper app and remove unwanted files and folders + +``` + +# Using @nedkelly/ namespaced components + +Sapper need to use the non-compiled Svelte components ... +https://github.com/sveltejs/sapper-template/blob/master/README.md#using-external-components diff --git a/babel.config.js b/babel.config.js new file mode 100644 index 0000000..a79d119 --- /dev/null +++ b/babel.config.js @@ -0,0 +1,3 @@ +module.exports = { + presets: ['@babel/preset-env'], +}; diff --git a/jest.config.js b/jest.config.js new file mode 100644 index 0000000..48a3281 --- /dev/null +++ b/jest.config.js @@ -0,0 +1,17 @@ +module.exports = { + testPathIgnorePatterns: ['/cypress/', '/node_modules/'], + transform: { + '^.+\\.js$': 'babel-jest', + '^.+\\.svelte$': 'jest-transform-svelte', + }, + moduleFileExtensions: ['js', 'svelte'], + bail: false, + verbose: true, + collectCoverage: true, + // collectCoverageFrom: [ + // './packages/**/*.{js,svelte}', + // '!./packages/**/node_modules/**', + // '!./packages/**/__sapper__/**', + // ], + coveragePathIgnorePatterns: ['/cypress/', '/node_modules/', '/__sapper__/'], +}; diff --git a/lerna.json b/lerna.json new file mode 100644 index 0000000..9de4ac1 --- /dev/null +++ b/lerna.json @@ -0,0 +1,9 @@ +{ + "lerna": "^3.15.0", + "packages": [ + "packages/*" + ], + "version": "1.0.0", + "npmClient": "yarn", + "workspaces": true +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..302f124 --- /dev/null +++ b/package.json @@ -0,0 +1,47 @@ +{ + "name": "sapper-yarn-workspaces-lerna-poc", + "version": "1.0.0", + "description": "Sapper and Svelte Monorepo POC", + "license": "MIT", + "private": true, + "scripts": { + "lb": "lerna bootstrap --use-workspaces", + "postinstall": "rexreplace \"followSymlinks: false\" \"followSymlinks: true\" ./node_modules/watchpack/lib/DirectoryWatcher.js", + "stories": "start-storybook -p 5854 -c .storybook", + "test": "NODE_ENV=test jest", + "fix:check": "prettier --config ./.prettierrc --ignore-path ./.prettierignore --check **/*.{js,svelte,css,html}", + "fix:write": "prettier --config ./.prettierrc --ignore-path ./.prettierignore --write **/*.{js,svelte,css,html}" + }, + "dependencies": { + "rexreplace": "^4.1.1" + }, + "devDependencies": { + "@babel/core": "^7.4.5", + "@babel/preset-env": "^7.4.5", + "@babel/register": "^7.4.4", + "@storybook/svelte": "^5.1.9", + "babel-jest": "^24.8.0", + "babel-loader": "^8.0.6", + "eslint": "^6.0.1", + "eslint-plugin-prettier": "^3.1.0", + "jest": "^24.8.0", + "jest-transform-svelte": "^2.0.2", + "lerna": "^3.15.0", + "prettier": "^1.18.2", + "prettier-plugin-svelte": "^0.6.0", + "pretty-quick": "^1.11.1", + "react": "^16.8.6", + "react-dom": "^16.8.6", + "svelte": "^3.6.3", + "svelte-loader": "^2.13.4", + "webpack": "^4.35.2" + }, + "husky": { + "hooks": { + "pre-commit": "pretty-quick --staged" + } + }, + "workspaces": [ + "packages/*" + ] +} diff --git a/packages/app-web-rollup/.gitignore b/packages/app-web-rollup/.gitignore new file mode 100644 index 0000000..5aea041 --- /dev/null +++ b/packages/app-web-rollup/.gitignore @@ -0,0 +1,6 @@ +.DS_Store +/node_modules/ +/src/node_modules/@sapper/ +yarn-error.log +/cypress/screenshots/ +/__sapper__/ diff --git a/packages/app-web-rollup/README.md b/packages/app-web-rollup/README.md new file mode 100644 index 0000000..491cded --- /dev/null +++ b/packages/app-web-rollup/README.md @@ -0,0 +1,88 @@ +# sapper-template + +The default [Sapper](https://github.com/sveltejs/sapper) template, with branches for Rollup and webpack. To clone it and get started: + +```bash +# for Rollup +npx degit "sveltejs/sapper-template#rollup" my-app +# for webpack +npx degit "sveltejs/sapper-template#webpack" my-app +cd my-app +npm install # or yarn! +npm run dev +``` + +Open up [localhost:3000](http://localhost:3000) and start clicking around. + +Consult [sapper.svelte.dev](https://sapper.svelte.dev) for help getting started. + + +## Structure + +Sapper expects to find two directories in the root of your project — `src` and `static`. + + +### src + +The [src](src) directory contains the entry points for your app — `client.js`, `server.js` and (optionally) a `service-worker.js` — along with a `template.html` file and a `routes` directory. + + +#### src/routes + +This is the heart of your Sapper app. There are two kinds of routes — *pages*, and *server routes*. + +**Pages** are Svelte components written in `.svelte` files. When a user first visits the application, they will be served a server-rendered version of the route in question, plus some JavaScript that 'hydrates' the page and initialises a client-side router. From that point forward, navigating to other pages is handled entirely on the client for a fast, app-like feel. (Sapper will preload and cache the code for these subsequent pages, so that navigation is instantaneous.) + +**Server routes** are modules written in `.js` files, that export functions corresponding to HTTP methods. Each function receives Express `request` and `response` objects as arguments, plus a `next` function. This is useful for creating a JSON API, for example. + +There are three simple rules for naming the files that define your routes: + +* A file called `src/routes/about.svelte` corresponds to the `/about` route. A file called `src/routes/blog/[slug].svelte` corresponds to the `/blog/:slug` route, in which case `params.slug` is available to the route +* The file `src/routes/index.svelte` (or `src/routes/index.js`) corresponds to the root of your app. `src/routes/about/index.svelte` is treated the same as `src/routes/about.svelte`. +* Files and directories with a leading underscore do *not* create routes. This allows you to colocate helper modules and components with the routes that depend on them — for example you could have a file called `src/routes/_helpers/datetime.js` and it would *not* create a `/_helpers/datetime` route + + +### static + +The [static](static) directory contains any static assets that should be available. These are served using [sirv](https://github.com/lukeed/sirv). + +In your [service-worker.js](app/service-worker.js) file, you can import these as `files` from the generated manifest... + +```js +import { files } from '@sapper/service-worker'; +``` + +...so that you can cache them (though you can choose not to, for example if you don't want to cache very large files). + + +## Bundler config + +Sapper uses Rollup or webpack to provide code-splitting and dynamic imports, as well as compiling your Svelte components. With webpack, it also provides hot module reloading. As long as you don't do anything daft, you can edit the configuration files to add whatever plugins you'd like. + + +## Production mode and deployment + +To start a production version of your app, run `npm run build && npm start`. This will disable live reloading, and activate the appropriate bundler plugins. + +You can deploy your application to any environment that supports Node 8 or above. As an example, to deploy to [Now](https://zeit.co/now), run these commands: + +```bash +npm install -g now +now +``` + + +## Using external components + +When using Svelte components installed from npm, such as [@sveltejs/svelte-virtual-list](https://github.com/sveltejs/svelte-virtual-list), Svelte needs the original component source (rather than any precompiled JavaScript that ships with the component). This allows the component to be rendered server-side, and also keeps your client-side app smaller. + +Because of that, it's essential that the bundler doesn't treat the package as an *external dependency*. You can either modify the `external` option under `server` in [rollup.config.js](rollup.config.js) or the `externals` option in [webpack.config.js](webpack.config.js), or simply install the package to `devDependencies` rather than `dependencies`, which will cause it to get bundled (and therefore compiled) with your app: + +```bash +npm install -D @sveltejs/svelte-virtual-list +``` + + +## Bugs and feedback + +Sapper is in early development, and may have the odd rough edge here and there. Please be vocal over on the [Sapper issue tracker](https://github.com/sveltejs/sapper/issues). diff --git a/packages/app-web-rollup/appveyor.yml b/packages/app-web-rollup/appveyor.yml new file mode 100644 index 0000000..e75da3b --- /dev/null +++ b/packages/app-web-rollup/appveyor.yml @@ -0,0 +1,18 @@ +version: "{build}" + +shallow_clone: true + +init: + - git config --global core.autocrlf false + +build: off + +environment: + matrix: + # node.js + - nodejs_version: stable + +install: + - ps: Install-Product node $env:nodejs_version + - npm install cypress + - npm install diff --git a/packages/app-web-rollup/cypress.json b/packages/app-web-rollup/cypress.json new file mode 100644 index 0000000..f5622fa --- /dev/null +++ b/packages/app-web-rollup/cypress.json @@ -0,0 +1,4 @@ +{ + "baseUrl": "http://localhost:3000", + "video": false +} \ No newline at end of file diff --git a/packages/app-web-rollup/cypress/fixtures/example.json b/packages/app-web-rollup/cypress/fixtures/example.json new file mode 100644 index 0000000..02e4254 --- /dev/null +++ b/packages/app-web-rollup/cypress/fixtures/example.json @@ -0,0 +1,5 @@ +{ + "name": "Using fixtures to represent data", + "email": "hello@cypress.io", + "body": "Fixtures are a great way to mock data for responses to routes" +} diff --git a/packages/app-web-rollup/cypress/integration/spec.js b/packages/app-web-rollup/cypress/integration/spec.js new file mode 100644 index 0000000..d123160 --- /dev/null +++ b/packages/app-web-rollup/cypress/integration/spec.js @@ -0,0 +1,23 @@ +describe('Sapper template app', () => { + beforeEach(() => { + cy.visit('/'); + }); + + it('has the correct

', () => { + cy.contains('h1', 'Great success!'); + }); + + it('navigates to /about', () => { + cy.get('nav a') + .contains('about') + .click(); + cy.url().should('include', '/about'); + }); + + it('navigates to /blog', () => { + cy.get('nav a') + .contains('blog') + .click(); + cy.url().should('include', '/blog'); + }); +}); diff --git a/packages/app-web-rollup/cypress/plugins/index.js b/packages/app-web-rollup/cypress/plugins/index.js new file mode 100644 index 0000000..dffed25 --- /dev/null +++ b/packages/app-web-rollup/cypress/plugins/index.js @@ -0,0 +1,17 @@ +// *********************************************************** +// This example plugins/index.js can be used to load plugins +// +// You can change the location of this file or turn off loading +// the plugins file with the 'pluginsFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/plugins-guide +// *********************************************************** + +// This function is called when a project is opened or re-opened (e.g. due to +// the project's config changing) + +module.exports = (on, config) => { + // `on` is used to hook into various events Cypress emits + // `config` is the resolved Cypress config +}; diff --git a/packages/app-web-rollup/cypress/support/commands.js b/packages/app-web-rollup/cypress/support/commands.js new file mode 100644 index 0000000..c1f5a77 --- /dev/null +++ b/packages/app-web-rollup/cypress/support/commands.js @@ -0,0 +1,25 @@ +// *********************************************** +// This example commands.js shows you how to +// create various custom commands and overwrite +// existing commands. +// +// For more comprehensive examples of custom +// commands please read more here: +// https://on.cypress.io/custom-commands +// *********************************************** +// +// +// -- This is a parent command -- +// Cypress.Commands.add("login", (email, password) => { ... }) +// +// +// -- This is a child command -- +// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... }) +// +// +// -- This is a dual command -- +// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... }) +// +// +// -- This is will overwrite an existing command -- +// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) diff --git a/packages/app-web-rollup/cypress/support/index.js b/packages/app-web-rollup/cypress/support/index.js new file mode 100644 index 0000000..37a498f --- /dev/null +++ b/packages/app-web-rollup/cypress/support/index.js @@ -0,0 +1,20 @@ +// *********************************************************** +// This example support/index.js is processed and +// loaded automatically before your test files. +// +// This is a great place to put global configuration and +// behavior that modifies Cypress. +// +// You can change the location of this file or turn off +// automatically serving support files with the +// 'supportFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/configuration +// *********************************************************** + +// Import commands.js using ES2015 syntax: +import './commands'; + +// Alternatively you can use CommonJS syntax: +// require('./commands') diff --git a/packages/app-web-rollup/package.json b/packages/app-web-rollup/package.json new file mode 100644 index 0000000..9b53b9e --- /dev/null +++ b/packages/app-web-rollup/package.json @@ -0,0 +1,38 @@ +{ + "name": "@nedkelly/app-web-rollup", + "description": "This is a test Web-App running on Sapper and Svelte", + "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": { + "@nedkelly/component-todo-app": "1.0.0", + "@nedkelly/component-button": "1.0.0", + "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/packages/app-web-rollup/rollup.config.js b/packages/app-web-rollup/rollup.config.js new file mode 100644 index 0000000..373cf60 --- /dev/null +++ b/packages/app-web-rollup/rollup.config.js @@ -0,0 +1,111 @@ +import resolve from 'rollup-plugin-node-resolve'; +import replace from 'rollup-plugin-replace'; +import commonjs from 'rollup-plugin-commonjs'; +import svelte from 'rollup-plugin-svelte'; +import babel from 'rollup-plugin-babel'; +import { terser } from 'rollup-plugin-terser'; +import config from 'sapper/config/rollup.js'; +import pkg from './package.json'; + +const mode = process.env.NODE_ENV; +const dev = mode === 'development'; +const legacy = !!process.env.SAPPER_LEGACY_BUILD; + +const onwarn = (warning, onwarn) => + (warning.code === 'CIRCULAR_DEPENDENCY' && + /[/\\]@sapper[/\\]/.test(warning.message)) || + onwarn(warning); + +export default { + client: { + input: config.client.input(), + output: config.client.output(), + plugins: [ + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode), + }), + svelte({ + dev, + hydratable: true, + emitCss: true, + }), + resolve({ + browser: true, + }), + commonjs(), + + legacy && + babel({ + extensions: ['.js', '.mjs', '.html', '.svelte'], + runtimeHelpers: true, + exclude: ['node_modules/@babel/**'], + presets: [ + [ + '@babel/preset-env', + { + targets: '> 0.25%, not dead', + }, + ], + ], + plugins: [ + '@babel/plugin-syntax-dynamic-import', + [ + '@babel/plugin-transform-runtime', + { + useESModules: true, + }, + ], + ], + }), + + !dev && + terser({ + module: true, + }), + ], + + onwarn, + }, + + server: { + input: config.server.input(), + output: config.server.output(), + plugins: [ + replace({ + 'process.browser': false, + 'process.env.NODE_ENV': JSON.stringify(mode), + }), + svelte({ + generate: 'ssr', + dev, + }), + resolve(), + commonjs(), + ], + external: Object.keys(pkg.dependencies) + .filter(i => !i.match(/@nedkelly/)) // https://github.com/sveltejs/sapper-template/blob/master/README.md#using-external-components + .concat( + require('module').builtinModules || + Object.keys(process.binding('natives')), + ), + + onwarn, + }, + + serviceworker: { + input: config.serviceworker.input(), + output: config.serviceworker.output(), + plugins: [ + resolve(), + replace({ + 'process.browser': true, + 'process.env.NODE_ENV': JSON.stringify(mode), + }), + commonjs(), + !dev && terser(), + ], + + onwarn, + }, +}; diff --git a/packages/app-web-rollup/src/client.js b/packages/app-web-rollup/src/client.js new file mode 100644 index 0000000..cb8e7fd --- /dev/null +++ b/packages/app-web-rollup/src/client.js @@ -0,0 +1,5 @@ +import * as sapper from '@sapper/app'; + +sapper.start({ + target: document.querySelector('#sapper'), +}); diff --git a/packages/app-web-rollup/src/components/Nav.svelte b/packages/app-web-rollup/src/components/Nav.svelte new file mode 100644 index 0000000..cc8d61e --- /dev/null +++ b/packages/app-web-rollup/src/components/Nav.svelte @@ -0,0 +1,79 @@ + + + + + diff --git a/packages/app-web-rollup/src/routes/_error.svelte b/packages/app-web-rollup/src/routes/_error.svelte new file mode 100644 index 0000000..1adbb7b --- /dev/null +++ b/packages/app-web-rollup/src/routes/_error.svelte @@ -0,0 +1,41 @@ + + + + + + {status} + + +

{status}

+ +

{error.message}

+ +{#if dev && error.stack} + 
{error.stack}
+{/if} diff --git a/packages/app-web-rollup/src/routes/_layout.svelte b/packages/app-web-rollup/src/routes/_layout.svelte new file mode 100644 index 0000000..d74377a --- /dev/null +++ b/packages/app-web-rollup/src/routes/_layout.svelte @@ -0,0 +1,22 @@ + + + + +