Skip to content

Commit 6dbc9ed

Browse files
committed
chore: Update tsconfig files for node 10+ output.
1 parent 6ba8462 commit 6dbc9ed

File tree

11 files changed

+68
-119
lines changed

11 files changed

+68
-119
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@types/loader-utils": "^1.1.3",
3232
"@types/minimatch": "^3.0.3",
3333
"@types/mocha": "^5.2.6",
34-
"@types/node": "^11.13.7",
34+
"@types/node": "^10.0.0",
3535
"@types/prettier": "^1.8.0",
3636
"@types/tapable": "1.0.4",
3737
"chai": "^4.2.0",

packages/@css-blocks/core/test/Block/inheritable-test.ts

+1-14
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { assertNeverCalled } from "@opticss/util";
22
import { assert } from "chai";
33
import { suite, test } from "mocha-typescript";
44

5-
import { Block, BlockClass, ResolvedConfiguration, RulesetContainer, SourceLocation } from "../../src";
5+
import { Block, BlockClass, RulesetContainer } from "../../src";
66
import { Inheritable } from "../../src/BlockTree/Inheritable";
77

88
type RootNode = Inheritable<
@@ -91,24 +91,11 @@ class TestSink extends Inheritable<
9191
get parent(): SinkNode["parent"] { return this._parent!; }
9292
get root(): SinkNode["root"] { return this.parent.root; }
9393
// tslint:disable-next-line:prefer-unknown-to-any
94-
public lookup(_path: string, _errLoc?: SourceLocation | undefined): Inheritable<any, any, any, any> | undefined {
95-
throw new Error("Method not implemented.");
96-
}
9794
public rulesets: RulesetContainer<BlockClass>;
9895
constructor(name: string, parent: TestNode) {
9996
super(name, parent);
10097
this.rulesets = new RulesetContainer(new BlockClass(name, TEST_BLOCK));
10198
}
102-
103-
public cssClass(_opts: ResolvedConfiguration): string {
104-
throw new Error("Method not implemented.");
105-
}
106-
public asSource(): string {
107-
throw new Error("Method not implemented.");
108-
}
109-
public asSourceAttributes(): Attr[] {
110-
throw new Error("Method not implemented.");
111-
}
11299
}
113100

114101
@suite("Inheritable")

packages/@css-blocks/glimmer/tsconfig.amd.json

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"compilerOptions": {
44
"outDir": "dist/amd/src/helpers",
55
"baseUrl": "dist/amd/src/helpers",
6+
"lib": ["ES5"],
67
"target": "es5",
78
"module": "amd"
89
},

packages/@css-blocks/jsx/tsconfig-runtime.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"compilerOptions": {
33
// Compilation Configuration
4+
"lib": ["ES5"],
45
"target": "es5",
56
"inlineSources": false,
67
"inlineSourceMap": false,

packages/@css-blocks/vscode/tsconfig.json

-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
"compilerOptions": {
44
"composite": true,
55
"baseUrl": "dist",
6-
"target": "es2018",
76
"outDir": "dist",
87
"rootDir": "src",
9-
"lib": ["es2018"]
108
},
119
"include": ["src", "test"],
1210
"exclude": ["dist", "node_modules", ".vscode-test"],

packages/@css-blocks/website/config/webpack.config.dev.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const jsxCompilationOptions = {
2727
const CssBlocks = require("@css-blocks/jsx");
2828
const CssBlocksPlugin = require("@css-blocks/webpack").CssBlocksPlugin;
2929
const CssBlockRewriter = new CssBlocks.Rewriter();
30-
const CssBlockAnalyzer = new CssBlocks.Analyzer(paths.appIndexJs, jsxCompilationOptions);
30+
const CssBlockAnalyzer = new CssBlocks.Analyzer(jsxCompilationOptions);
3131

3232
// Webpack uses `publicPath` to determine where the app is being served from.
3333
// In development, we always serve from the root. This makes config easier.
@@ -209,7 +209,7 @@ module.exports = {
209209
options: {
210210
babelrc: false,
211211
plugins: [
212-
require("@css-blocks/jsx/dist/src/transformer/babel").makePlugin({ rewriter: CssBlockRewriter }),
212+
require("@css-blocks/jsx/dist/src/transformer/babel").babelPlugin({ rewriter: CssBlockRewriter }),
213213
],
214214
cacheDirectory: true,
215215
compact: true,
@@ -324,4 +324,4 @@ module.exports = {
324324
performance: {
325325
hints: false,
326326
},
327-
};
327+
};

packages/@css-blocks/website/config/webpack.config.prod.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const jsxCompilationOptions = {
2828
aliases: {}
2929
};
3030
const CssBlockRewriter = new CssBlocks.Rewriter(jsxCompilationOptions);
31-
const CssBlockAnalyzer = new CssBlocks.Analyzer(paths.appIndexJs, jsxCompilationOptions);
31+
const CssBlockAnalyzer = new CssBlocks.Analyzer(jsxCompilationOptions);
3232

3333
// Webpack uses `publicPath` to determine where the app is being served from.
3434
// It requires a trailing slash, or the file assets will get an incorrect path.
@@ -230,7 +230,7 @@ module.exports = {
230230
options: {
231231
babelrc: false,
232232
plugins: [
233-
require("@css-blocks/jsx/dist/src/transformer/babel").makePlugin({ rewriter: CssBlockRewriter }),
233+
require("@css-blocks/jsx/dist/src/transformer/babel").babelPlugin({ rewriter: CssBlockRewriter }),
234234
],
235235
cacheDirectory: false,
236236
compact: true,
@@ -403,4 +403,4 @@ module.exports = {
403403
tls: 'empty',
404404
child_process: 'empty',
405405
},
406-
};
406+
};

packages/@css-blocks/website/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"chalk": "2.4.2",
2020
"css-loader": "1.0.0",
2121
"dotenv": "4.0.0",
22-
"eslint": "^6.0.0",
22+
"eslint": "^5.16.0",
2323
"eslint-config-react-app": "^2.0.1",
2424
"eslint-loader": "1.9.0",
2525
"eslint-plugin-flowtype": "2.39.1",

packages/@css-blocks/website/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"noImplicitAny": true,
77
"module": "es6",
88
"moduleResolution": "Node",
9-
"target": "es2017",
9+
"target": "es2018",
1010
"jsx": "preserve",
1111
"jsxFactory": "React.createElement",
1212
"experimentalDecorators": true,

tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"exclude": [ "node_modules" ],
44
"compilerOptions": {
55
// Compilation Configuration
6-
"target": "es2017",
6+
"lib": ["es2018"],
7+
"target": "es2018",
78
"inlineSources": true,
89
"inlineSourceMap": true,
910
"declaration": true,

0 commit comments

Comments
 (0)