chore: Build to dist folder.

Closes https://github.com/solid/community-server/issues/136
This commit is contained in:
Ruben Verborgh 2020-12-07 20:12:08 +01:00 committed by Joachim Van Herwegen
parent f3f0724f83
commit 9c933fd2d4
19 changed files with 51 additions and 41 deletions

View File

@ -1,12 +1,2 @@
# don't ever lint node_modules
dist
node_modules
# don't lint nyc coverage output
coverage
# ignore generated files
**/*.js
**/*.d.ts
**/*.js.map
# ignore temporary test files
test/tmp

View File

@ -3,7 +3,7 @@ module.exports = {
parser: '@typescript-eslint/parser',
parserOptions: {
tsconfigRootDir: __dirname, // this is the reason this is a .js file
project: ['./tsconfig.json'],
project: ['./tsconfig.json', './test/tsconfig.json'],
},
globals: {
AsyncIterable: 'readonly',

13
.gitignore vendored
View File

@ -1,16 +1,7 @@
.idea
node_modules
*.js
*.js.map
*.d.ts
components
tsconfig.tsbuildinfo
dist
.eslintcache
!.eslintrc.js
!test/eslintrc.js
coverage
tsconfig.tsbuildinfo

View File

@ -16,6 +16,7 @@ module.exports = {
"setupFilesAfterEnv": ["jest-rdf", "<rootDir>/test/util/SetupTests.ts"],
"collectCoverage": true,
"coveragePathIgnorePatterns": [
"/dist/",
"/node_modules/",
"/test/"
],

View File

@ -18,16 +18,17 @@
"node": ">=12.17 <15"
},
"lsd:module": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server",
"lsd:components": "components/components.jsonld",
"lsd:components": "dist/components/components.jsonld",
"lsd:contexts": {
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld": "components/context.jsonld"
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld": "dist/components/context.jsonld"
},
"lsd:importPaths": {
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/": "components/",
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/config/": "config/"
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/": "dist/components/",
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/config/": "config/",
"https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/dist/": "dist/"
},
"main": "./src/index.js",
"types": "./src/index.d.ts",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"bin": {
"community-solid-server": "./bin/server.js"
},
@ -38,7 +39,7 @@
"homepage": "https://github.com/solid/community-server#readme",
"scripts": {
"build": "npm run build:ts && npm run build:components",
"build:components": "componentsjs-generator -s src -i .componentsignore",
"build:components": "componentsjs-generator -s src -c dist/components -i .componentsignore",
"build:ts": "tsc",
"docker": "npm run docker:setup && npm run docker:start",
"docker:clean": "./test/docker/docker-clean.sh",
@ -55,7 +56,7 @@
"test:unit": "jest test/unit",
"validate": "componentsjs-compile-config urn:solid-server:default -c config/config-default.json -f > /dev/null",
"version": "manual-git-changelog onversion",
"watch": "nodemon --watch \"src/**/*.js\" --exec npm start"
"watch": "nodemon --watch \"dist/**/*.js\" --exec npm start"
},
"husky": {
"hooks": {
@ -63,11 +64,9 @@
}
},
"files": [
"bin/*.js",
"src/**/*.js",
"src/**/*.d.ts",
"components/**/*.jsonld",
"config/**/*.json"
"bin",
"dist",
"config"
],
"dependencies": {
"@rdfjs/data-model": "^1.2.0",

View File

@ -1,3 +1,4 @@
import 'jest-rdf';
import * as url from 'url';
import { namedNode, quad } from '@rdfjs/data-model';
import { Parser } from 'n3';

7
test/tsconfig.json Normal file
View File

@ -0,0 +1,7 @@
{
"compilerOptions": {
"esModuleInterop": true,
"noUnusedLocals": true,
"strict": true
}
}

View File

@ -1,3 +1,4 @@
import 'jest-rdf';
import { namedNode, quad } from '@rdfjs/data-model';
import arrayifyStream from 'arrayify-stream';
import { Algebra } from 'sparqlalgebrajs';

View File

@ -1,3 +1,4 @@
import 'jest-rdf';
import { literal, namedNode, quad } from '@rdfjs/data-model';
import type { Literal, NamedNode, Quad } from 'rdf-js';
import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata';

View File

@ -1,3 +1,4 @@
import 'jest-rdf';
import type { Readable } from 'stream';
import arrayifyStream from 'arrayify-stream';
import { DataFactory } from 'n3';

View File

@ -1,3 +1,4 @@
import 'jest-rdf';
import type { Readable } from 'stream';
import { DataFactory } from 'n3';
import type { Representation } from '../../../../src/ldp/representation/Representation';

View File

@ -1,3 +1,4 @@
import 'jest-rdf';
import type { Readable } from 'stream';
import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata';
import { InMemoryDataAccessor } from '../../../../src/storage/accessors/InMemoryDataAccessor';

View File

@ -1,3 +1,4 @@
import 'jest-rdf';
import { Readable } from 'stream';
import arrayifyStream from 'arrayify-stream';
import { SparqlEndpointFetcher } from 'fetch-sparql-endpoint';

View File

@ -1,3 +1,4 @@
import 'jest-rdf';
import { Readable } from 'stream';
import { namedNode, triple } from '@rdfjs/data-model';
import arrayifyStream from 'arrayify-stream';

View File

@ -1,3 +1,4 @@
import 'jest-rdf';
import { namedNode, quad } from '@rdfjs/data-model';
import arrayifyStream from 'arrayify-stream';
import type { Quad } from 'rdf-js';

View File

@ -1,3 +1,4 @@
import 'jest-rdf';
import { DataFactory } from 'n3';
import type { Quad } from 'rdf-js';
import { pushQuad } from '../../../src/util/QuadUtil';

View File

@ -1,3 +1,4 @@
import 'jest-rdf';
import { literal, namedNode } from '@rdfjs/data-model';
import { CONTENT_TYPE, XSD } from '../../../src/util/UriConstants';
import { toNamedNode, toObjectTerm, toTypedLiteral, isTerm } from '../../../src/util/UriUtil';

View File

@ -1,4 +1,16 @@
import { setGlobalLoggerFactory } from '../../src/logging/LogUtil';
import { VoidLoggerFactory } from '../../src/logging/VoidLoggerFactory';
setGlobalLoggerFactory(new VoidLoggerFactory());
// Set the main logger
const loggerFactory = new VoidLoggerFactory();
setGlobalLoggerFactory(loggerFactory);
// Also set the logger factory of transpiled JS modules
// (which are instantiated by Components.js)
try {
// eslint-disable-next-line global-require, @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
const dist = require('../../dist/logging/LogUtil');
dist.setGlobalLoggerFactory(loggerFactory);
} catch {
// Ignore
}

View File

@ -9,16 +9,15 @@
"inlineSources": true,
"noUnusedLocals": true,
"preserveConstEnums": true,
"outDir": "dist",
"sourceMap": true,
"strict": true,
"stripInternal": true
},
"include": [
"src/**/*.ts",
"test/**/*.ts"
"src"
],
"exclude": [
"node_modules",
"test/tmp"
"node_modules"
]
}