Skip to content

Commit

Permalink
feat: add TypeScript definitions (#256)
Browse files Browse the repository at this point in the history
* feat: build TypeScript definitions and use esbuild for bundling

Inspired by OpenLayers approach.

* chore: switch from Neutrino (webpack) to esbuild for dev server

* chore: use dataurl loader for SVG files, activate minify option for bundle

* chore: watch forever to support Cypress CI tests

* chore: upgrade Cypress

* chore: use localhost for integration test to avoid CORS issues

* chore: rewrite unit test to integration test

* chore: remove unused Jest and update dependencies

* chore: rename GitHub workflow and use Node.js 16

* chore: move config for tools to separate files

* chore: update GitHub workflows

* chore: fix Cypress timeout

* chore: fix website

* chore: run Cypress tests with oldest and newest supported Node.js release

* chore: use dynamic Node.js test matrix

* chore: fix typo

* chore: fix LTS version selection
  • Loading branch information
friedjoff authored Apr 21, 2023
1 parent 614b27a commit f6db2f6
Show file tree
Hide file tree
Showing 25 changed files with 1,143 additions and 8,672 deletions.
19 changes: 19 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"env": {
"cypress/globals": true,
"node": true,
"browser": true,
"es6": true
},
"extends": ["eslint-config-airbnb-base", "prettier"],
"parserOptions": {
"ecmaVersion": 2022
},
"plugins": ["cypress", "prettier"],
"rules": {
"prettier/prettier": "error",
"arrow-body-style": "off",
"import/no-named-as-default": "off",
"import/no-named-as-default-member": "off"
}
}
23 changes: 9 additions & 14 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,20 @@ on: [push]
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
# Test on oldest Node LTS and latest Node stable
node: [lts/-1, current]
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

- uses: actions/setup-node@v1
- uses: actions/setup-node@v3
with:
node-version: 16
cache: yarn
node-version: ${{ matrix.node }}

- name: Get yarn cache
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v1
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Install dependencies
run: yarn install
run: yarn install --frozen-lockfile

- name: Run and record Cypress tests
run: yarn run cy:test
25 changes: 25 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Lint

on:
pull_request:
push:
branches:
- master

jobs:
lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
cache: yarn
node-version: latest

- name: Install dependencies
run: yarn install --frozen-lockfile

- name: Run linting
run: yarn lint
32 changes: 0 additions & 32 deletions .github/workflows/test.yml

This file was deleted.

7 changes: 7 additions & 0 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"(src|__mocks__)/**/*.js": ["eslint --fix", "prettier --write"],
"package.json": [
"fixpack --sortToTop name --sortToTop license --sortToTop description --sortToTop version --sortToTop author --sortToTop main --sortToTop module --sortToTop files --sortToTop proxy --sortToTop dependencies --sortToTop peerDependencies --sortToTop devDependencies --sortToTop resolutions --sortToTop scripts"
],
"src/**/*.{css,scss}": ["stylelint --fix"]
}
21 changes: 0 additions & 21 deletions .neutrinorc.js

This file was deleted.

1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

4 changes: 4 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"trailingComma": "all",
"singleQuote": true
}
3 changes: 3 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": ["stylelint-config-standard"]
}
62 changes: 62 additions & 0 deletions config/tsconfig-build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"compilerOptions": {
/* Basic Options */
"target": "es2017" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
"module": "es2020" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
// "lib": [], /* Specify library files to be included in the compilation. */
"allowJs": true /* Allow javascript files to be compiled. */,
// "checkJs": true, /* Report errors in .js files. */
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
"declaration": true /* Generates corresponding '.d.ts' file. */,
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
"sourceMap": false /* Generates corresponding '.map' file. */,
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "../build" /* Redirect output structure to the directory. */,
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
"importHelpers": false /* Import emit helpers from 'tslib'. */,
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

/* Strict Type-Checking Options */
"strict": false /* Enable all strict type-checking options. */,
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
"strictNullChecks": true /* Enable strict null checks. */,
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */

/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */

/* Module Resolution Options */
"moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": false /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */

/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
"inlineSources": false /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */,
"skipLibCheck": true
/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
},
"include": ["../src/**/*.js"],
"exclude": []
}
10 changes: 10 additions & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { defineConfig } from 'cypress';

export default defineConfig({
projectId: 'f88nv7',
e2e: {
baseUrl: 'http://localhost:8000',
specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
supportFile: false,
},
});
4 changes: 0 additions & 4 deletions cypress.json

This file was deleted.

File renamed without changes.
File renamed without changes.
23 changes: 23 additions & 0 deletions cypress/e2e/control/draw.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
describe('Draw control', () => {
beforeEach(() => {
cy.visit('/');
});

it('should show draw control for points', () => {
cy.get('.ole-control-draw')
.first()
.should('have.attr', 'title', 'Draw Point');
});

it('should show draw control for lines', () => {
cy.get('.ole-control-draw')
.eq(1)
.should('have.attr', 'title', 'Draw LineString');
});

it('should show draw control for polygons', () => {
cy.get('.ole-control-draw')
.last()
.should('have.attr', 'title', 'Draw Polygon');
});
});
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
23 changes: 0 additions & 23 deletions cypress/integration/control/draw.spec.js

This file was deleted.

22 changes: 0 additions & 22 deletions cypress/plugins/index.js

This file was deleted.

Loading

1 comment on commit f6db2f6

@vercel
Copy link

@vercel vercel bot commented on f6db2f6 Apr 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.